rpms/control-center/devel control-center.spec, 1.426, 1.427 notification-theme.patch, 1.6, 1.7

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	control-center.spec notification-theme.patch 
Log Message:
fix patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- control-center.spec	17 Jan 2009 05:45:46 -0000	1.426
+++ control-center.spec	17 Jan 2009 06:01:48 -0000	1.427
@@ -22,7 +22,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -344,8 +344,8 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
-* Sat Jan 17 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-2
-Make notification theme changing work better
+* Sat Jan 17 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-3
+- Make notification theme changing work better
 
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-1
 - Update to 2.25.3

notification-theme.patch:

Index: notification-theme.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/notification-theme.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notification-theme.patch	17 Jan 2009 05:45:46 -0000	1.6
+++ notification-theme.patch	17 Jan 2009 06:01:48 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c
---- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2009-01-17 00:39:18.000000000 -0500
-+++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:40:30.000000000 -0500
+--- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2008-09-24 12:36:22.000000000 -0400
++++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:57:26.000000000 -0500
 @@ -43,6 +43,7 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
  {
    GConfClient *client;
@@ -9,7 +9,7 @@
    gint old_key_int;
    GnomeWindowManager *window_manager;
    GnomeWMSettings wm_settings;
-@@ -100,7 +101,10 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+@@ -100,15 +101,15 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
    g_free (old_key);
  
    /* set the notification theme */
@@ -17,7 +17,18 @@
 +  new_key = meta_theme_info->notification_theme_name;
 +  if (new_key == NULL)
 +    new_key = "standard";
++  old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
 +  if (compare (old_key, new_key))
      {
-       old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
-       if (compare (old_key, meta_theme_info->notification_theme_name))
+-      old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
+-      if (compare (old_key, meta_theme_info->notification_theme_name))
+-        {
+-          gconf_client_set_string (client, NOTIFICATION_THEME_KEY, meta_theme_info->notification_theme_name, NULL);
+-        }
+-      g_free (old_key);
++       gconf_client_set_string (client, NOTIFICATION_THEME_KEY, new_key, NULL);
+     }
++  g_free (old_key);
+ 
+   /* Set the cursor theme key */
+ #ifdef HAVE_XCURSOR