summaryrefslogtreecommitdiff
path: root/extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch')
-rw-r--r--extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch b/extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
deleted file mode 100644
index f755f24ac..000000000
--- a/extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -48,6 +48,9 @@
-
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif /* HAVE_LIBNOTIFY */
-
- #include "gnome-settings-profile.h"
-@@ -608,9 +611,13 @@
- gsd_a11y_keyboard_manager_ensure_status_icon (manager);
- manager->priv->notification = notify_notification_new (title,
- message,
-- "preferences-desktop-accessibility",
-- NULL);
-+ "preferences-desktop-accessibility"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ );
-+#else
-+ , NULL);
- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+#endif
- notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
-
- notify_notification_add_action (manager->priv->notification,
-@@ -747,9 +754,13 @@
- gsd_a11y_keyboard_manager_ensure_status_icon (manager);
- manager->priv->notification = notify_notification_new (title,
- message,
-- "preferences-desktop-accessibility",
-- NULL);
-+ "preferences-desktop-accessibility"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ );
-+#else
-+ , NULL);
- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+#endif
- notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
-
- notify_notification_add_action (manager->priv->notification,
---- plugins/xrandr/gsd-xrandr-manager.c
-+++ plugins/xrandr/gsd-xrandr-manager.c
-@@ -48,6 +48,9 @@
-
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
-
- #include "gnome-settings-profile.h"
-@@ -1086,6 +1089,11 @@
-
- g_assert (error_to_display == NULL || secondary_text == NULL);
-
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ notification = notify_notification_new (primary_text,
-+ error_to_display ? error_to_display->message : secondary_text,
-+ GSD_XRANDR_ICON_NAME);
-+#else
- if (priv->status_icon)
- notification = notify_notification_new_with_status_icon (primary_text,
- error_to_display ? error_to_display->message : secondary_text,
-@@ -1096,6 +1104,7 @@
- error_to_display ? error_to_display->message : secondary_text,
- GSD_XRANDR_ICON_NAME,
- NULL);
-+#endif
-
- notify_notification_show (notification, NULL); /* NULL-GError */
- #else