summaryrefslogtreecommitdiffstats
path: root/sysutils/gnome-settings-daemon/files/patch-libnotify
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-03-07 02:50:43 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-03-07 02:50:43 +0800
commitbe19356527967f0ac3bc9ecae4f3ee99fd37b297 (patch)
treecc299f436a1ecb41c9d2caa322b843e3e4deb061 /sysutils/gnome-settings-daemon/files/patch-libnotify
parent5eb30550d545134961b6eded1a8607147fd3b37c (diff)
downloadmarcuscom-ports-be19356527967f0ac3bc9ecae4f3ee99fd37b297.tar
marcuscom-ports-be19356527967f0ac3bc9ecae4f3ee99fd37b297.tar.gz
marcuscom-ports-be19356527967f0ac3bc9ecae4f3ee99fd37b297.tar.bz2
marcuscom-ports-be19356527967f0ac3bc9ecae4f3ee99fd37b297.tar.lz
marcuscom-ports-be19356527967f0ac3bc9ecae4f3ee99fd37b297.tar.xz
marcuscom-ports-be19356527967f0ac3bc9ecae4f3ee99fd37b297.tar.zst
marcuscom-ports-be19356527967f0ac3bc9ecae4f3ee99fd37b297.zip
Fix with new libnotify API.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15354 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-settings-daemon/files/patch-libnotify')
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-libnotify58
1 files changed, 58 insertions, 0 deletions
diff --git a/sysutils/gnome-settings-daemon/files/patch-libnotify b/sysutils/gnome-settings-daemon/files/patch-libnotify
new file mode 100644
index 000000000..1166875bf
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-libnotify
@@ -0,0 +1,58 @@
+From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann@redhat.com>
+Date: Tue, 12 Oct 2010 03:35:45 +0000
+Subject: Require libnotify 0.6.0
+
+---
+diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+index 9ca820a..f5964b9 100644
+--- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
++++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ 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);
++ "preferences-desktop-accessibility");
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ 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);
++ "preferences-desktop-accessibility");
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
+index 02536a3..ef57d5b 100644
+--- plugins/xrandr/gsd-xrandr-manager.c
++++ plugins/xrandr/gsd-xrandr-manager.c
+@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
+
+ g_assert (error_to_display == NULL || secondary_text == NULL);
+
+- if (priv->status_icon)
+- notification = notify_notification_new_with_status_icon (primary_text,
+- error_to_display ? error_to_display->message : secondary_text,
+- GSD_XRANDR_ICON_NAME,
+- priv->status_icon);
+- else
+- notification = notify_notification_new (primary_text,
+- error_to_display ? error_to_display->message : secondary_text,
+- GSD_XRANDR_ICON_NAME,
+- NULL);
++ notification = notify_notification_new (primary_text,
++ error_to_display ? error_to_display->message : secondary_text,
++ GSD_XRANDR_ICON_NAME);
+
+ notify_notification_show (notification, NULL); /* NULL-GError */
+ #else
+--
+cgit v0.8.3.4