Merge lp:~muktupavels/libappindicator/no-host into lp:libappindicator

[Alberts Muktupāvels]

Fall back to tray icon when StatusNotifierHost is not available.

Fall back to tray icon when StatusNotifierHost is not available.

https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/64

[Alberts Muktupāvels (muktupavels)]

indicator-application-service does not support RegisterStatusNotifierHost method, but it does return TRUE for IsStatusNotifierHostRegistered.

[Khurshid Alam (khurshid-alam)]

review: Approve

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2020-04-08 18:39:30 +0000
+++ src/app-indicator.c	2020-07-06 13:03:40 +0000
@@ -213,6 +213,38 @@
 G_DEFINE_TYPE (AppIndicator, app_indicator, G_TYPE_OBJECT);
 
 static void
+check_is_host_registered (AppIndicator *self)
+{
+	GVariant *variant;
+	gboolean is_host_registered;
+
+	variant = g_dbus_proxy_get_cached_property (self->priv->watcher_proxy,
+	                                            "IsStatusNotifierHostRegistered");
+
+	is_host_registered = FALSE;
+	if (variant != NULL) {
+		is_host_registered = g_variant_get_boolean (variant);
+		g_variant_unref (variant);
+	}
+
+	if (!is_host_registered) {
+		start_fallback_timer (self, FALSE);
+		return;
+	}
+
+	check_connect (self);
+}
+
+static void
+watcher_properties_changed_cb (GDBusProxy   *proxy,
+                               GVariant     *changed_properties,
+                               GStrv         invalidated_properties,
+                               AppIndicator *self)
+{
+	check_is_host_registered (self);
+}
+
+static void
 watcher_ready_cb (GObject      *source_object,
                   GAsyncResult *res,
                   gpointer      user_data)
@@ -230,7 +262,12 @@
 		return;
 	}
 
-	check_connect (self);
+	g_signal_connect (self->priv->watcher_proxy,
+	                  "g-properties-changed",
+	                  G_CALLBACK (watcher_properties_changed_cb),
+	                  self);
+
+	check_is_host_registered (self);
 	g_object_unref (self);
 }
 
@@ -243,7 +280,6 @@
 	AppIndicator *self = (AppIndicator *) user_data;
 
 	g_dbus_proxy_new (self->priv->connection,
-	                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
 	                  G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
 	                  watcher_interface_info,
 	                  NOTIFICATION_WATCHER_DBUS_ADDR,

=== modified file 'tests/test-libappindicator-fallback-watcher.c'
--- tests/test-libappindicator-fallback-watcher.c	2013-01-16 19:53:52 +0000
+++ tests/test-libappindicator-fallback-watcher.c	2020-07-06 13:03:40 +0000
@@ -20,97 +20,199 @@
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <gio/gio.h>
 
 #include "../src/dbus-shared.h"
 
-gboolean kill_func (gpointer userdata);
-
-static GMainLoop * mainloop = NULL;
-
-static DBusHandlerResult
-dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data)
-{
-	if (dbus_message_is_method_call(message, NOTIFICATION_WATCHER_DBUS_ADDR, "RegisterStatusNotifierItem")) {
-		DBusMessage * reply = dbus_message_new_method_return(message);
-		dbus_connection_send(connection, reply, NULL);
-		dbus_message_unref(reply);
-
-		/* Let the messages get out, but we're done at this point */
-		g_timeout_add(50, kill_func, NULL);
-
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-gboolean
-kill_func (gpointer userdata)
-{
-	g_main_loop_quit(mainloop);
-	return FALSE;
+typedef struct
+{
+  int        status;
+
+  GMainLoop *loop;
+} TestData;
+
+static const gchar introspection_xml[] =
+  "<node>"
+  "  <interface name='" NOTIFICATION_WATCHER_DBUS_IFACE "'>"
+  "    <method name='RegisterStatusNotifierItem'>"
+  "      <arg type='s' name='service' direction='in'/>"
+  "    </method>"
+  "    <property type='b' name='IsStatusNotifierHostRegistered' access='read'/>"
+  "  </interface>"
+  "</node>";
+
+static gboolean
+kill_func (gpointer user_data)
+{
+  TestData *data;
+
+  data = user_data;
+  data->status = EXIT_FAILURE;
+
+  g_main_loop_quit (data->loop);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+handle_method_call (GDBusConnection       *connection,
+                    const gchar           *sender,
+                    const gchar           *object_path,
+                    const gchar           *interface_name,
+                    const gchar           *method_name,
+                    GVariant              *parameters,
+                    GDBusMethodInvocation *invocation,
+                    gpointer               user_data)
+{
+  TestData *data;
+
+  data = user_data;
+
+  if (g_strcmp0 (method_name, "RegisterStatusNotifierItem") == 0)
+    {
+      g_dbus_method_invocation_return_value (invocation, NULL);
+      g_main_loop_quit (data->loop);
+    }
+}
+
+static GVariant *
+handle_get_property (GDBusConnection  *connection,
+                     const gchar      *sender,
+                     const gchar      *object_path,
+                     const gchar      *interface_name,
+                     const gchar      *property_name,
+                     GError          **error,
+                     gpointer          user_data)
+{
+  if (g_strcmp0 (property_name, "IsStatusNotifierHostRegistered") == 0)
+    return g_variant_new_boolean (TRUE);
+
+  return NULL;
+}
+
+static const GDBusInterfaceVTable interface_vtable =
+{
+  handle_method_call,
+  handle_get_property,
+  NULL
+};
+
+static void
+bus_acquired_cb (GDBusConnection *connection,
+                 const gchar     *name,
+                 gpointer         user_data)
+{
+  
+  GDBusNodeInfo *introspection_info;
+
+  introspection_info = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+
+  g_dbus_connection_register_object (connection,
+                                     NOTIFICATION_WATCHER_DBUS_OBJ,
+                                     introspection_info->interfaces[0],
+                                     &interface_vtable,
+                                     user_data,
+                                     NULL,
+                                     NULL);
+
+  g_dbus_node_info_unref (introspection_info);
+}
+
+static void
+name_lost_cb (GDBusConnection *connection,
+              const gchar     *name,
+              gpointer         user_data)
+{
+  TestData *data;
+
+  data = user_data;
+  data->status = EXIT_FAILURE;
+
+  g_main_loop_quit (data->loop);
 }
 
 int
-main (int argv, char ** argc)
+main (int   argc,
+      char *argv[])
 {
-	g_debug("Waiting to init.");
-
-
-	GError * error = NULL;
-	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
-		return 1;
-	}
-
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-
-	gboolean has_owner = FALSE;
-	gint owner_count = 0;
-	while (!has_owner && owner_count < 10000) {
-		org_freedesktop_DBus_name_has_owner(bus_proxy, "org.test", &has_owner, NULL);
-		owner_count++;
-		g_usleep(500000);
-	}
-
-	if (owner_count == 10000) {
-		g_error("Unable to get name owner after 10000 tries");
-		return 1;
-	}
-
-	g_usleep(500000);
-
-	g_debug("Initing");
-
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}   
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL);
-
-	/* This is the final kill function.  It really shouldn't happen
-	   unless we get an error. */
-	g_timeout_add_seconds(20, kill_func, NULL);
-
-	g_debug("Entering Mainloop");
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_debug("Exiting");
-
-	return 0;
+  GDBusProxy *proxy;
+  gboolean has_owner;
+  gint owner_count;
+  TestData data;
+  guint owner_id;
+
+  g_debug ("Waiting to init.");
+
+  proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                         G_DBUS_PROXY_FLAGS_NONE,
+                                         NULL,
+                                         "org.freedesktop.DBus",
+                                         "/org/freedesktop/DBus",
+                                         "org.freedesktop.DBus",
+                                         NULL,
+                                         NULL);
+
+  has_owner = FALSE;
+  owner_count = 0;
+
+  while (!has_owner && owner_count < 10000)
+    {
+      GVariant *variant;
+
+      variant = g_dbus_proxy_call_sync (proxy,
+                                        "NameHasOwner",
+                                        g_variant_new ("(s)", "org.test"),
+                                        G_DBUS_CALL_FLAGS_NONE,
+                                        -1,
+                                        NULL,
+                                        NULL);
+
+      if (variant != NULL)
+        {
+          g_variant_get (variant, "(b)", &has_owner);
+          g_variant_unref (variant);
+        }
+
+      g_usleep (500000);
+      owner_count++;
+    }
+
+  g_object_unref (proxy);
+
+  if (owner_count == 10000)
+    {
+      g_error ("Unable to get name owner after 10000 tries");
+      return EXIT_FAILURE;
+    }
+
+  g_usleep (500000);
+  g_debug ("Initing");
+
+  data.status = EXIT_SUCCESS;
+  data.loop = g_main_loop_new (NULL, FALSE);
+
+  owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+                             NOTIFICATION_WATCHER_DBUS_ADDR,
+                             G_BUS_NAME_OWNER_FLAGS_NONE,
+                             bus_acquired_cb,
+                             NULL,
+                             name_lost_cb,
+                             &data,
+                             NULL);
+
+  /* This is the final kill function. It really shouldn't happen
+   * unless we get an error.
+   */
+  g_timeout_add_seconds (20, kill_func, &data);
+
+  g_debug ("Entering Mainloop");
+
+  g_main_loop_run (data.loop);
+
+  g_main_loop_unref (data.loop);
+  g_bus_unown_name (owner_id);
+
+  g_debug ("Exiting");
+
+  return data.status;
 }