[Goodies-commits] r6672 - in gigolo/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-02-09 19:07:45 +0000 (Mon, 09 Feb 2009)
New Revision: 6672

Modified:
   gigolo/trunk/ChangeLog
   gigolo/trunk/src/window.c
Log:
Remember the main window's show state and don't query the window's maximised state on exit when it is not shown at all.

Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog	2009-02-09 18:57:38 UTC (rev 6671)
+++ gigolo/trunk/ChangeLog	2009-02-09 19:07:45 UTC (rev 6672)
@@ -11,6 +11,9 @@
  * src/window.c, src/backendgvfs.c, src/mountdialog.c,
    src/bookmarkdialog.c, src/preferencesdialog.c:
    Prefer 'Connect' to 'Mount' in user-visible strings for consistency.
+ * src/window.c:
+   Remember the main window's show state and don't query the window's
+   maximised state on exit when it is not shown at all.
 
 
 2009-02-04  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c	2009-02-09 18:57:38 UTC (rev 6671)
+++ gigolo/trunk/src/window.c	2009-02-09 19:07:45 UTC (rev 6672)
@@ -77,6 +77,7 @@
 	GtkWidget		*systray_icon_popup_menu;
 
 	guint			 autoconnect_timeout_id;
+	gboolean		 window_hidden;
 };
 
 enum
@@ -104,27 +105,26 @@
 
 	if (show_systray_icon)
 	{
-		gboolean window_hidden = FALSE;
 		if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED)
 		{
 			if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED)
-				window_hidden = TRUE;
+				priv->window_hidden = TRUE;
 			else
-				window_hidden = FALSE;
+				priv->window_hidden = FALSE;
 		}
 		if (event->changed_mask & GDK_WINDOW_STATE_WITHDRAWN)
 		{
 			if (event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN)
-				window_hidden = TRUE;
+				priv->window_hidden = TRUE;
 			else
-				window_hidden = FALSE;
+				priv->window_hidden = FALSE;
 		}
 
-		if (window_hidden && show_systray_icon)
+		if (priv->window_hidden && show_systray_icon)
 		{
 			gtk_window_set_skip_taskbar_hint(GTK_WINDOW(widget), TRUE);
 		}
-		else if (! window_hidden)
+		else if (! priv->window_hidden)
 		{
 			gtk_window_set_skip_taskbar_hint(GTK_WINDOW(widget), FALSE);
 		}
@@ -156,7 +156,8 @@
 	{
 		gtk_window_get_position(GTK_WINDOW(widget), &geo[0], &geo[1]);
 		gtk_window_get_size(GTK_WINDOW(widget), &geo[2], &geo[3]);
-		if (gdk_window_get_state(gigolo_widget_get_window(widget)) & GDK_WINDOW_STATE_MAXIMIZED)
+		if (priv->window_hidden && gdk_window_get_state(
+			gigolo_widget_get_window(widget)) & GDK_WINDOW_STATE_MAXIMIZED)
 			geo[4] = 1;
 		else
 			geo[4] = 0;