From 51c40bf3b2968104250f3c97dfaec4c0e6813eb4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Mar 2009 01:45:18 +0000 Subject: [PATCH] 2.25.92 --- .cvsignore | 2 +- gnome-settings-daemon.spec | 11 +++++------ notify-statusicon.patch | 35 ----------------------------------- sources | 2 +- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 notify-statusicon.patch diff --git a/.cvsignore b/.cvsignore index d157a30..a507717 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-settings-daemon-2.25.90.tar.bz2 +gnome-settings-daemon-2.25.92.tar.bz2 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index c2919eb..bae7d49 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon -Version: 2.25.90 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -38,9 +38,6 @@ 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. @@ -62,7 +59,6 @@ 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 @@ -164,6 +160,9 @@ fi %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Mon Mar 2 2009 Matthias Clasen - 2.25.92-1 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.90-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/notify-statusicon.patch b/notify-statusicon.patch deleted file mode 100644 index 6c047fe..0000000 --- a/notify-statusicon.patch +++ /dev/null @@ -1,35 +0,0 @@ -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, diff --git a/sources b/sources index cee79d1..115b03b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e50852ecd22ef956ac5ec5650683f2dd gnome-settings-daemon-2.25.90.tar.bz2 +0b3588da5366fb3978aa936ad2a2140c gnome-settings-daemon-2.25.92.tar.bz2