luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

GApplication: port action client to new D-Bus API

Browse Source 
for compatibility with GActionGroup exporter
This commit is contained in:
Ryan Lortie 2011-06-30 10:40:51 +01:00
parent 20d1de3a1b
commit bc5fe41dec
1 changed files with 99 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
gio/gapplicationimpl-dbus.c
View File

@ -265,47 +265,46 @@ g_application_impl_destroy (GApplicationImpl *impl)
} }
static void static void
unwrap_fake_maybe (GVariant **value) remote_action_info_free (gpointer user_data)
{ {
GVariant *tmp; RemoteActionInfo *info = user_data;
if (g_variant_n_children (*value)) g_free (info->name);
g_variant_get_child (*value, 0, "v", &tmp);
else
tmp = NULL;
g_variant_unref (*value); if (info->state)
*value = tmp; g_variant_unref (info->state);
if (info->parameter_type)
g_variant_type_free (info->parameter_type);
g_slice_free (RemoteActionInfo, info);
} }
static RemoteActionInfo * static RemoteActionInfo *
remote_action_info_new_from_iter (GVariantIter *iter) remote_action_info_new_from_iter (GVariantIter *iter)
{ {
RemoteActionInfo *info; RemoteActionInfo *info;
GVariant *param_type; const gchar *param_str;
gboolean enabled; gboolean enabled;
GVariant *state; GVariant *state;
gchar *name; gchar *name;
if (!g_variant_iter_next (iter, "(s@avb@av)", &name, if (!g_variant_iter_next (iter, "{&s(bg@av)}", &name,
&param_type, &enabled, &state)) &enabled, &param_str, &state))
return NULL; return NULL;
unwrap_fake_maybe (&param_type);
unwrap_fake_maybe (&state);
info = g_slice_new (RemoteActionInfo); info = g_slice_new (RemoteActionInfo);
info->name = name; info->name = name;
info->enabled = enabled; info->enabled = enabled;
info->state = state;
if (param_type != NULL) if (g_variant_n_children (state))
{ g_variant_get_child (state, 0, "v", &info->state);
info->parameter_type = g_variant_type_copy ( else
g_variant_type_element ( info->state = NULL;
g_variant_get_type (param_type))); g_variant_unref (state);
g_variant_unref (param_type);
} if (param_str[0])
info->parameter_type = g_variant_type_copy ((GVariantType *) param_str);
else else
info->parameter_type = NULL; info->parameter_type = NULL;
@ -326,76 +325,90 @@ g_application_impl_action_signal (GDBusConnection *connection,
action_group = G_ACTION_GROUP (impl->app); action_group = G_ACTION_GROUP (impl->app);
if (strcmp (signal_name, "Added") == 0 && if (g_str_equal (signal_name, "Changed") &&
g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(a(savbav))"))) g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(asa{sb}a{sv}a{s(bgav)})")))
{ {
RemoteActionInfo *info; /* Removes */
GVariantIter *iter; {
GVariantIter *iter;
const gchar *name;
g_variant_get_child (parameters, 0, "a(savbav)", &iter); 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);
}
while ((info = remote_action_info_new_from_iter (iter))) /* Enable changes */
{ {
g_hash_table_replace (impl->actions, info->name, info); GVariantIter *iter;
g_action_group_action_added (action_group, info->name); const gchar *name;
} gboolean enabled;
g_variant_iter_free (iter); g_variant_get_child (parameters, 1, "a{sb}", &iter);
} while (g_variant_iter_next (iter, "{&sb}", &name, &enabled))
{
RemoteActionInfo *info;
else if (strcmp (signal_name, "Removed") == 0 && info = g_hash_table_lookup (impl->actions, name);
g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(as)")))
{
GVariantIter *iter;
const gchar *name;
g_variant_get_child (parameters, 0, "as", &iter); if (info && info->enabled != enabled)
while (g_variant_iter_next (iter, "&s", &name)) {
if (g_hash_table_remove (impl->actions, name)) info->enabled = enabled;
g_action_group_action_removed (action_group, name); g_action_group_action_enabled_changed (action_group,
g_variant_iter_free (iter); name, enabled);
} }
}
g_variant_iter_free (iter);
}
else if (strcmp (signal_name, "EnabledChanged") == 0 && /* State changes */
g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sb)"))) {
{ GVariantIter *iter;
RemoteActionInfo *info; const gchar *name;
const gchar *name; GVariant *state;
gboolean enabled;
g_variant_get (parameters, "(&sb)", &name, &enabled); g_variant_get_child (parameters, 2, "a{sv}", &iter);
info = g_hash_table_lookup (impl->actions, name); while (g_variant_iter_next (iter, "{&sv}", &name, &state))
{
RemoteActionInfo *info;
if (info && enabled != info->enabled) info = g_hash_table_lookup (impl->actions, name);
{
info->enabled = enabled;
g_action_group_action_enabled_changed (action_group,
info->name,
enabled);
}
}
else if (strcmp (signal_name, "StateChanged") == 0 && if (info && info->state && !g_variant_equal (state, info->state) &&
g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sv)"))) g_variant_is_of_type (state, g_variant_get_type (info->state)))
{ {
RemoteActionInfo *info; g_variant_unref (info->state);
const gchar *name; info->state = g_variant_ref (state);
GVariant *state;
g_variant_get (parameters, "(&sv)", &name, &state); g_action_group_action_state_changed (action_group, name, state);
info = g_hash_table_lookup (impl->actions, name); }
if (info && info->state && g_variant_unref (state);
g_variant_is_of_type (state, g_variant_get_type (info->state)) && }
!g_variant_equal (state, info->state)) g_variant_iter_free (iter);
{ }
g_variant_unref (info->state);
info->state = g_variant_ref (state); /* Additions */
g_action_group_action_state_changed (action_group, {
info->name, RemoteActionInfo *info;
state); GVariantIter *iter;
}
g_variant_unref (state); 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);
}
}
} }
} }
@ -556,7 +569,7 @@ g_application_impl_register (GApplication *application,
reply = g_dbus_connection_call_sync (impl->session_bus, impl->bus_name, reply = g_dbus_connection_call_sync (impl->session_bus, impl->bus_name,
impl->object_path, "org.gtk.Actions", impl->object_path, "org.gtk.Actions",
"DescribeAll", NULL, "DescribeAll", NULL,
G_VARIANT_TYPE ("(a(savbav))"), G_VARIANT_TYPE ("(a{s(bgav)})"),
G_DBUS_CALL_FLAGS_NONE, -1, G_DBUS_CALL_FLAGS_NONE, -1,
cancellable, error); cancellable, error);
@ -578,16 +591,18 @@ g_application_impl_register (GApplication *application,
GVariant *descriptions; GVariant *descriptions;
GVariantIter iter; GVariantIter iter;
*remote_actions = g_hash_table_new (g_str_hash, g_str_equal); 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); descriptions = g_variant_get_child_value (reply, 0);
g_variant_iter_init (&iter, descriptions); g_variant_iter_init (&iter, descriptions);
while ((info = remote_action_info_new_from_iter (&iter))) while ((info = remote_action_info_new_from_iter (&iter)))
g_hash_table_insert (*remote_actions, info->name, info); g_hash_table_replace (impl->actions, info->name, info);
g_variant_unref (descriptions); g_variant_unref (descriptions);
}
*remote_actions = impl->actions;
}
return impl; return impl;
} }