[mate-panel] 01/02: debian/patches: Add 1000_allow_re-registration.diff. (LP: #1675580)

[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 4350badab962723cdde22b3ba67303f2db8277a0
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Fri Mar 24 22:57:03 2017 +0000

    debian/patches: Add 1000_allow_re-registration.diff. (LP: #1675580)
---
 debian/patches/1000_allow_re-registration.diff | 29 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/1000_allow_re-registration.diff b/debian/patches/1000_allow_re-registration.diff
new file mode 100644
index 0000000..612039d
--- /dev/null
+++ b/debian/patches/1000_allow_re-registration.diff
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..efe115e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1000_allow_re-registration.diff

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