[mate-panel] 01/02: debian/patches: Drop 1000_allow_re-registration.diff. Applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch ubuntu/zesty
in repository mate-panel.

commit f752a70ec508fb1051200aa64608ea2b784af1d8
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Wed Apr 5 16:23:59 2017 +0100

    debian/patches: Drop 1000_allow_re-registration.diff. Applied upstream.
---
 debian/patches/1000_allow_re-registration.diff | 29 --------------------------
 debian/patches/series                          |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/1000_allow_re-registration.diff b/debian/patches/1000_allow_re-registration.diff
deleted file mode 100644
index 612039d..0000000
--- a/debian/patches/1000_allow_re-registration.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/applets/notification_area/libstatus-notifier-watcher/gf-sn-watcher-v0.c b/applets/notification_area/libstatus-notifier-watcher/gf-sn-watcher-v0.c
-index 8e82c10..3d3a97c 100644
---- a/applets/notification_area/libstatus-notifier-watcher/gf-sn-watcher-v0.c
-+++ b/applets/notification_area/libstatus-notifier-watcher/gf-sn-watcher-v0.c
-@@ -284,10 +284,24 @@ gf_sn_watcher_v0_handle_register_item (GfSnWatcherV0Gen      *object,
- 
-   if (watch != NULL)
-     {
-+      /* the specification doesn't explicitly state what should happen when
-+       * trying to register the same item again, so it would make sense to
-+       * forbid it.  Unfortunately libappindicator tries re-registering pretty
-+       * often, and even falls back to System Tray if it fails.
-+       * So in practice we need to be forgiving and pretend it's OK. */
-+#if 0
-       g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
-                                              G_DBUS_ERROR_INVALID_ARGS,
-                                              "Status Notifier Item with bus name '%s' and object path '%s' is already registered",
-                                              bus_name, object_path);
-+#else
-+      g_warning ("Status Notifier Item with bus name '%s' and object path '%s' is already registered",
-+                 bus_name, object_path);
-+      /* FIXME: is it OK to simply ignore the request instead of removing the
-+       *        old one and adding the new one?  I don't see the problem as
-+       *        they are identical, but...? */
-+      gf_sn_watcher_v0_gen_complete_register_item (object, invocation);
-+#endif
- 
-       return TRUE;
-     }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index efe115e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-1000_allow_re-registration.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-panel.git