rpms/control-center/devel notification-theme.patch, NONE, 1.1 control-center.spec, 1.363, 1.364

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	control-center.spec 
Added Files:
	notification-theme.patch 
Log Message:
support notification themes


notification-theme.patch:

--- NEW FILE notification-theme.patch ---
--- 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
@@ -24,6 +24,7 @@
 #define METACITY_THEME_KEY "X-GNOME-Metatheme/MetacityTheme"
 #define ICON_THEME_KEY "X-GNOME-Metatheme/IconTheme"
 #define CURSOR_THEME_KEY "X-GNOME-Metatheme/CursorTheme"
+#define NOTIFICATION_THEME_KEY "X-GNOME-Metatheme/NotificationTheme"
 #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 @@
     }
   meta_theme_info->icon_theme_name = g_strdup (str);
 
+  str = gnome_desktop_item_get_string (meta_theme_ditem, NOTIFICATION_THEME_KEY);
+  if (str != NULL)
+    meta_theme_info->notification_theme_name = g_strdup (str);
+
   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 @@
   g_free (meta_theme_info->gtk_color_scheme);
   g_free (meta_theme_info->icon_theme_name);
   g_free (meta_theme_info->metacity_theme_name);
+  g_free (meta_theme_info->notification_theme_name);
   g_free (meta_theme_info);
 }
 
@@ -1796,6 +1802,9 @@
   cmp = safe_strcmp (a->icon_theme_name, b->icon_theme_name);
   if (cmp != 0) return cmp;
 
+  cmp = safe_strcmp (a->notification_theme_name, b->notification_theme_name);
+  if (cmp != 0) return cmp;
+
   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);


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- control-center.spec	13 May 2008 13:40:34 -0000	1.363
+++ control-center.spec	17 May 2008 18:49:29 -0000	1.364
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.23.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -45,6 +45,9 @@
 
 Patch100: add-randr12-capplet.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=533611
+Patch101: notification-theme.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
@@ -175,6 +178,8 @@
 %patch100 -p1 -b .add-randr12-capplet
 %patch7 -p1 -b .make-default
 
+%patch101 -p1 -b .notification-theme
+
 %build
 
 autoreconf
@@ -352,6 +357,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sat May 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.1-4
+- Support notication themes in the appearance capplet
+
 * Tue May 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.1-3
 - Rebuild against newer libs