rpms/gnome-settings-daemon/devel notify-statusicon.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.94, 1.95

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2064

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	notify-statusicon.patch 
Log Message:
fix a warning


notify-statusicon.patch:

--- NEW FILE notify-statusicon.patch ---
diff -up gnome-settings-daemon-2.25.90/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c.notify-statusicon gnome-settings-daemon-2.25.90/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
--- gnome-settings-daemon-2.25.90/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c.notify-statusicon	2009-02-05 00:40:42.000000000 -0500
+++ gnome-settings-daemon-2.25.90/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	2009-02-05 00:48:26.000000000 -0500
@@ -544,10 +544,11 @@ ax_slowkeys_warning_post_bubble (GsdA11y
         }
 
         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-        manager->priv->notification = notify_notification_new_with_status_icon (title,
-                                                                                message,
-                                                                                "preferences-desktop-accessibility",
-                                                                                manager->priv->status_icon);
+        manager->priv->notification = notify_notification_new (title,
+                                                               message,
+                                                               "preferences-desktop-accessibility",
+                                                               NULL);
+        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
 
         notify_notification_add_action (manager->priv->notification,
@@ -688,10 +689,11 @@ ax_stickykeys_warning_post_bubble (GsdA1
         }
 
         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-        manager->priv->notification = notify_notification_new_with_status_icon (title,
-                                                                                message,
-                                                                                "preferences-desktop-accessibility",
-                                                                                manager->priv->status_icon);
+        manager->priv->notification = notify_notification_new (title,
+                                                               message,
+                                                               "preferences-desktop-accessibility",
+                                                               NULL):
+        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
 
         notify_notification_add_action (manager->priv->notification,


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-settings-daemon.spec	5 Feb 2009 04:33:18 -0000	1.94
+++ gnome-settings-daemon.spec	5 Feb 2009 05:54:11 -0000	1.95
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.25.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -38,6 +38,9 @@
 # http://bugzilla.redhat.com/324721
 #Patch11:	gnome-settings-daemon-2.24.0-fix-touchpad.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=570590
+Patch12:	notify-statusicon.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -59,6 +62,7 @@
 %patch10 -p1 -b .catch-deviceadded
 # This one is buggy, stop using for now
 #%patch11 -p1 -b .fix-touchpad
+%patch12 -p1 -b .notify-statusicon
 
 autoreconf -i -f
 
@@ -160,6 +164,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Thu Feb  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.90-2
+- Fix a warning (#484132)
+
 * Wed Feb  4 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.90-1
 - Update to 2.25.90