diff options
| author | Patrick McDermott <pj@pehjota.net> | 2017-09-16 22:24:49 (EDT) |
|---|---|---|
| committer | Patrick McDermott <pj@pehjota.net> | 2017-09-16 22:24:49 (EDT) |
| commit | 4d61f2d28e8430f38ccb4649aefbe1a21ee8780d (patch) | |
| tree | e102c80a12178f0aa512e5b371e08daa59178c6d /src | |
| parent | 3ea0d024858481b07571a9a2a9e21b2bc749c69f (diff) | |
| download | marquee-4d61f2d28e8430f38ccb4649aefbe1a21ee8780d.zip marquee-4d61f2d28e8430f38ccb4649aefbe1a21ee8780d.tar.gz marquee-4d61f2d28e8430f38ccb4649aefbe1a21ee8780d.tar.bz2 | |
src/window.[ch]: Drop "gtk_" from member names
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 18 | ||||
| -rw-r--r-- | src/window.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/window.c b/src/window.c index 62335ca..6ed4cfb 100644 --- a/src/window.c +++ b/src/window.c @@ -33,7 +33,7 @@ add_tab(MqWindow *window, gchar *uri, gint position) tab = mq_tab_new(uri); /* TODO: Set tab label (container widget with icon and title) */ - position = gtk_notebook_insert_page(GTK_NOTEBOOK(window->gtk_notebook), + position = gtk_notebook_insert_page(GTK_NOTEBOOK(window->notebook), mq_tab_get_container(tab), NULL, position); } @@ -45,16 +45,16 @@ mq_window_new(gchar **uris) window = malloc(sizeof(*window)); - window->gtk_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_resize(GTK_WINDOW(window->gtk_window), 1024, 768); + window->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_resize(GTK_WINDOW(window->window), 1024, 768); /* TODO: Don't quit on window close */ - g_signal_connect(window->gtk_window, "destroy", + g_signal_connect(window->window, "destroy", G_CALLBACK(gtk_main_quit), NULL); - window->gtk_notebook = gtk_notebook_new(); - gtk_notebook_set_scrollable(GTK_NOTEBOOK(window->gtk_notebook), TRUE); - gtk_container_add(GTK_CONTAINER(window->gtk_window), - window->gtk_notebook); + window->notebook = gtk_notebook_new(); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(window->notebook), TRUE); + gtk_container_add(GTK_CONTAINER(window->window), + window->notebook); if (uris && uris[0]) { for (i = 0; uris && uris[i]; ++i) { @@ -64,7 +64,7 @@ mq_window_new(gchar **uris) add_tab(window, "about:new", -1); } - gtk_widget_show_all(window->gtk_window); + gtk_widget_show_all(window->window); return window; } diff --git a/src/window.h b/src/window.h index e71b88a..8e243bb 100644 --- a/src/window.h +++ b/src/window.h @@ -25,8 +25,8 @@ #include <gtk/gtk.h> typedef struct { - GtkWidget *gtk_window; - GtkWidget *gtk_notebook; + GtkWidget *window; + GtkWidget *notebook; } MqWindow; MqWindow * |