Don't use deprecated GApplication api in examples

This commit is contained in:
Matthias Clasen
2011-12-07 22:31:10 -05:00
committed by Ryan Lortie
parent 13e084437b
commit 39bebbed82
2 changed files with 5 additions and 19 deletions

View File

@@ -45,24 +45,18 @@ activate_toggle_action (GSimpleAction *action,
static void static void
add_actions (GApplication *app) add_actions (GApplication *app)
{ {
GSimpleActionGroup *actions;
GSimpleAction *action; GSimpleAction *action;
actions = g_simple_action_group_new ();
action = g_simple_action_new ("simple-action", NULL); action = g_simple_action_new ("simple-action", NULL);
g_signal_connect (action, "activate", G_CALLBACK (activate_action), app); g_signal_connect (action, "activate", G_CALLBACK (activate_action), app);
g_simple_action_group_insert (actions, G_ACTION (action)); g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action));
g_object_unref (action); g_object_unref (action);
action = g_simple_action_new_stateful ("toggle-action", NULL, action = g_simple_action_new_stateful ("toggle-action", NULL,
g_variant_new_boolean (FALSE)); g_variant_new_boolean (FALSE));
g_signal_connect (action, "activate", G_CALLBACK (activate_toggle_action), app); g_signal_connect (action, "activate", G_CALLBACK (activate_toggle_action), app);
g_simple_action_group_insert (actions, G_ACTION (action)); g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action));
g_object_unref (action); g_object_unref (action);
g_application_set_action_group (app, G_ACTION_GROUP (actions));
g_object_unref (actions);
} }
static void static void

View File

@@ -44,17 +44,9 @@ static GActionEntry entries[] = {
static void static void
add_actions (GApplication *app) add_actions (GApplication *app)
{ {
GSimpleActionGroup *actions; g_action_map_add_action_entries (G_ACTION_MAP (app),
entries, G_N_ELEMENTS (entries),
actions = g_simple_action_group_new (); NULL);
g_simple_action_group_add_entries (actions,
entries, G_N_ELEMENTS (entries),
NULL);
g_application_set_action_group (app, G_ACTION_GROUP (actions));
g_object_unref (actions);
} }
static void static void