rpms/control-center/devel control-center.spec, 1.376, 1.377 notification-theme.patch, 1.3, 1.4

Mon Jul 14 21:21:43 UTC 2008

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870

Modified Files:
	control-center.spec notification-theme.patch 
Log Message:
Fix an issue with the notification theme support



Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377

--- control-center.spec	23 Jun 2008 14:56:59 -0000	1.376
+++ control-center.spec	14 Jul 2008 21:20:48 -0000	1.377
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.23.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -31,11 +31,6 @@
 
 Patch2: control-center-2.20.0-enable-sound-by-default.patch
 Patch3: control-center-2.19.3-no-gnome-common.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=497807
-Patch5: background-location.patch
-# Fix some useless warnings in libslab
-# http://bugzilla.gnome.org/show_bug.cgi?id=439398
-Patch6: gnome-control-center-2.19.90-no-warnings.patch
 Patch7: make-default.patch
 # minor build breakage in gtk, will be fixed in the next gtk release
 Patch8: gtkmarshal.patch
@@ -174,10 +169,6 @@
 
 %patch2 -p0 -b .enable-sound
 %patch3 -p1 -b .no-gnome-common
-%patch5 -p1 -b .background-location
-pushd libslab
-%patch6 -p0 -b .warnings
-popd
 %patch8 -p1 -b .gtkmarshal
 %patch9 -p1 -b .standard-icon
 
@@ -364,6 +355,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Jul 14 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.4-4
+- Drop some obsolete patches
+- Fix an issue with the notification-theme support (#455329)
+
 * Mon Jun 23 2008 Ray Strode <rstrode at redhat.com> - 2.23.4-3
 - Install bg capplet .policy file
 

notification-theme.patch:

Index: notification-theme.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/notification-theme.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- notification-theme.patch	28 May 2008 03:47:15 -0000	1.3
+++ notification-theme.patch	14 Jul 2008 21:20:49 -0000	1.4
@@ -1,6 +1,18 @@
-diff -up gnome-control-center-2.23.2/capplets/appearance/theme-save.c.notification-theme gnome-control-center-2.23.2/capplets/appearance/theme-save.c
---- gnome-control-center-2.23.2/capplets/appearance/theme-save.c.notification-theme	2008-05-17 12:46:56.000000000 -0400
-+++ gnome-control-center-2.23.2/capplets/appearance/theme-save.c	2008-05-27 23:46:17.000000000 -0400
+diff -up gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c.notification-theme gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c
+--- gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c.notification-theme	2008-07-14 17:10:31.000000000 -0400
++++ gnome-control-center-2.23.4/capplets/appearance/appearance-themes.c	2008-07-14 17:13:40.000000000 -0400
+@@ -249,6 +249,8 @@ theme_load_from_gconf (GConfClient *clie
+   if (theme->icon_theme_name == NULL)
+     theme->icon_theme_name = g_strdup ("gnome");
+ 
++  theme->notification_theme_name = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
++
+   theme->cursor_theme_name = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL);
+ #ifdef HAVE_XCURSOR
+   theme->cursor_size = gconf_client_get_int (client, CURSOR_SIZE_KEY, NULL);
+diff -up gnome-control-center-2.23.4/capplets/appearance/theme-save.c.notification-theme gnome-control-center-2.23.4/capplets/appearance/theme-save.c
+--- gnome-control-center-2.23.4/capplets/appearance/theme-save.c.notification-theme	2008-05-08 08:31:29.000000000 -0400
++++ gnome-control-center-2.23.4/capplets/appearance/theme-save.c	2008-07-14 17:03:58.000000000 -0400
 @@ -234,6 +234,12 @@ write_theme_to_disk (GnomeThemeMetaInfo 
      g_free (str);
    }
@@ -14,9 +26,20 @@
    if (save_background) {
      client = gconf_client_get_default ();
      current_background = gconf_client_get_string (client, BACKGROUND_KEY, NULL);
-diff -up gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c
---- gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c.notification-theme	2008-05-17 12:46:59.000000000 -0400
-+++ gnome-control-center-2.23.2/capplets/common/gnome-theme-apply.c	2008-05-27 23:45:00.000000000 -0400
+diff -up gnome-control-center-2.23.4/capplets/appearance/theme-util.h.notification-theme gnome-control-center-2.23.4/capplets/appearance/theme-util.h
+--- gnome-control-center-2.23.4/capplets/appearance/theme-util.h.notification-theme	2008-07-14 17:12:31.000000000 -0400
++++ gnome-control-center-2.23.4/capplets/appearance/theme-util.h	2008-07-14 17:12:48.000000000 -0400
+@@ -21,6 +21,7 @@
+ #define GTK_THEME_KEY "/desktop/gnome/interface/gtk_theme"
+ #define METACITY_THEME_KEY "/apps/metacity/general/theme"
+ #define ICON_THEME_KEY "/desktop/gnome/interface/icon_theme"
++#define NOTIFICATION_THEME_KEY "/apps/notification-daemon/theme"
+ #define COLOR_SCHEME_KEY "/desktop/gnome/interface/gtk_color_scheme"
+ #define LOCKDOWN_KEY "/desktop/gnome/lockdown/disable_theme_settings"
+ #define BACKGROUND_KEY "/desktop/gnome/background/picture_filename"
+diff -up gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c
+--- gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c.notification-theme	2008-05-08 08:31:40.000000000 -0400
++++ gnome-control-center-2.23.4/capplets/common/gnome-theme-apply.c	2008-07-14 17:03:58.000000000 -0400
 @@ -34,6 +34,7 @@
  #define CURSOR_FONT_KEY   "/desktop/gnome/peripherals/mouse/cursor_font"
  #define CURSOR_THEME_KEY   "/desktop/gnome/peripherals/mouse/cursor_theme"
@@ -51,9 +74,9 @@
    /* Set the cursor theme key */
  #ifdef HAVE_XCURSOR
    old_key = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL);
-diff -up gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c.notification-theme gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c
---- gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c.notification-theme	2008-05-17 12:46:59.000000000 -0400
-+++ gnome-control-center-2.23.2/capplets/common/gnome-theme-info.c	2008-05-27 23:45:00.000000000 -0400
+diff -up gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c.notification-theme gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c
+--- gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c.notification-theme	2008-06-16 06:52:24.000000000 -0400
++++ gnome-control-center-2.23.4/capplets/common/gnome-theme-info.c	2008-07-14 17:03:58.000000000 -0400
 @@ -25,6 +25,7 @@
  #define METACITY_THEME_KEY "X-GNOME-Metatheme/MetacityTheme"
  #define ICON_THEME_KEY "X-GNOME-Metatheme/IconTheme"
@@ -73,7 +96,7 @@
    str = gnome_desktop_item_get_string (meta_theme_ditem, CURSOR_THEME_KEY);
    if (str != NULL) {
      meta_theme_info->cursor_theme_name = g_strdup (str);
-@@ -1596,6 +1601,7 @@ gnome_theme_meta_info_free (GnomeThemeMe
+@@ -1593,6 +1598,7 @@ gnome_theme_meta_info_free (GnomeThemeMe
    g_free (meta_theme_info->gtk_color_scheme);
    g_free (meta_theme_info->icon_theme_name);
    g_free (meta_theme_info->metacity_theme_name);
@@ -81,7 +104,7 @@
    g_free (meta_theme_info);
  }
  
-@@ -1697,6 +1703,9 @@ gnome_theme_meta_info_compare (GnomeThem
+@@ -1694,6 +1700,9 @@ gnome_theme_meta_info_compare (GnomeThem
    cmp = safe_strcmp (a->icon_theme_name, b->icon_theme_name);
    if (cmp != 0) return cmp;
  
@@ -91,9 +114,9 @@
    cmp = safe_strcmp (a->sound_theme_name, b->sound_theme_name);
    if (cmp != 0) return cmp;
  
-diff -up gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h.notification-theme gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h
---- gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h.notification-theme	2008-05-17 12:46:59.000000000 -0400
-+++ gnome-control-center-2.23.2/capplets/common/gnome-theme-info.h	2008-05-27 23:45:00.000000000 -0400
+diff -up gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h.notification-theme gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h
+--- gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h.notification-theme	2008-05-08 08:31:40.000000000 -0400
++++ gnome-control-center-2.23.4/capplets/common/gnome-theme-info.h	2008-07-14 17:03:58.000000000 -0400
 @@ -100,6 +100,7 @@ struct _GnomeThemeMetaInfo
    gchar *gtk_color_scheme;
    gchar *metacity_theme_name;


