SF.net SVN: geany: [1964] trunk

[eht16 at users.sourceforge.net]

Revision: 1964
          http://geany.svn.sourceforge.net/geany/?rev=1964&view=rev
Author:   eht16
Date:     2007-10-20 07:57:37 -0700 (Sat, 20 Oct 2007)

Log Message:
-----------
Fix possible wrong window title when loading session files.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-19 17:56:24 UTC (rev 1963)
+++ trunk/ChangeLog	2007-10-20 14:57:37 UTC (rev 1964)
@@ -1,3 +1,9 @@
+2007-10-20  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/keyfile.c: Fix possible wrong window title when loading session
+                  files.
+
+
 2007-10-19  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * src/about.c, THANKS, po/sv.po, po/LINGUAS:
@@ -7,8 +13,8 @@
 2007-10-19  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * configure.in, doc/geany.html, doc/geany.txt, plugins/Makefile.am,
-   scintilla/Makefile.am, scintilla/PlatGTK.cxx, src/gb.c,
-   src/project.c, src/vte.c, tagmanager/Makefile.am:
+   scintilla/Makefile.am, scintilla/PlatGTK.cxx, src/Makefile.am,
+   src/gb.c, src/project.c, src/vte.c, tagmanager/Makefile.am:
    Apply most of the patch from #1794250 (thanks):
    Remove compiler specific flags.
    Add configure option to specify the path to libvte.so.

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2007-10-19 17:56:24 UTC (rev 1963)
+++ trunk/src/keyfile.c	2007-10-20 14:57:37 UTC (rev 1964)
@@ -761,7 +761,14 @@
 	if (failure)
 		msgwin_status_add(_("Failed to load one or more session files."));
 	else if (session_notebook_page >= 0)
+	{
+		// exlicitly allow notebook switch page callback to be called for window title,
+		// encoding settings and so other things
+		main_status.opening_session_files = FALSE;
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), session_notebook_page);
+		// reset status to leave in any case with the same state as when entering
+		main_status.opening_session_files = TRUE;
+	}
 	return ret;
 }
 


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