rpms/control-center/devel control-center.spec, 1.464, 1.465 gnome-control-center-2.25.2-passwd.patch, 1.2, 1.3 no-tweaks.patch, 1.1, 1.2 fix-appearance-capplet.patch, 1.2, NONE
Bastien Nocera
hadess at fedoraproject.org
Mon Aug 10 16:14:29 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094
Modified Files:
control-center.spec gnome-control-center-2.25.2-passwd.patch
no-tweaks.patch
Removed Files:
fix-appearance-capplet.patch
Log Message:
Update a few patches to apply correctly
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -p -r1.464 -r1.465
--- control-center.spec 10 Aug 2009 15:34:41 -0000 1.464
+++ control-center.spec 10 Aug 2009 16:14:28 -0000 1.465
@@ -50,9 +50,6 @@ Patch33: notification-theme.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=536531
Patch37: polkit1.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=588166
-Patch43: fix-appearance-capplet.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=588729
Patch45: mnemonic.patch
@@ -181,7 +178,6 @@ utilities.
%patch22 -p0 -b .slab-icon-names
%patch30 -p1 -b .default-layout-toggle
%patch33 -p1 -b .notification-theme
-%patch43 -p1 -b .fix-appearance-capplet
%patch46 -p1 -b .no-tweaks
%patch47 -p1 -b .save-as
gnome-control-center-2.25.2-passwd.patch:
gnome-about-me.c | 44 ++++++--------------------------------------
1 file changed, 6 insertions(+), 38 deletions(-)
Index: gnome-control-center-2.25.2-passwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-control-center-2.25.2-passwd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-control-center-2.25.2-passwd.patch 4 Dec 2008 18:54:50 -0000 1.2
+++ gnome-control-center-2.25.2-passwd.patch 10 Aug 2009 16:14:29 -0000 1.3
@@ -1,7 +1,8 @@
-diff -up gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.passwd gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c.passwd 2008-12-01 08:32:12.000000000 -0500
-+++ gnome-control-center-2.25.2/capplets/about-me/gnome-about-me.c 2008-12-04 12:54:24.000000000 -0500
-@@ -39,7 +39,6 @@
+diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
+index 8119c3c..b7fe5d8 100644
+--- a/capplets/about-me/gnome-about-me.c
++++ b/capplets/about-me/gnome-about-me.c
+@@ -40,7 +40,6 @@
#endif
#include "e-image-chooser.h"
@@ -9,20 +10,20 @@ diff -up gnome-control-center-2.25.2/cap
#include "gnome-about-me-fingerprint.h"
#include "marshal.h"
-@@ -883,10 +882,7 @@ about_me_button_clicked_cb (GtkDialog *d
+@@ -861,10 +860,7 @@ about_me_button_clicked_cb (GtkDialog *dialog, gint response_id, GnomeAboutMe *m
static void
about_me_passwd_clicked_cb (GtkWidget *button, GnomeAboutMe *me)
{
-- GladeXML *dialog;
+- GtkBuilder *dialog;
-
- dialog = me->dialog;
- gnome_about_me_password (GTK_WINDOW (WID ("about-me-dialog")));
-+ g_spawn_command_line_async ("/usr/bin/userpasswd", NULL);
++ g_spawn_command_line_async ("/usr/bin/userpasswd", NULL);
}
static void
-@@ -906,10 +902,7 @@ about_me_setup_dialog (void)
- GladeXML *dialog;
+@@ -884,10 +880,7 @@ about_me_setup_dialog (void)
+ GtkBuilder *dialog;
GError *error = NULL;
GList *chain;
-
@@ -33,7 +34,7 @@ diff -up gnome-control-center-2.25.2/cap
me = g_new0 (GnomeAboutMe, 1);
-@@ -978,34 +971,14 @@ about_me_setup_dialog (void)
+@@ -959,34 +952,14 @@ about_me_setup_dialog (void)
about_me_setup_email (me);
}
@@ -71,7 +72,7 @@ diff -up gnome-control-center-2.25.2/cap
gtk_label_set_markup (GTK_LABEL (widget), str);
g_free (str);
-@@ -1013,14 +986,9 @@ about_me_setup_dialog (void)
+@@ -994,14 +967,9 @@ about_me_setup_dialog (void)
widget = WID ("login");
gtk_label_set_text (GTK_LABEL (widget), me->login);
no-tweaks.patch:
Makefile.am | 3
appearance/Makefile.am | 2
appearance/appearance-main.c | 1
appearance/data/appearance.ui | 359 ------------------------------------------
4 files changed, 1 insertion(+), 364 deletions(-)
Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- no-tweaks.patch 30 Jul 2009 04:10:43 -0000 1.1
+++ no-tweaks.patch 10 Aug 2009 16:14:29 -0000 1.2
@@ -1,6 +1,34 @@
-diff -up gnome-control-center-2.27.4/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.27.4/capplets/appearance/appearance-main.c
---- gnome-control-center-2.27.4/capplets/appearance/appearance-main.c.no-tweaks 2009-07-29 23:41:20.056750275 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/appearance-main.c 2009-07-29 23:41:38.919750322 -0400
+diff --git a/capplets/Makefile.am b/capplets/Makefile.am
+index d88c1d3..e30d861 100644
+--- a/capplets/Makefile.am
++++ b/capplets/Makefile.am
+@@ -6,8 +6,7 @@ always_built_SUBDIRS = \
+ keybindings \
+ keyboard \
+ mouse \
+- network \
+- windows
++ network
+
+ SUBDIRS = $(always_built_SUBDIRS)
+
+diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
+index 226e4ec..b940d73 100644
+--- a/capplets/appearance/Makefile.am
++++ b/capplets/appearance/Makefile.am
+@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
+ appearance-themes.h \
+ appearance-style.c \
+ appearance-style.h \
+- appearance-ui.c \
+- appearance-ui.h \
+ gedit-message-area.c \
+ gedit-message-area.h \
+ gnome-wp-info.c \
+diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
+index 369af02..86e4957 100644
+--- a/capplets/appearance/appearance-main.c
++++ b/capplets/appearance/appearance-main.c
@@ -172,7 +172,6 @@ main (int argc, char **argv)
desktop_init (data, (const gchar **) wallpaper_files);
g_strfreev (wallpaper_files);
@@ -9,10 +37,11 @@ diff -up gnome-control-center-2.27.4/cap
/* prepare the main window */
w = appearance_capplet_get_widget (data, "appearance_window");
-diff -up gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui
---- gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.no-tweaks 2009-07-29 23:50:02.189755937 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui 2009-07-29 23:51:04.979750545 -0400
-@@ -1494,361 +1494,6 @@
+diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui
+index a68894e..0270d4b 100644
+--- a/capplets/appearance/data/appearance.ui
++++ b/capplets/appearance/data/appearance.ui
+@@ -1506,365 +1506,6 @@
<property name="tab_fill">False</property>
</packing>
</child>
@@ -29,8 +58,10 @@ diff -up gnome-control-center-2.27.4/cap
- <object class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="xalign">0</property>
-- <property name="label" translatable="yes"><b>Menus and Toolbars</b></property>
-- <property name="use_markup">True</property>
+- <property name="label" translatable="yes">Menus and Toolbars</property>
+- <attributes>
+- <attribute name="weight" value="bold"/>
+- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
@@ -157,8 +188,10 @@ diff -up gnome-control-center-2.27.4/cap
- <object class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="xalign">0</property>
-- <property name="label" translatable="yes"><b>Preview</b></property>
-- <property name="use_markup">True</property>
+- <property name="label" translatable="yes">Preview</property>
+- <attributes>
+- <attribute name="weight" value="bold"/>
+- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
@@ -374,28 +407,3 @@ diff -up gnome-control-center-2.27.4/cap
</object>
<packing>
<property name="position">1</property>
-diff -up gnome-control-center-2.27.4/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.27.4/capplets/appearance/Makefile.am
---- gnome-control-center-2.27.4/capplets/appearance/Makefile.am.no-tweaks 2009-07-29 23:40:35.174501065 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/Makefile.am 2009-07-29 23:40:51.076500481 -0400
-@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
- appearance-themes.h \
- appearance-style.c \
- appearance-style.h \
-- appearance-ui.c \
-- appearance-ui.h \
- gedit-message-area.c \
- gedit-message-area.h \
- gnome-wp-info.c \
-diff -up gnome-control-center-2.27.4/capplets/Makefile.am.no-tweaks gnome-control-center-2.27.4/capplets/Makefile.am
---- gnome-control-center-2.27.4/capplets/Makefile.am.no-tweaks 2009-07-29 23:39:52.413505115 -0400
-+++ gnome-control-center-2.27.4/capplets/Makefile.am 2009-07-29 23:40:01.297501055 -0400
-@@ -6,8 +6,7 @@ always_built_SUBDIRS = \
- keybindings \
- keyboard \
- mouse \
-- network \
-- windows
-+ network
-
- SUBDIRS = $(always_built_SUBDIRS)
-
--- fix-appearance-capplet.patch DELETED ---
More information about the scm-commits
mailing list