fixup! application: Initialize action using a GActionEntry table

This commit is contained in:
Georges Basile Stavracas Neto 2018-03-06 22:48:06 -03:00
parent c5f97d8a56
commit 63ceb2305a

View file

@ -41,6 +41,18 @@ struct _CcApplication
CcWindow *window;
};
static void cc_application_quit (GSimpleAction *simple,
GVariant *parameter,
gpointer user_data);
static void launch_panel_activated (GSimpleAction *action,
GVariant *parameter,
gpointer user_data);
static void help_activated (GSimpleAction *action,
GVariant *parameter,
gpointer user_data);
G_DEFINE_TYPE (CcApplication, cc_application, GTK_TYPE_APPLICATION)
const GOptionEntry all_options[] = {
@ -53,6 +65,12 @@ const GOptionEntry all_options[] = {
{ NULL, 0, 0, 0, NULL, NULL, NULL } /* end the list */
};
static const GActionEntry cc_app_actions[] = {
{ "launch-panel", launch_panel_activated, "(sav)", NULL, NULL, { 0 } },
{ "help", help_activated, NULL, NULL, NULL, { 0 } },
{ "quit", cc_application_quit, NULL, NULL, NULL, { 0 } }
};
static void
help_activated (GSimpleAction *action,
GVariant *parameter,
@ -211,13 +229,6 @@ cc_application_startup (GApplication *application)
CcApplication *self = CC_APPLICATION (application);
GMenu *section;
GMenu *menu;
const GActionEntry cc_app_actions[] = {
{ "launch-panel", launch_panel_activated, "(sav)", NULL, NULL, { 0 } },
{ "help", help_activated, NULL, NULL, NULL, { 0 } },
{ "quit", cc_application_quit, NULL, NULL, NULL, { 0 } }
};
const gchar *help_accels[] = { "F1", NULL };
g_action_map_add_action_entries (G_ACTION_MAP (self),