[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix --tab command line option

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-terminal.

commit 058c26e59af3d43d0af03458a75ff92ecd32ec36
Author: Igor <f2404 at yandex.ru>
Date:   Tue May 23 20:36:54 2017 -0400

    Fix --tab command line option
    
    Fixes https://bugzilla.xfce.org/show_bug.cgi?id=13587
---
 terminal/terminal-app.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index a177893..6d3dbf6 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -798,13 +798,6 @@ terminal_app_open_window (TerminalApp        *app,
 
   if (!attr->drop_down)
     {
-      /* don't apply other attributes to the window when reusing, just present it to user */
-      if (reuse_window)
-        {
-          gtk_window_present (GTK_WINDOW (window));
-          return;
-        }
-
       /* try to apply the geometry to the window */
       g_object_get (G_OBJECT (app->preferences), "misc-default-geometry", &geometry, NULL);
 #ifdef GDK_WINDOWING_X11
@@ -886,7 +879,11 @@ terminal_app_open_window (TerminalApp        *app,
       terminal_window_set_grid_size (TERMINAL_WINDOW (window), width, height);
       terminal_screen_force_resize_window (terminal_window_get_active (TERMINAL_WINDOW (window)),
                                            GTK_WINDOW (window), width, height);
-      gtk_widget_show (window);
+
+      if (reuse_window)
+        gtk_window_present (GTK_WINDOW (window));
+      else
+        gtk_widget_show (window);
     }
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.