AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

Use gtk_action_group_get_action when looking up actions

Browse Source 
...instead of open-coding it. Pointed out by Christian Persch
in bug 620960
This commit is contained in:
Matthias Clasen 2010-06-08 09:03:07 -04:00
parent cca298ad7d
commit 79b161f709
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkapplication.c
View File

@ -116,12 +116,11 @@ gtk_application_default_prepare_activation (GApplication *application,
GVariant *value;
g_variant_iter_init (&iter, platform_data);
while (g_variant_iter_next (&iter, "{sv}", &key, &value))
while (g_variant_iter_next (&iter, "{&sv}", &key, &value))
{
if (strcmp (key, "startup-notification-id") == 0 &&
strcmp (g_variant_get_type_string (value), "s") == 0)
g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
gdk_notify_startup_complete_with_id (g_variant_get_string (value, NULL));
g_free (key);
g_variant_unref (value);
}
@ -141,24 +140,18 @@ gtk_application_default_activated (GApplication *application,
static void
gtk_application_default_action (GApplication *application,
const gchar *action,
const gchar *action_name,
guint timestamp)
{
GtkApplication *app = GTK_APPLICATION (application);
GList *actions, *iter;
GtkAction *action;
actions = gtk_action_group_list_actions (app->priv->main_actions);
for (iter = actions; iter; iter = iter->next)
action = gtk_action_group_get_action (app->priv->main_actions, action_name);
if (action)
{
GtkAction *gtkaction = iter->data;
if (strcmp (action, gtk_action_get_name (gtkaction)) == 0)
{
/* TODO set timestamp */
gtk_action_activate (gtkaction);
break;
}
/* TODO set timestamp */
gtk_action_activate (action);
}
g_list_free (actions);
}
static GVariant *