[Xfce4-commits] [apps/xfce4-terminal] 01/01: Remove redundant set_window_geometry_hints() call

[noreply at xfce.org]

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

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit 4528cc08dd0d1c8c9191c3f98abba463fea5a91a
Author: Igor <f2404 at yandex.ru>
Date:   Sun Jan 8 19:50:31 2017 +0300

    Remove redundant set_window_geometry_hints() call
    
    It seemed to confuse Unity WM. Fixes https://bugzilla.xfce.org/show_bug.cgi?id=13280
---
 terminal/terminal-window.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index df8fc21..2dc49df 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -910,7 +910,6 @@ terminal_window_notebook_page_switched (GtkNotebook     *notebook,
                                         TerminalWindow  *window)
 {
   TerminalScreen *active;
-  gboolean        was_null;
   const gchar    *encoding;
 
   /* get the new active page */
@@ -922,13 +921,9 @@ terminal_window_notebook_page_switched (GtkNotebook     *notebook,
   /* only update when really changed */
   if (G_LIKELY (window->priv->active != active))
     {
-      /* check if we need to set the size or if this was already done
-       * in the page add function */
-      was_null = (window->priv->active == NULL);
-
       /* last active tab was closed; used by the undo close action to restore tab focus */
-      if (!was_null &&
-          gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook), GTK_WIDGET (window->priv->active)) == -1)
+      if (window->priv->active != NULL &&
+          gtk_notebook_page_num (notebook, GTK_WIDGET (window->priv->active)) == -1)
         window->priv->last_closed_active = window->priv->active;
 
       /* set new active tab */
@@ -943,10 +938,6 @@ terminal_window_notebook_page_switched (GtkNotebook     *notebook,
       /* set charset for menu */
       encoding = terminal_screen_get_encoding (window->priv->active);
       terminal_encoding_action_set_charset (window->priv->encoding_action, encoding);
-
-      /* set the new geometry widget */
-      if (G_LIKELY (!was_null))
-        terminal_screen_set_window_geometry_hints (active, GTK_WINDOW (window));
     }
 
   /* update actions in the window */

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