rpms/control-center/devel control-center.spec, 1.483, 1.484 gnome-control-center-2.25.2-gecos.patch, 1.6, 1.7

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19411

Modified Files:
	control-center.spec gnome-control-center-2.25.2-gecos.patch 
Log Message:
Lazy man's port to GtkBuilder


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -r1.483 -r1.484
--- control-center.spec	7 Sep 2009 12:22:56 -0000	1.483
+++ control-center.spec	7 Sep 2009 13:02:27 -0000	1.484
@@ -195,12 +195,12 @@ for the GNOME desktop.
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
-%patch96 -p1 -b .gecos
+#%patch96 -p1 -b .gecos
 %patch99 -p1 -b .default-apps
 
 %patch7 -p1 -b .make-default
 
-autoreconf -f -i
+#autoreconf -f -i
 
 %build
 

gnome-control-center-2.25.2-gecos.patch:
 capplets/about-me/Makefile.am              |   12 
 capplets/about-me/eel-accessibility.c      |  413 ++
 capplets/about-me/eel-accessibility.h      |  152 
 capplets/about-me/eel-editable-label.c     | 4410 +++++++++++++++++++++++++++++
 capplets/about-me/eel-editable-label.h     |  142 
 capplets/about-me/eel-marshal.c            |  556 +++
 capplets/about-me/eel-marshal.h            |  116 
 capplets/about-me/gnome-about-me-dialog.ui |   21 
 capplets/about-me/gnome-about-me.c         |  210 +
 configure.in                               |    2 
 10 files changed, 6025 insertions(+), 9 deletions(-)

Index: gnome-control-center-2.25.2-gecos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-gecos.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-control-center-2.25.2-gecos.patch	7 Sep 2009 12:45:53 -0000	1.6
+++ gnome-control-center-2.25.2-gecos.patch	7 Sep 2009 13:02:27 -0000	1.7
@@ -5910,7 +5910,7 @@ diff -uprN gnome-control-center-2.27.91.
 +        GtkWidget    *widget;
 +        GList        *list;
 +        GtkWidget    *c;
-+        GladeXML     *dialog;
++        GtkBuilder   *dialog;
 + 
 +        dialog = me->dialog;
 + 
@@ -5978,7 +5978,7 @@ diff -uprN gnome-control-center-2.27.91.
 +        GtkWidget   *main_dialog;
 +	const gchar *text;
 +	gchar *str;
-+	GladeXML     *dialog;
++	GtkBuilder  *dialog;
 +
 +	if (!me->editing_username)
 +		return;