application: fix fallout from GtkApplication port

- we need to set the application to the window we create, or we'll quit immediately - Gtk.main_quit() doesn't work anymore with GtkApplication.run(); we need to destroy the windows we create instead
GNOME · Aug 8, 2012 · effc35d · effc35d
1 parent e4a53fe
commit effc35d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/js/ui/application.js b/src/js/ui/application.js
@@ -88,7 +88,7 @@ const Application = new Lang.Class({
     },
 
     Close: function() {
-        this.quit();
+        this._mainWindow.close();
     },
 
     ShowFile : function(uri, xid, closeIfAlreadyShown) {
@@ -101,9 +101,5 @@ const Application = new Lang.Class({
 	}
         this._mainWindow.setParent(xid);
         this._mainWindow.setFile(file);
-    },
-
-    quit : function() {
-        Gtk.main_quit();
     }
 });
diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
@@ -85,7 +85,8 @@ MainWindow.prototype = {
                                            skipPagerHint: true,
                                            skipTaskbarHint: true,
                                            windowPosition: Gtk.WindowPosition.CENTER,
-                                           gravity: Gdk.Gravity.CENTER });
+                                           gravity: Gdk.Gravity.CENTER,
+                                           application: this._application });
 
         let screen = Gdk.Screen.get_default();
         this._gtkWindow.set_visual(screen.get_rgba_visual());
@@ -650,7 +651,7 @@ MainWindow.prototype = {
         if (this._renderer.clear)
             this._renderer.clear();
 
-        this._application.quit();
+        this._gtkWindow.destroy();
     },
 
     /**************************************************************************