rpms/control-center/devel notification-theme.patch,1.1,1.2

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Sat May 17 19:04:26 UTC 2008 

Author: mclasen

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

Modified Files:
	notification-theme.patch 
Log Message:
improve the patch


notification-theme.patch:

Index: notification-theme.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/notification-theme.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- notification-theme.patch	17 May 2008 18:49:29 -0000	1.1
+++ notification-theme.patch	17 May 2008 19:03:36 -0000	1.2
@@ -1,15 +1,59 @@
---- gnome-control-center-2.23.1/capplets/common/gnome-theme-info.h	2008-01-03 11:22:07.000000000 -0500
-+++ hacked/capplets/common/gnome-theme-info.h	2008-05-17 14:18:23.000000000 -0400
-@@ -102,6 +102,7 @@
-   gchar *gtk_color_scheme;
-   gchar *metacity_theme_name;
-   gchar *icon_theme_name;
-+  gchar *notification_theme_name;
-   gchar *sound_theme_name;
-   gchar *cursor_theme_name;
-   guint cursor_size;
---- gnome-control-center-2.23.1/capplets/common/gnome-theme-info.c	2008-01-03 11:22:07.000000000 -0500
-+++ hacked/capplets/common/gnome-theme-info.c	2008-05-17 14:18:08.000000000 -0400
+diff -up gnome-control-center-2.23.1/capplets/appearance/theme-save.c.notification-theme gnome-control-center-2.23.1/capplets/appearance/theme-save.c
+--- gnome-control-center-2.23.1/capplets/appearance/theme-save.c.notification-theme	2008-01-03 11:22:05.000000000 -0500
++++ gnome-control-center-2.23.1/capplets/appearance/theme-save.c	2008-05-17 14:55:20.000000000 -0400
+@@ -242,6 +242,12 @@ write_theme_to_disk (GnomeThemeMetaInfo 
+     g_free (str);
+   }
+ 
++  if (theme_info->notification_theme_name) {
++    str = g_strdup_printf ("NotificationTheme=%s\n", theme_info->notification_theme_name);
++    gnome_vfs_write (handle, str, strlen (str), &bytes_written);
++    g_free (str);
++  }
++
+   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.1/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.23.1/capplets/common/gnome-theme-apply.c
+--- gnome-control-center-2.23.1/capplets/common/gnome-theme-apply.c.notification-theme	2008-03-27 09:01:32.000000000 -0400
++++ gnome-control-center-2.23.1/capplets/common/gnome-theme-apply.c	2008-05-17 14:58:16.000000000 -0400
+@@ -30,6 +30,7 @@
+ #define CURSOR_FONT_KEY   "/desktop/gnome/peripherals/mouse/cursor_font"
+ #define CURSOR_THEME_KEY   "/desktop/gnome/peripherals/mouse/cursor_theme"
+ #define CURSOR_SIZE_KEY    "/desktop/gnome/peripherals/mouse/cursor_size"
++#define NOTIFICATION_THEME_KEY    "/apps/notification-daemon/theme"
+ 
+ #define compare(x,y) (!x && y) || (x && !y) || (x && y && strcmp (x, y))
+ 
+@@ -38,6 +39,7 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+ {
+   GConfClient *client;
+   gchar *old_key;
++  gchar *new_key;
+   gint old_key_int;
+   GnomeWindowManager *window_manager;
+   GnomeWMSettings wm_settings;
+@@ -94,6 +96,17 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+     }
+   g_free (old_key);
+ 
++  /* set the notification theme */
++  old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
++  new_key = meta_theme_info->notification_theme_name;
++  if (new_key == NULL)
++    new_key = "standard";
++  if (compare (old_key, new_key))
++    {
++      gconf_client_set_string (client, NOTIFICATION_THEME_KEY, new_key, NULL);
++    }
++  g_free (old_key);
++
+   /* 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.1/capplets/common/gnome-theme-info.c.notification-theme gnome-control-center-2.23.1/capplets/common/gnome-theme-info.c
+--- gnome-control-center-2.23.1/capplets/common/gnome-theme-info.c.notification-theme	2008-01-03 11:22:07.000000000 -0500
++++ gnome-control-center-2.23.1/capplets/common/gnome-theme-info.c	2008-05-17 14:55:20.000000000 -0400
 @@ -24,6 +24,7 @@
  #define METACITY_THEME_KEY "X-GNOME-Metatheme/MetacityTheme"
  #define ICON_THEME_KEY "X-GNOME-Metatheme/IconTheme"
@@ -18,7 +62,7 @@
  #define CURSOR_SIZE_KEY "X-GNOME-Metatheme/CursorSize"
  #define SOUND_THEME_KEY "X-GNOME-Metatheme/SoundTheme"
  #define APPLICATION_FONT_KEY "X-GNOME-Metatheme/ApplicationFont"
-@@ -326,6 +327,10 @@
+@@ -326,6 +327,10 @@ gnome_theme_read_meta_theme (GnomeVFSURI
      }
    meta_theme_info->icon_theme_name = g_strdup (str);
  
@@ -29,7 +73,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);
-@@ -1718,6 +1723,7 @@
+@@ -1718,6 +1723,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);
@@ -37,7 +81,7 @@
    g_free (meta_theme_info);
  }
  
-@@ -1796,6 +1802,9 @@
+@@ -1796,6 +1802,9 @@ gnome_theme_meta_info_compare (GnomeThem
    cmp = safe_strcmp (a->icon_theme_name, b->icon_theme_name);
    if (cmp != 0) return cmp;
  
@@ -47,43 +91,14 @@
    cmp = safe_strcmp (a->sound_theme_name, b->sound_theme_name);
    if (cmp != 0) return cmp;
  
---- gnome-control-center-2.23.1/capplets/common/gnome-theme-apply.c	2008-03-27 09:01:32.000000000 -0400
-+++ hacked/capplets/common/gnome-theme-apply.c	2008-05-17 14:30:47.000000000 -0400
-@@ -30,6 +30,7 @@
- #define CURSOR_FONT_KEY   "/desktop/gnome/peripherals/mouse/cursor_font"
- #define CURSOR_THEME_KEY   "/desktop/gnome/peripherals/mouse/cursor_theme"
- #define CURSOR_SIZE_KEY    "/desktop/gnome/peripherals/mouse/cursor_size"
-+#define NOTIFICATION_THEME_KEY    "/apps/notification-daemon/theme"
- 
- #define compare(x,y) (!x && y) || (x && !y) || (x && y && strcmp (x, y))
- 
-@@ -94,6 +95,14 @@
-     }
-   g_free (old_key);
- 
-+  /* set the notification theme */
-+  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);
-+
-   /* Set the cursor theme key */
- #ifdef HAVE_XCURSOR
-   old_key = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL);
---- gnome-control-center-2.23.1/capplets/appearance/theme-save.c	2008-01-03 11:22:05.000000000 -0500
-+++ hacked/capplets/appearance/theme-save.c	2008-05-17 14:22:20.000000000 -0400
-@@ -242,6 +242,12 @@
-     g_free (str);
-   }
- 
-+  if (theme_info->notification_theme_name) {
-+    str = g_strdup_printf ("NotificationTheme=%s\n", theme_info->notification_theme_name);
-+    gnome_vfs_write (handle, str, strlen (str), &bytes_written);
-+    g_free (str);
-+  }
-+
-   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.1/capplets/common/gnome-theme-info.h.notification-theme gnome-control-center-2.23.1/capplets/common/gnome-theme-info.h
+--- gnome-control-center-2.23.1/capplets/common/gnome-theme-info.h.notification-theme	2008-01-03 11:22:07.000000000 -0500
++++ gnome-control-center-2.23.1/capplets/common/gnome-theme-info.h	2008-05-17 14:55:20.000000000 -0400
+@@ -102,6 +102,7 @@ struct _GnomeThemeMetaInfo
+   gchar *gtk_color_scheme;
+   gchar *metacity_theme_name;
+   gchar *icon_theme_name;
++  gchar *notification_theme_name;
+   gchar *sound_theme_name;
+   gchar *cursor_theme_name;
+   guint cursor_size;

More information about the fedora-extras-commits mailing list