From 72d3549c4dbbe6e7373d74550a2f6d2b2f0690a9 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Fri, 14 Jul 2017 14:38:29 -0400 Subject: libpanel-applet: return process type and applet uid Return applet process type and generated uid from factory. Process type will be needed to know if we should create GtkSocket, but uid will be used to get applet widget. --- .../libmate-panel-applet-private/panel-applet-container.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mate-panel/libmate-panel-applet-private') diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-container.c b/mate-panel/libmate-panel-applet-private/panel-applet-container.c index e4232fcb..4b4ffd2b 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applet-container.c +++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.c @@ -32,7 +32,9 @@ struct _MatePanelAppletContainerPrivate { guint name_watcher_id; gchar *bus_name; + gboolean out_of_process; guint32 xid; + guint32 uid; GtkWidget *socket; GHashTable *pending_ops; @@ -379,7 +381,12 @@ get_applet_cb (GObject *source_object, } container = MATE_PANEL_APPLET_CONTAINER (g_async_result_get_source_object (G_ASYNC_RESULT (result))); - g_variant_get (retvals, "(&ou)", &applet_path, &container->priv->xid); + g_variant_get (retvals, + "(&obuu)", + &applet_path, + &container->priv->out_of_process, + &container->priv->xid, + &container->priv->uid); g_dbus_proxy_new (connection, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, @@ -432,7 +439,7 @@ on_factory_appeared (GDBusConnection *connection, MATE_PANEL_APPLET_FACTORY_INTERFACE, "GetApplet", data->parameters, - G_VARIANT_TYPE ("(ou)"), + G_VARIANT_TYPE ("(obuu)"), G_DBUS_CALL_FLAGS_NONE, -1, data->cancellable, -- cgit v1.2.1