SF.net SVN: geany: [1912] trunk

[eht16 at users.sourceforge.net]

Revision: 1912
          http://geany.svn.sourceforge.net/geany/?rev=1912&view=rev
Author:   eht16
Date:     2007-09-27 04:29:54 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
Don't load invalid window geometry data from the config file.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/keyfile.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-27 11:13:59 UTC (rev 1911)
+++ trunk/ChangeLog	2007-09-27 11:29:54 UTC (rev 1912)
@@ -1,3 +1,9 @@
+2007-09-27  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/keyfile.c:
+   Don't load invalid window geometry data from the config file.
+
+
 2007-09-27  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/keybindings.c:

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2007-09-27 11:13:59 UTC (rev 1911)
+++ trunk/src/keyfile.c	2007-09-27 11:29:54 UTC (rev 1912)
@@ -611,11 +611,20 @@
 	}
 	else
 	{
+		gint i;
+
 		ui_prefs.geometry[0] = geo[0];
 		ui_prefs.geometry[1] = geo[1];
 		ui_prefs.geometry[2] = geo[2];
 		ui_prefs.geometry[3] = geo[3];
 		ui_prefs.geometry[4] = geo[4];
+
+		// don't use insane values
+		for (i = 0; i < 4; i++)
+		{
+			if (ui_prefs.geometry[i] < -1)
+				ui_prefs.geometry[i] = -1;
+		}		
 	}
 	hpan_position = utils_get_setting_integer(config, PACKAGE, "treeview_position", 156);
 	vpan_position = utils_get_setting_integer(config, PACKAGE, "msgwindow_position", (geo) ?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.