X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgapplicationimpl-dbus.c;h=94cf6ea262b70e9c942e6e93ef5ccc908e13c116;hb=f2786908a8858ec9d063e8fae7e4b2d8d612b682;hp=2a1a188538c55eea82ee39a736bbbe9f08e8691e;hpb=bc5fe41dec00a80ee0f9e827898e75e0553ed39c;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index 2a1a188..94cf6ea 100644
--- a/gio/gapplicationimpl-dbus.c
+++ b/gio/gapplicationimpl-dbus.c
@@ -12,22 +12,25 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Authors: Ryan Lortie
*/
+#include "config.h"
+
#include "gapplicationimpl.h"
#include "gactiongroup.h"
#include "gactiongroupexporter.h"
+#include "gremoteactiongroup.h"
+#include "gdbusactiongroup-private.h"
#include "gapplication.h"
#include "gfile.h"
#include "gdbusconnection.h"
#include "gdbusintrospection.h"
#include "gdbuserror.h"
+#include "glib/gstdio.h"
#include
#include
@@ -35,98 +38,135 @@
#include "gapplicationcommandline.h"
#include "gdbusmethodinvocation.h"
-/* DBus Interface definition {{{1 */
-static const GDBusArgInfo platform_data_arg = { -1, (gchar *) "platform_data", (gchar *) "a{sv}" };
-
-static const GDBusArgInfo open_uris_arg = { -1, (gchar *) "uris", (gchar *) "as" };
-static const GDBusArgInfo open_hint_arg = { -1, (gchar *) "hint", (gchar *) "s" };
-
-static const GDBusArgInfo invoke_action_name_arg = { -1, (gchar *) "name", (gchar *) "s" };
-static const GDBusArgInfo invoke_action_args_arg = { -1, (gchar *) "args", (gchar *) "v" };
-
-static const GDBusArgInfo cmdline_path_arg = { -1, (gchar *) "path", (gchar *) "o" };
-static const GDBusArgInfo cmdline_arguments_arg = { -1, (gchar *) "arguments", (gchar *) "aay" };
-static const GDBusArgInfo cmdline_exit_status_arg = { -1, (gchar *) "exit_status", (gchar *) "i" };
-
-static const GDBusArgInfo *activate_in[] = { &platform_data_arg, NULL };
-static const GDBusArgInfo *activate_out[] = { NULL };
-
-static const GDBusArgInfo *open_in[] = { &open_uris_arg, &open_hint_arg, &platform_data_arg, NULL };
-static const GDBusArgInfo *open_out[] = { NULL };
+#ifdef G_OS_UNIX
+#include "gunixinputstream.h"
+#include "gunixfdlist.h"
+#endif
-static const GDBusArgInfo *cmdline_in[] = { &cmdline_path_arg, &cmdline_arguments_arg, &platform_data_arg, NULL };
-static const GDBusArgInfo *cmdline_out[] = { &cmdline_exit_status_arg, NULL };
-
-static const GDBusMethodInfo activate_method = {
- -1, (gchar *) "Activate",
- (GDBusArgInfo **) activate_in,
- (GDBusArgInfo **) activate_out
-};
-
-static const GDBusMethodInfo open_method = {
- -1, (gchar *) "Open",
- (GDBusArgInfo **) open_in,
- (GDBusArgInfo **) open_out
-};
-
-static const GDBusMethodInfo command_line_method = {
- -1, (gchar *) "CommandLine",
- (GDBusArgInfo **) cmdline_in,
- (GDBusArgInfo **) cmdline_out
-};
-
-static const GDBusMethodInfo *application_methods[] = {
- &activate_method, &open_method, &command_line_method, NULL
-};
-
-const GDBusInterfaceInfo org_gtk_Application = {
- -1, (gchar *) "org.gtk.Application",
- (GDBusMethodInfo **) application_methods
-};
-
-static const GDBusArgInfo message_arg = { -1, (gchar *) "message", (gchar *) "s" };
-static const GDBusArgInfo *print_in[] = { &message_arg, NULL };
-static const GDBusArgInfo *print_out[] = { NULL };
-
-static const GDBusMethodInfo stdout_method = {
- -1, (gchar *) "Print",
- (GDBusArgInfo **) print_in,
- (GDBusArgInfo **) print_out
-};
-
-static const GDBusMethodInfo stderr_method = {
- -1, (gchar *) "PrintError",
- (GDBusArgInfo **) print_in,
- (GDBusArgInfo **) print_out
-};
-
-static const GDBusMethodInfo *cmdline_methods[] = {
- &stdout_method, &stderr_method, NULL
-};
+/* DBus Interface definition {{{1 */
-const GDBusInterfaceInfo org_gtk_private_Cmdline = {
- -1, (gchar *) "org.gtk.private.CommandLine",
- (GDBusMethodInfo **) cmdline_methods
-};
+/* For documentation of these interfaces, see
+ * https://wiki.gnome.org/Projects/GLib/GApplication/DBusAPI
+ */
+static const gchar org_gtk_Application_xml[] =
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ "";
+
+static GDBusInterfaceInfo *org_gtk_Application;
+
+static const gchar org_freedesktop_Application_xml[] =
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ "";
+
+static GDBusInterfaceInfo *org_freedesktop_Application;
+
+static const gchar org_gtk_private_CommandLine_xml[] =
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ "";
+
+static GDBusInterfaceInfo *org_gtk_private_CommandLine;
/* GApplication implementation {{{1 */
struct _GApplicationImpl
{
GDBusConnection *session_bus;
+ GActionGroup *exported_actions;
const gchar *bus_name;
+
gchar *object_path;
guint object_id;
- gboolean actions_exported;
- gpointer app;
+ guint fdo_object_id;
+ guint actions_id;
- GHashTable *actions;
- guint signal_id;
+ gboolean properties_live;
+ gboolean primary;
+ gboolean busy;
+ GApplication *app;
};
static GApplicationCommandLine *
g_dbus_command_line_new (GDBusMethodInvocation *invocation);
+static GVariant *
+g_application_impl_get_property (GDBusConnection *connection,
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *property_name,
+ GError **error,
+ gpointer user_data)
+{
+ GApplicationImpl *impl = user_data;
+
+ if (strcmp (property_name, "Busy") == 0)
+ return g_variant_new_boolean (impl->busy);
+
+ g_assert_not_reached ();
+
+ return NULL;
+}
+
+static void
+send_property_change (GApplicationImpl *impl)
+{
+ GVariantBuilder builder;
+
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_add (&builder,
+ "{sv}",
+ "Busy", g_variant_new_boolean (impl->busy));
+
+ g_dbus_connection_emit_signal (impl->session_bus,
+ NULL,
+ impl->object_path,
+ "org.freedesktop.DBus.Properties",
+ "PropertiesChanged",
+ g_variant_new ("(sa{sv}as)",
+ "org.gtk.Application",
+ &builder,
+ NULL),
+ NULL);
+}
static void
g_application_impl_method_call (GDBusConnection *connection,
@@ -147,7 +187,10 @@ g_application_impl_method_call (GDBusConnection *connection,
{
GVariant *platform_data;
+ /* Completely the same for both freedesktop and gtk interfaces */
+
g_variant_get (parameters, "(@a{sv})", &platform_data);
+
class->before_emit (impl->app, platform_data);
g_signal_emit_by_name (impl->app, "activate");
class->after_emit (impl->app, platform_data);
@@ -158,14 +201,28 @@ g_application_impl_method_call (GDBusConnection *connection,
else if (strcmp (method_name, "Open") == 0)
{
+ GApplicationFlags flags;
GVariant *platform_data;
const gchar *hint;
GVariant *array;
GFile **files;
gint n, i;
- g_variant_get (parameters, "(@ass@a{sv})",
- &array, &hint, &platform_data);
+ flags = g_application_get_flags (impl->app);
+ if ((flags & G_APPLICATION_HANDLES_OPEN) == 0)
+ {
+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "Application does not open files");
+ return;
+ }
+
+ /* freedesktop interface has no hint parameter */
+ if (g_str_equal (interface_name, "org.freedesktop.Application"))
+ {
+ g_variant_get (parameters, "(@as@a{sv})", &array, &platform_data);
+ hint = "";
+ }
+ else
+ g_variant_get (parameters, "(@as&s@a{sv})", &array, &hint, &platform_data);
n = g_variant_n_children (array);
files = g_new (GFile *, n + 1);
@@ -195,10 +252,21 @@ g_application_impl_method_call (GDBusConnection *connection,
else if (strcmp (method_name, "CommandLine") == 0)
{
+ GApplicationFlags flags;
GApplicationCommandLine *cmdline;
GVariant *platform_data;
int status;
+ flags = g_application_get_flags (impl->app);
+ if ((flags & G_APPLICATION_HANDLES_COMMAND_LINE) == 0)
+ {
+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED,
+ "Application does not handle command line arguments");
+ return;
+ }
+
+ /* Only on the GtkApplication interface */
+
cmdline = g_dbus_command_line_new (invocation);
platform_data = g_variant_get_child_value (parameters, 2);
class->before_emit (impl->app, platform_data);
@@ -208,6 +276,30 @@ g_application_impl_method_call (GDBusConnection *connection,
g_variant_unref (platform_data);
g_object_unref (cmdline);
}
+ else if (g_str_equal (method_name, "ActivateAction"))
+ {
+ GVariant *parameter = NULL;
+ GVariant *platform_data;
+ GVariantIter *iter;
+ const gchar *name;
+
+ /* Only on the freedesktop interface */
+
+ g_variant_get (parameters, "(&sav@a{sv})", &name, &iter, &platform_data);
+ g_variant_iter_next (iter, "v", ¶meter);
+ g_variant_iter_free (iter);
+
+ class->before_emit (impl->app, platform_data);
+ g_action_group_activate_action (impl->exported_actions, name, parameter);
+ class->after_emit (impl->app, platform_data);
+
+ if (parameter)
+ g_variant_unref (parameter);
+
+ g_variant_unref (platform_data);
+
+ g_dbus_method_invocation_return_value (invocation, NULL);
+ }
else
g_assert_not_reached ();
}
@@ -217,6 +309,10 @@ application_path_from_appid (const gchar *appid)
{
gchar *appid_path, *iter;
+ if (appid == NULL)
+ /* this is a private implementation detail */
+ return g_strdup ("/org/gtk/Application/anonymous");
+
appid_path = g_strconcat ("/", appid, NULL);
for (iter = appid_path; *iter; iter++)
{
@@ -230,207 +326,213 @@ application_path_from_appid (const gchar *appid)
return appid_path;
}
-void
-g_application_impl_destroy (GApplicationImpl *impl)
+/* Attempt to become the primary instance.
+ *
+ * Returns %TRUE if everything went OK, regardless of if we became the
+ * primary instance or not. %FALSE is reserved for when something went
+ * seriously wrong (and @error will be set too, in that case).
+ *
+ * After a %TRUE return, impl->primary will be TRUE if we were
+ * successful.
+ */
+static gboolean
+g_application_impl_attempt_primary (GApplicationImpl *impl,
+ GCancellable *cancellable,
+ GError **error)
{
- if (impl->session_bus)
+ const static GDBusInterfaceVTable vtable = {
+ g_application_impl_method_call,
+ g_application_impl_get_property,
+ NULL /* set_property */
+ };
+ GApplicationClass *app_class = G_APPLICATION_GET_CLASS (impl->app);
+ GVariant *reply;
+ guint32 rval;
+
+ if (org_gtk_Application == NULL)
{
- if (impl->object_id)
- g_dbus_connection_unregister_object (impl->session_bus,
- impl->object_id);
- if (impl->actions_exported)
- g_action_group_exporter_stop (impl->app);
-
- g_dbus_connection_call (impl->session_bus,
- "org.freedesktop.DBus",
- "/org/freedesktop/DBus",
- "org.freedesktop.DBus",
- "ReleaseName",
- g_variant_new ("(s)",
- impl->bus_name),
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- -1, NULL, NULL, NULL);
-
- g_object_unref (impl->session_bus);
- g_free (impl->object_path);
+ GError *error = NULL;
+ GDBusNodeInfo *info;
+
+ info = g_dbus_node_info_new_for_xml (org_gtk_Application_xml, &error);
+ if G_UNLIKELY (info == NULL)
+ g_error ("%s", error->message);
+ org_gtk_Application = g_dbus_node_info_lookup_interface (info, "org.gtk.Application");
+ g_assert (org_gtk_Application != NULL);
+ g_dbus_interface_info_ref (org_gtk_Application);
+ g_dbus_node_info_unref (info);
+
+ info = g_dbus_node_info_new_for_xml (org_freedesktop_Application_xml, &error);
+ if G_UNLIKELY (info == NULL)
+ g_error ("%s", error->message);
+ org_freedesktop_Application = g_dbus_node_info_lookup_interface (info, "org.freedesktop.Application");
+ g_assert (org_freedesktop_Application != NULL);
+ g_dbus_interface_info_ref (org_freedesktop_Application);
+ g_dbus_node_info_unref (info);
}
- else
+
+ /* We could possibly have been D-Bus activated as a result of incoming
+ * requests on either the application or actiongroup interfaces.
+ * Because of how GDBus dispatches messages, we need to ensure that
+ * both of those things are registered before we attempt to request
+ * our name.
+ *
+ * The action group need not be populated yet, as long as it happens
+ * before we return to the mainloop. The reason for that is because
+ * GDBus does the check to make sure the object exists from the worker
+ * thread but doesn't actually dispatch the action invocation until we
+ * hit the mainloop in this thread. There is also no danger of
+ * receiving 'activate' or 'open' signals until after 'startup' runs,
+ * for the same reason.
+ */
+ impl->object_id = g_dbus_connection_register_object (impl->session_bus, impl->object_path,
+ org_gtk_Application, &vtable, impl, NULL, error);
+
+ if (impl->object_id == 0)
+ return FALSE;
+
+ impl->fdo_object_id = g_dbus_connection_register_object (impl->session_bus, impl->object_path,
+ org_freedesktop_Application, &vtable, impl, NULL, error);
+
+ if (impl->fdo_object_id == 0)
+ return FALSE;
+
+ impl->actions_id = g_dbus_connection_export_action_group (impl->session_bus, impl->object_path,
+ impl->exported_actions, error);
+
+ if (impl->actions_id == 0)
+ return FALSE;
+
+ if (!app_class->dbus_register (impl->app,
+ impl->session_bus,
+ impl->object_path,
+ error))
+ return FALSE;
+
+ if (impl->bus_name == NULL)
{
- g_assert (impl->object_path == NULL);
- g_assert (impl->object_id == 0);
+ /* If this is a non-unique application then it is sufficient to
+ * have our object paths registered. We can return now.
+ *
+ * Note: non-unique applications always act as primary-instance.
+ */
+ impl->primary = TRUE;
+ return TRUE;
}
- g_slice_free (GApplicationImpl, impl);
+ /* If this is a unique application then we need to attempt to own
+ * the well-known name and fall back to remote mode (!is_primary)
+ * in the case that we can't do that.
+ */
+ /* DBUS_NAME_FLAG_DO_NOT_QUEUE: 0x4 */
+ reply = g_dbus_connection_call_sync (impl->session_bus, "org.freedesktop.DBus", "/org/freedesktop/DBus",
+ "org.freedesktop.DBus", "RequestName",
+ g_variant_new ("(su)", impl->bus_name, 0x4), G_VARIANT_TYPE ("(u)"),
+ 0, -1, cancellable, error);
+
+ if (reply == NULL)
+ return FALSE;
+
+ g_variant_get (reply, "(u)", &rval);
+ g_variant_unref (reply);
+
+ /* DBUS_REQUEST_NAME_REPLY_EXISTS: 3 */
+ impl->primary = (rval != 3);
+
+ return TRUE;
}
+/* Stop doing the things that the primary instance does.
+ *
+ * This should be called if attempting to become the primary instance
+ * failed (in order to clean up any partial success) and should also
+ * be called when freeing the GApplication.
+ *
+ * It is safe to call this multiple times.
+ */
static void
-remote_action_info_free (gpointer user_data)
+g_application_impl_stop_primary (GApplicationImpl *impl)
{
- RemoteActionInfo *info = user_data;
+ GApplicationClass *app_class = G_APPLICATION_GET_CLASS (impl->app);
+
+ app_class->dbus_unregister (impl->app,
+ impl->session_bus,
+ impl->object_path);
- g_free (info->name);
+ if (impl->object_id)
+ {
+ g_dbus_connection_unregister_object (impl->session_bus, impl->object_id);
+ impl->object_id = 0;
+ }
- if (info->state)
- g_variant_unref (info->state);
+ if (impl->fdo_object_id)
+ {
+ g_dbus_connection_unregister_object (impl->session_bus, impl->fdo_object_id);
+ impl->fdo_object_id = 0;
+ }
- if (info->parameter_type)
- g_variant_type_free (info->parameter_type);
+ if (impl->actions_id)
+ {
+ g_dbus_connection_unexport_action_group (impl->session_bus, impl->actions_id);
+ impl->actions_id = 0;
+ }
- g_slice_free (RemoteActionInfo, info);
+ if (impl->primary && impl->bus_name)
+ {
+ g_dbus_connection_call (impl->session_bus, "org.freedesktop.DBus",
+ "/org/freedesktop/DBus", "org.freedesktop.DBus",
+ "ReleaseName", g_variant_new ("(s)", impl->bus_name),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
+ impl->primary = FALSE;
+ }
}
-static RemoteActionInfo *
-remote_action_info_new_from_iter (GVariantIter *iter)
+void
+g_application_impl_set_busy_state (GApplicationImpl *impl,
+ gboolean busy)
{
- RemoteActionInfo *info;
- const gchar *param_str;
- gboolean enabled;
- GVariant *state;
- gchar *name;
-
- if (!g_variant_iter_next (iter, "{&s(bg@av)}", &name,
- &enabled, ¶m_str, &state))
- return NULL;
-
- info = g_slice_new (RemoteActionInfo);
- info->name = name;
- info->enabled = enabled;
-
- if (g_variant_n_children (state))
- g_variant_get_child (state, 0, "v", &info->state);
- else
- info->state = NULL;
- g_variant_unref (state);
-
- if (param_str[0])
- info->parameter_type = g_variant_type_copy ((GVariantType *) param_str);
- else
- info->parameter_type = NULL;
-
- return info;
+ if (impl->busy != busy)
+ {
+ impl->busy = busy;
+ send_property_change (impl);
+ }
}
-static void
-g_application_impl_action_signal (GDBusConnection *connection,
- const gchar *sender_name,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *signal_name,
- GVariant *parameters,
- gpointer user_data)
+void
+g_application_impl_destroy (GApplicationImpl *impl)
{
- GApplicationImpl *impl = user_data;
- GActionGroup *action_group;
+ g_application_impl_stop_primary (impl);
- action_group = G_ACTION_GROUP (impl->app);
+ if (impl->session_bus)
+ g_object_unref (impl->session_bus);
- if (g_str_equal (signal_name, "Changed") &&
- g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(asa{sb}a{sv}a{s(bgav)})")))
- {
- /* Removes */
- {
- GVariantIter *iter;
- const gchar *name;
-
- g_variant_get_child (parameters, 0, "as", &iter);
- while (g_variant_iter_next (iter, "&s", &name))
- {
- if (g_hash_table_lookup (impl->actions, name))
- {
- g_hash_table_remove (impl->actions, name);
- g_action_group_action_removed (action_group, name);
- }
- }
- g_variant_iter_free (iter);
- }
-
- /* Enable changes */
- {
- GVariantIter *iter;
- const gchar *name;
- gboolean enabled;
-
- g_variant_get_child (parameters, 1, "a{sb}", &iter);
- while (g_variant_iter_next (iter, "{&sb}", &name, &enabled))
- {
- RemoteActionInfo *info;
-
- info = g_hash_table_lookup (impl->actions, name);
-
- if (info && info->enabled != enabled)
- {
- info->enabled = enabled;
- g_action_group_action_enabled_changed (action_group,
- name, enabled);
- }
- }
- g_variant_iter_free (iter);
- }
-
- /* State changes */
- {
- GVariantIter *iter;
- const gchar *name;
- GVariant *state;
-
- g_variant_get_child (parameters, 2, "a{sv}", &iter);
- while (g_variant_iter_next (iter, "{&sv}", &name, &state))
- {
- RemoteActionInfo *info;
-
- info = g_hash_table_lookup (impl->actions, name);
-
- if (info && info->state && !g_variant_equal (state, info->state) &&
- g_variant_is_of_type (state, g_variant_get_type (info->state)))
- {
- g_variant_unref (info->state);
- info->state = g_variant_ref (state);
-
- g_action_group_action_state_changed (action_group, name, state);
- }
-
- g_variant_unref (state);
- }
- g_variant_iter_free (iter);
- }
-
- /* Additions */
- {
- RemoteActionInfo *info;
- GVariantIter *iter;
-
- g_variant_get_child (parameters, 3, "a{s(bgav)}", &iter);
- while ((info = remote_action_info_new_from_iter (iter)))
- {
- if (!g_hash_table_lookup (impl->actions, info->name))
- g_hash_table_replace (impl->actions, info->name, info);
- else
- remote_action_info_free (info);
- }
- }
- }
+ g_free (impl->object_path);
+
+ g_slice_free (GApplicationImpl, impl);
}
GApplicationImpl *
-g_application_impl_register (GApplication *application,
- const gchar *appid,
- GApplicationFlags flags,
- GHashTable **remote_actions,
- GCancellable *cancellable,
- GError **error)
+g_application_impl_register (GApplication *application,
+ const gchar *appid,
+ GApplicationFlags flags,
+ GActionGroup *exported_actions,
+ GRemoteActionGroup **remote_actions,
+ GCancellable *cancellable,
+ GError **error)
{
- const static GDBusInterfaceVTable vtable = {
- g_application_impl_method_call
- };
+ GDBusActionGroup *actions;
GApplicationImpl *impl;
- GVariant *reply;
- guint32 rval;
+
+ g_assert ((flags & G_APPLICATION_NON_UNIQUE) || appid != NULL);
impl = g_slice_new0 (GApplicationImpl);
impl->app = application;
- impl->bus_name = appid;
+ impl->exported_actions = exported_actions;
+
+ /* non-unique applications do not attempt to acquire a bus name */
+ if (~flags & G_APPLICATION_NON_UNIQUE)
+ impl->bus_name = appid;
impl->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, cancellable, NULL);
@@ -450,106 +552,24 @@ g_application_impl_register (GApplication *application,
*/
if (~flags & G_APPLICATION_IS_LAUNCHER)
{
- /* Attempt to become primary instance. */
- impl->object_id =
- g_dbus_connection_register_object (impl->session_bus,
- impl->object_path,
- (GDBusInterfaceInfo *)
- &org_gtk_Application,
- &vtable, impl, NULL, error);
-
- if (impl->object_id == 0)
+ if (!g_application_impl_attempt_primary (impl, cancellable, error))
{
- g_object_unref (impl->session_bus);
- g_free (impl->object_path);
- impl->session_bus = NULL;
- impl->object_path = NULL;
-
- g_slice_free (GApplicationImpl, impl);
+ g_application_impl_destroy (impl);
return NULL;
}
- if (!g_action_group_exporter_export (impl->session_bus,
- impl->object_path,
- impl->app, error))
- {
- g_dbus_connection_unregister_object (impl->session_bus,
- impl->object_id);
-
- g_object_unref (impl->session_bus);
- g_free (impl->object_path);
- impl->session_bus = NULL;
- impl->object_path = NULL;
-
- g_slice_free (GApplicationImpl, impl);
- return NULL;
- }
- impl->actions_exported = TRUE;
-
- /* DBUS_NAME_FLAG_DO_NOT_QUEUE: 0x4 */
- reply = g_dbus_connection_call_sync (impl->session_bus,
- "org.freedesktop.DBus",
- "/org/freedesktop/DBus",
- "org.freedesktop.DBus",
- "RequestName",
- g_variant_new ("(su)",
- impl->bus_name,
- 0x4),
- G_VARIANT_TYPE ("(u)"),
- 0, -1, cancellable, error);
-
- if (reply == NULL)
- {
- g_dbus_connection_unregister_object (impl->session_bus,
- impl->object_id);
- impl->object_id = 0;
-
- g_action_group_exporter_stop (impl->app);
- impl->actions_exported = FALSE;
-
- g_object_unref (impl->session_bus);
- g_free (impl->object_path);
- impl->session_bus = NULL;
- impl->object_path = NULL;
-
- g_slice_free (GApplicationImpl, impl);
- return NULL;
- }
-
- g_variant_get (reply, "(u)", &rval);
- g_variant_unref (reply);
-
- /* DBUS_REQUEST_NAME_REPLY_EXISTS: 3 */
- if (rval != 3)
- {
- /* We are the primary instance. */
- g_dbus_connection_emit_signal (impl->session_bus,
- NULL,
- impl->object_path,
- "org.gtk.Application",
- "Hello",
- g_variant_new ("(s)",
- impl->bus_name),
- NULL);
- *remote_actions = NULL;
- return impl;
- }
+ if (impl->primary)
+ return impl;
/* We didn't make it. Drop our service-side stuff. */
- g_dbus_connection_unregister_object (impl->session_bus,
- impl->object_id);
- impl->object_id = 0;
- g_action_group_exporter_stop (impl->app);
- impl->actions_exported = FALSE;
+ g_application_impl_stop_primary (impl);
if (flags & G_APPLICATION_IS_SERVICE)
{
g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
- "Unable to acquire bus name `%s'", appid);
- g_object_unref (impl->session_bus);
- g_free (impl->object_path);
+ "Unable to acquire bus name '%s'", appid);
+ g_application_impl_destroy (impl);
- g_slice_free (GApplicationImpl, impl);
return NULL;
}
}
@@ -558,51 +578,17 @@ g_application_impl_register (GApplication *application,
* This also serves as a mechanism to ensure that the primary exists
* (ie: DBus service files installed correctly, etc).
*/
- impl->signal_id =
- g_dbus_connection_signal_subscribe (impl->session_bus, impl->bus_name,
- "org.gtk.Actions", NULL,
- impl->object_path, NULL,
- G_DBUS_SIGNAL_FLAGS_NONE,
- g_application_impl_action_signal,
- impl, NULL);
-
- reply = g_dbus_connection_call_sync (impl->session_bus, impl->bus_name,
- impl->object_path, "org.gtk.Actions",
- "DescribeAll", NULL,
- G_VARIANT_TYPE ("(a{s(bgav)})"),
- G_DBUS_CALL_FLAGS_NONE, -1,
- cancellable, error);
-
- if (reply == NULL)
+ actions = g_dbus_action_group_get (impl->session_bus, impl->bus_name, impl->object_path);
+ if (!g_dbus_action_group_sync (actions, cancellable, error))
{
/* The primary appears not to exist. Fail the registration. */
- g_object_unref (impl->session_bus);
- g_free (impl->object_path);
- impl->session_bus = NULL;
- impl->object_path = NULL;
+ g_application_impl_destroy (impl);
+ g_object_unref (actions);
- g_slice_free (GApplicationImpl, impl);
return NULL;
}
- /* Create and populate the hashtable */
- {
- RemoteActionInfo *info;
- GVariant *descriptions;
- GVariantIter iter;
-
- impl->actions = g_hash_table_new_full (g_str_hash, g_str_equal,
- NULL, remote_action_info_free);
- descriptions = g_variant_get_child_value (reply, 0);
- g_variant_iter_init (&iter, descriptions);
-
- while ((info = remote_action_info_new_from_iter (&iter)))
- g_hash_table_replace (impl->actions, info->name, info);
-
- g_variant_unref (descriptions);
-
- *remote_actions = impl->actions;
- }
+ *remote_actions = G_REMOTE_ACTION_GROUP (actions);
return impl;
}
@@ -690,8 +676,12 @@ g_application_impl_cmdline_done (GObject *source,
GError *error = NULL;
GVariant *reply;
- reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source),
- result, &error);
+#ifdef G_OS_UNIX
+ reply = g_dbus_connection_call_with_unix_fd_list_finish (G_DBUS_CONNECTION (source), NULL, result, &error);
+#else
+ reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
+#endif
+
if (reply != NULL)
{
@@ -710,9 +700,9 @@ g_application_impl_cmdline_done (GObject *source,
}
int
-g_application_impl_command_line (GApplicationImpl *impl,
- gchar **arguments,
- GVariant *platform_data)
+g_application_impl_command_line (GApplicationImpl *impl,
+ const gchar * const *arguments,
+ GVariant *platform_data)
{
const static GDBusInterfaceVTable vtable = {
g_application_impl_cmdline_method_call
@@ -726,23 +716,52 @@ g_application_impl_command_line (GApplicationImpl *impl,
data.loop = g_main_loop_new (context, FALSE);
g_main_context_push_thread_default (context);
- object_id = g_dbus_connection_register_object (impl->session_bus,
- object_path,
- (GDBusInterfaceInfo *)
- &org_gtk_private_Cmdline,
+ if (org_gtk_private_CommandLine == NULL)
+ {
+ GError *error = NULL;
+ GDBusNodeInfo *info;
+
+ info = g_dbus_node_info_new_for_xml (org_gtk_private_CommandLine_xml, &error);
+ if G_UNLIKELY (info == NULL)
+ g_error ("%s", error->message);
+ org_gtk_private_CommandLine = g_dbus_node_info_lookup_interface (info, "org.gtk.private.CommandLine");
+ g_assert (org_gtk_private_CommandLine != NULL);
+ g_dbus_interface_info_ref (org_gtk_private_CommandLine);
+ g_dbus_node_info_unref (info);
+ }
+
+ object_id = g_dbus_connection_register_object (impl->session_bus, object_path,
+ org_gtk_private_CommandLine,
&vtable, &data, NULL, NULL);
/* In theory we should try other paths... */
g_assert (object_id != 0);
- g_dbus_connection_call (impl->session_bus,
- impl->bus_name,
- impl->object_path,
- "org.gtk.Application",
- "CommandLine",
- g_variant_new ("(o^aay@a{sv})", object_path,
- arguments, platform_data),
+#ifdef G_OS_UNIX
+ {
+ GError *error = NULL;
+ GUnixFDList *fd_list;
+
+ /* send along the stdin in case
+ * g_application_command_line_get_stdin_data() is called
+ */
+ fd_list = g_unix_fd_list_new ();
+ g_unix_fd_list_append (fd_list, 0, &error);
+ g_assert_no_error (error);
+
+ g_dbus_connection_call_with_unix_fd_list (impl->session_bus, impl->bus_name, impl->object_path,
+ "org.gtk.Application", "CommandLine",
+ g_variant_new ("(o^aay@a{sv})", object_path, arguments, platform_data),
+ G_VARIANT_TYPE ("(i)"), 0, G_MAXINT, fd_list, NULL,
+ g_application_impl_cmdline_done, &data);
+ g_object_unref (fd_list);
+ }
+#else
+ g_dbus_connection_call (impl->session_bus, impl->bus_name, impl->object_path,
+ "org.gtk.Application", "CommandLine",
+ g_variant_new ("(o^aay@a{sv})", object_path, arguments, platform_data),
G_VARIANT_TYPE ("(i)"), 0, G_MAXINT, NULL,
g_application_impl_cmdline_done, &data);
+#endif
g_main_loop_run (data.loop);
@@ -754,53 +773,24 @@ g_application_impl_command_line (GApplicationImpl *impl,
}
void
-g_application_impl_change_action_state (GApplicationImpl *impl,
- const gchar *action_name,
- GVariant *value,
- GVariant *platform_data)
+g_application_impl_flush (GApplicationImpl *impl)
{
- g_dbus_connection_call (impl->session_bus,
- impl->bus_name,
- impl->object_path,
- "org.gtk.Actions",
- "SetState",
- g_variant_new ("(sv@a{sv})", action_name,
- value, platform_data),
- NULL, 0, -1, NULL, NULL, NULL);
+ if (impl->session_bus)
+ g_dbus_connection_flush_sync (impl->session_bus, NULL, NULL);
}
-void
-g_application_impl_activate_action (GApplicationImpl *impl,
- const gchar *action_name,
- GVariant *parameter,
- GVariant *platform_data)
+GDBusConnection *
+g_application_impl_get_dbus_connection (GApplicationImpl *impl)
{
- GVariant *param;
-
- if (parameter)
- parameter = g_variant_new_variant (parameter);
-
- param = g_variant_new_array (G_VARIANT_TYPE_VARIANT,
- ¶meter, parameter != NULL);
-
- g_dbus_connection_call (impl->session_bus,
- impl->bus_name,
- impl->object_path,
- "org.gtk.Actions",
- "Activate",
- g_variant_new ("(s@av@a{sv})", action_name,
- param, platform_data),
- NULL, 0, -1, NULL, NULL, NULL);
+ return impl->session_bus;
}
-void
-g_application_impl_flush (GApplicationImpl *impl)
+const gchar *
+g_application_impl_get_dbus_object_path (GApplicationImpl *impl)
{
- if (impl->session_bus)
- g_dbus_connection_flush_sync (impl->session_bus, NULL, NULL);
+ return impl->object_path;
}
-
/* GDBusCommandLine implementation {{{1 */
typedef GApplicationCommandLineClass GDBusCommandLineClass;
@@ -848,6 +838,35 @@ g_dbus_command_line_printerr_literal (GApplicationCommandLine *cmdline,
NULL, 0, -1, NULL, NULL, NULL);
}
+static GInputStream *
+g_dbus_command_line_get_stdin (GApplicationCommandLine *cmdline)
+{
+#ifdef G_OS_UNIX
+ GDBusCommandLine *gdbcl = (GDBusCommandLine *) cmdline;
+ GInputStream *result = NULL;
+ GDBusMessage *message;
+ GUnixFDList *fd_list;
+
+ message = g_dbus_method_invocation_get_message (gdbcl->invocation);
+ fd_list = g_dbus_message_get_unix_fd_list (message);
+
+ if (fd_list && g_unix_fd_list_get_length (fd_list))
+ {
+ gint *fds, n_fds, i;
+
+ fds = g_unix_fd_list_steal_fds (fd_list, &n_fds);
+ result = g_unix_input_stream_new (fds[0], TRUE);
+ for (i = 1; i < n_fds; i++)
+ (void) g_close (fds[i], NULL);
+ g_free (fds);
+ }
+
+ return result;
+#else
+ return NULL;
+#endif
+}
+
static void
g_dbus_command_line_finalize (GObject *object)
{
@@ -878,6 +897,7 @@ g_dbus_command_line_class_init (GApplicationCommandLineClass *class)
object_class->finalize = g_dbus_command_line_finalize;
class->printerr_literal = g_dbus_command_line_printerr_literal;
class->print_literal = g_dbus_command_line_print_literal;
+ class->get_stdin = g_dbus_command_line_get_stdin;
}
static GApplicationCommandLine *
@@ -885,13 +905,19 @@ g_dbus_command_line_new (GDBusMethodInvocation *invocation)
{
GDBusCommandLine *gdbcl;
GVariant *args;
+ GVariant *arguments, *platform_data;
args = g_dbus_method_invocation_get_parameters (invocation);
+ arguments = g_variant_get_child_value (args, 1);
+ platform_data = g_variant_get_child_value (args, 2);
gdbcl = g_object_new (g_dbus_command_line_get_type (),
- "arguments", g_variant_get_child_value (args, 1),
- "platform-data", g_variant_get_child_value (args, 2),
+ "arguments", arguments,
+ "platform-data", platform_data,
NULL);
+ g_variant_unref (arguments);
+ g_variant_unref (platform_data);
+
gdbcl->connection = g_dbus_method_invocation_get_connection (invocation);
gdbcl->bus_name = g_dbus_method_invocation_get_sender (invocation);
g_variant_get_child (args, 0, "&o", &gdbcl->object_path);