From 502b883ca106a672c365a82e1051a718969efac2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 Feb 2009 05:54:11 +0000 Subject: [PATCH] fix a warning --- gnome-settings-daemon.spec | 9 ++++++++- notify-statusicon.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 notify-statusicon.patch diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 309a8f5..8fadf52 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -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 @@ Patch10: gnome-settings-daemon-2.24.0-catch-deviceadded.patch # 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 @@ developing applications that use %{name}. %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 @@ fi %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Thu Feb 5 2009 Matthias Clasen - 2.25.90-2 +- Fix a warning (#484132) + * Wed Feb 4 2009 Matthias Clasen - 2.25.90-1 - Update to 2.25.90 diff --git a/notify-statusicon.patch b/notify-statusicon.patch new file mode 100644 index 0000000..cce6fae --- /dev/null +++ b/notify-statusicon.patch @@ -0,0 +1,35 @@ +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,