gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed variable name self to app in AgApp methods

Browse Source
This commit is contained in:
Gergely Polonkai
2013-09-17 11:41:34 +02:00
parent 9f7c8282aa
commit 01595c0091
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/ag-app.c
View File

@@ -10,47 +10,47 @@ struct _AgAppPrivate {
G_DEFINE_TYPE(AgApp, ag_app, GTK_TYPE_APPLICATION); G_DEFINE_TYPE(AgApp, ag_app, GTK_TYPE_APPLICATION);
GtkWindow * GtkWindow *
ag_app_peek_first_window(AgApp *self) ag_app_peek_first_window(AgApp *app)
{ {
GList *l; GList *l;
for (l = gtk_application_get_windows(GTK_APPLICATION(self)); l; l = g_list_next(l)) { for (l = gtk_application_get_windows(GTK_APPLICATION(app)); l; l = g_list_next(l)) {
if (GTK_IS_WINDOW(l->data)) { if (GTK_IS_WINDOW(l->data)) {
return (GTK_WINDOW(l->data)); return (GTK_WINDOW(l->data));
} }
} }
ag_app_new_window(self); ag_app_new_window(app);
return ag_app_peek_first_window(self); return ag_app_peek_first_window(app);
} }
void void
ag_app_new_window(AgApp *self) ag_app_new_window(AgApp *app)
{ {
g_action_group_activate_action(G_ACTION_GROUP(self), "new-window", NULL); g_action_group_activate_action(G_ACTION_GROUP(app), "new-window", NULL);
} }
void void
ag_app_quit(AgApp *self) ag_app_quit(AgApp *app)
{ {
g_action_group_activate_action(G_ACTION_GROUP(self), "quit", NULL); g_action_group_activate_action(G_ACTION_GROUP(app), "quit", NULL);
} }
void void
ag_app_raise(AgApp *self) ag_app_raise(AgApp *app)
{ {
g_action_group_activate_action(G_ACTION_GROUP(self), "raise", NULL); g_action_group_activate_action(G_ACTION_GROUP(app), "raise", NULL);
} }
static void static void
new_window_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data) new_window_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data)
{ {
AgApp *self = AG_APP(user_data); AgApp *app = AG_APP(user_data);
GtkWidget *window; GtkWidget *window;
window = ag_window_new(self); window = ag_window_new(app);
gtk_application_add_window(GTK_APPLICATION(self), GTK_WINDOW(window)); gtk_application_add_window(GTK_APPLICATION(app), GTK_WINDOW(window));
gtk_widget_show_all(window); gtk_widget_show_all(window);
} }
@@ -89,21 +89,20 @@ about_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data)
static void static void
quit_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data) quit_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data)
{ {
AgApp *self = AG_APP(user_data);
GList *l; GList *l;
while ((l = gtk_application_get_windows(GTK_APPLICATION(self)))) { while ((l = gtk_application_get_windows(GTK_APPLICATION(user_data)))) {
gtk_application_remove_window(GTK_APPLICATION(self), GTK_WINDOW(l->data)); gtk_application_remove_window(GTK_APPLICATION(user_data), GTK_WINDOW(l->data));
} }
} }
static void static void
raise_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data) raise_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data)
{ {
AgApp *self = AG_APP(user_data); AgApp *app = AG_APP(user_data);
GtkWindow *window; GtkWindow *window;
window = ag_app_peek_first_window(self); window = ag_app_peek_first_window(app);
gtk_window_present(window); gtk_window_present(window);
} }
@@ -116,20 +115,20 @@ static GActionEntry app_entries[] = {
}; };
static void static void
setup_actions(AgApp *self) setup_actions(AgApp *app)
{ {
g_action_map_add_action_entries(G_ACTION_MAP(self), app_entries, G_N_ELEMENTS(app_entries), self); g_action_map_add_action_entries(G_ACTION_MAP(app), app_entries, G_N_ELEMENTS(app_entries), app);
} }
static void static void
setup_accelerators(AgApp *self) setup_accelerators(AgApp *app)
{ {
gtk_application_add_accelerator(GTK_APPLICATION(self), "<Primary>w", "win.close", NULL); gtk_application_add_accelerator(GTK_APPLICATION(app), "<Primary>w", "win.close", NULL);
gtk_application_add_accelerator(GTK_APPLICATION(self), "F10", "win.gear-menu", NULL); gtk_application_add_accelerator(GTK_APPLICATION(app), "F10", "win.gear-menu", NULL);
} }
static void static void
setup_menu(AgApp *self) setup_menu(AgApp *app)
{ {
GtkBuilder *builder; GtkBuilder *builder;
GMenuModel *model; GMenuModel *model;
@@ -142,21 +141,21 @@ setup_menu(AgApp *self)
} }
model = G_MENU_MODEL(gtk_builder_get_object(builder, "app-menu")); model = G_MENU_MODEL(gtk_builder_get_object(builder, "app-menu"));
gtk_application_set_app_menu(GTK_APPLICATION(self), model); gtk_application_set_app_menu(GTK_APPLICATION(app), model);
g_object_unref(builder); g_object_unref(builder);
} }
static void static void
startup(GApplication *app) startup(GApplication *gapp)
{ {
AgApp *self = AG_APP(app); AgApp *app = AG_APP(gapp);
G_APPLICATION_CLASS(ag_app_parent_class)->startup(app); G_APPLICATION_CLASS(ag_app_parent_class)->startup(gapp);
setup_actions(self); setup_actions(app);
setup_menu(self); setup_menu(app);
setup_accelerators(self); setup_accelerators(app);
} }
AgApp * AgApp *
@@ -177,7 +176,7 @@ ag_app_new(void)
} }
static void static void
ag_app_init(AgApp *self) ag_app_init(AgApp *app)
{ {
} }