Make EomWindow a GtkApplicationWindow

origin commit: https://gitlab.gnome.org/GNOME/eog/commit/df5b2b6
mate-desktop · Jul 17, 2018 · 57506ff · 57506ff
1 parent 5c58837
commit 57506ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/eom-window.c b/src/eom-window.c
@@ -87,7 +87,7 @@
 #define EOM_WINDOW_GET_PRIVATE(object) \
 	(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_WINDOW, EomWindowPrivate))
 
-G_DEFINE_TYPE (EomWindow, eom_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (EomWindow, eom_window, GTK_TYPE_APPLICATION_WINDOW);
 
 #define EOM_WINDOW_MIN_WIDTH  440
 #define EOM_WINDOW_MIN_HEIGHT 350
@@ -5237,9 +5237,11 @@ eom_window_new (EomStartupFlags flags)
 	eom_debug (DEBUG_WINDOW);
 
 	window = EOM_WINDOW (g_object_new (EOM_TYPE_WINDOW,
-					   "type", GTK_WINDOW_TOPLEVEL,
-					   "startup-flags", flags,
-					   NULL));
+	                                   "type", GTK_WINDOW_TOPLEVEL,
+	                                   "application", EOM_APP,
+	                                   "show-menubar", FALSE,
+	                                   "startup-flags", flags,
+	                                   NULL));
 
 	return GTK_WIDGET (window);
 }

diff --git a/src/eom-window.h b/src/eom-window.h
@@ -83,13 +83,13 @@ typedef enum {
 } EomStartupFlags;
 
 struct _EomWindow {
-	GtkWindow win;
+	GtkApplicationWindow win;
 
 	EomWindowPrivate *priv;
 };
 
 struct _EomWindowClass {
-	GtkWindowClass parent_class;
+	GtkApplicationWindowClass parent_class;
 
 	void (* prepared) (EomWindow *window);
 };