aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/callbacks.c2
-rw-r--r--src/camorama-globals.h2
-rw-r--r--src/camorama-window.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/callbacks.c b/src/callbacks.c
index c8a9d4c..e4befcc 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -19,7 +19,7 @@
static GtkWidget *about = NULL;
-extern GtkWidget *main_window, *prefswindow;
+extern GtkWidget *prefswindow;
//extern state func_state;
//extern gint effect_mask;
extern int frames;
diff --git a/src/camorama-globals.h b/src/camorama-globals.h
index 280f424..6ca0d96 100644
--- a/src/camorama-globals.h
+++ b/src/camorama-globals.h
@@ -29,7 +29,7 @@
G_BEGIN_DECLS
-GtkWidget *main_window, *prefswindow;
+GtkWidget *prefswindow;
int frames, frames2, seconds;
GtkWidget *dentry, *entry2, *string_entry, *format_selection;
GtkWidget *host_entry, *protocol, *rdir_entry, *filename_entry;
diff --git a/src/camorama-window.c b/src/camorama-window.c
index 0abf162..3108660 100644
--- a/src/camorama-window.c
+++ b/src/camorama-window.c
@@ -205,6 +205,8 @@ void load_interface(cam_t *cam)
gtk_application_add_window(cam->app, GTK_WINDOW(window));
#endif
+ prefswindow = GTK_WIDGET(gtk_builder_get_object(cam->xml, "prefswindow"));
+
menu_item_filter_type = g_quark_from_static_string("camorama-menu-item-filter-type");
/* set up the tree view */
@@ -250,7 +252,7 @@ void load_interface(cam_t *cam)
NULL);
gtk_window_set_default_icon(logo);
gtk_window_set_icon(GTK_WINDOW(window), logo);
- gtk_window_set_icon(GTK_WINDOW(GTK_WIDGET(gtk_builder_get_object(cam->xml, "prefswindow"))), logo);
+ gtk_window_set_icon(GTK_WINDOW(prefswindow), logo);
g_signal_connect(gtk_builder_get_object(cam->xml, "show_effects"),
"activate", G_CALLBACK(on_show_effects_activate),
@@ -547,6 +549,4 @@ void load_interface(cam_t *cam)
cam->usestring);
set_image_scale(cam);
-
- prefswindow = GTK_WIDGET(gtk_builder_get_object(cam->xml, "prefswindow"));
}

Privacy Policy