[latexila/latexila-2-6] Revert "Fix the "New Window" action in gnome-shell"



commit 1601a1fb54898a938811990f9a4d4b355016fc40
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat May 25 13:15:05 2013 +0200

    Revert "Fix the "New Window" action in gnome-shell"
    
    This reverts commit cd3e47d1822f61cbaa2241567a5273deeaa3e7c5.
    
    Now, the "New Window" action in gnome-shell doesn't create a new window.
    
    But the commit cd3e47 introduced bugs with the command line arguments.
    For example, it was not possible to open files from the command line.
    The --new-window parameter opened two new windows, etc.

 src/latexila.vala |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/src/latexila.vala b/src/latexila.vala
index 930d207..e49064f 100644
--- a/src/latexila.vala
+++ b/src/latexila.vala
@@ -39,7 +39,7 @@ public class Latexila : Gtk.Application
         activate.connect (() =>
         {
             hold ();
-            create_window ();
+            active_window.present ();
             release ();
         });
 
@@ -119,6 +119,8 @@ public class Latexila : Gtk.Application
         new StockIcons ();
 
         AppSettings.get_default ();
+        create_window ();
+        reopen_files ();
         release ();
     }
 
@@ -196,9 +198,7 @@ public class Latexila : Gtk.Application
 
     public MainWindow create_window ()
     {
-        bool first_window = active_window == null;
-
-        if (! first_window)
+        if (active_window != null)
             active_window.save_state ();
 
         MainWindow window = new MainWindow ();
@@ -212,10 +212,6 @@ public class Latexila : Gtk.Application
         });
 
         window.show ();
-
-        if (first_window)
-            reopen_files ();
-
         return window;
     }
 


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