[gnome-terminal/gsettings] window: Make TerminalWindow a GtkApplicationWindow



commit 14e9e67a67f17907c55b8cd60f0ff461696b67d8
Author: Christian Persch <chpe gnome org>
Date:   Fri Mar 30 20:07:22 2012 +0200

    window: Make TerminalWindow a GtkApplicationWindow

 configure.ac          |    2 +-
 src/terminal-app.c    |    2 +-
 src/terminal-window.c |    6 ++++--
 src/terminal-window.h |    7 +++----
 4 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 45eb3e5..c289a27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_MSG_RESULT([$with_gtk])
 
 case "$with_gtk" in
   3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=3.0.0
+       GTK_REQUIRED=3.3.21
        VTE_PC_VERSION=-2.90
        VTE_REQUIRED=0.27.3
        ;;
diff --git a/src/terminal-app.c b/src/terminal-app.c
index bcfc218..cafb02e 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -1206,7 +1206,7 @@ terminal_app_new_window (TerminalApp *app,
 {
   TerminalWindow *window;
 
-  window = terminal_window_new ();
+  window = terminal_window_new (G_APPLICATION (app));
 
   app->windows = g_list_append (app->windows, window);
   g_signal_connect (window, "destroy",
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 8093fed..3430837 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2113,9 +2113,11 @@ terminal_window_show (GtkWidget *widget)
 }
 
 TerminalWindow*
-terminal_window_new (void)
+terminal_window_new (GApplication *app)
 {
-  return g_object_new (TERMINAL_TYPE_WINDOW, NULL);
+  return g_object_new (TERMINAL_TYPE_WINDOW,
+                       "application", app,
+                       NULL);
 }
 
 /**
diff --git a/src/terminal-window.h b/src/terminal-window.h
index 083b87a..ef268cf 100644
--- a/src/terminal-window.h
+++ b/src/terminal-window.h
@@ -38,20 +38,19 @@ typedef struct _TerminalWindowPrivate TerminalWindowPrivate;
 
 struct _TerminalWindow
 {
-  GtkWindow parent_instance;
+  GtkApplicationWindow parent_instance;
 
   TerminalWindowPrivate *priv;
 };
 
 struct _TerminalWindowClass
 {
-  GtkWindowClass parent_class;
-
+  GtkApplicationWindowClass parent_class;
 };
 
 GType terminal_window_get_type (void) G_GNUC_CONST;
 
-TerminalWindow* terminal_window_new (void);
+TerminalWindow* terminal_window_new (GApplication *app);
 
 void terminal_window_set_is_restored (TerminalWindow *window);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]