SF.net SVN: geany: [731] trunk

[ntrel at users.sourceforge.net]

Revision: 731
Author:   ntrel
Date:     2006-08-17 09:12:04 -0700 (Thu, 17 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=731&view=rev

Log Message:
-----------
Fix Show messages window checkbox state when -m used

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-17 16:08:25 UTC (rev 730)
+++ trunk/ChangeLog	2006-08-17 16:12:04 UTC (rev 731)
@@ -7,6 +7,7 @@
    Use setup_paths, locale_init, parse_command_line_options,
    setup_config_dir in main().
  * src/msgwindow.c: Reorder widget lookup.
+ * src/main.c: Fix Show messages window checkbox state when -m used.
 
 
 2006-08-15  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2006-08-17 16:08:25 UTC (rev 730)
+++ trunk/src/main.c	2006-08-17 16:12:04 UTC (rev 731)
@@ -121,7 +121,7 @@
 		gtk_widget_hide(app->toolbar);
 		app->ignore_callback = FALSE;
 	}
-	if (! app->msgwindow_visible || no_msgwin)
+	if (! app->msgwindow_visible)
 	{
 		app->ignore_callback = TRUE;
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_show_messages_window1")), FALSE);
@@ -582,16 +582,19 @@
 	gtk_widget_set_size_request(app->window, GEANY_WINDOW_MINIMAL_WIDTH, GEANY_WINDOW_MINIMAL_HEIGHT);
 	gtk_window_set_default_size(GTK_WINDOW(app->window), GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT);
 	encodings_init();
+
 	configuration_load();
-	keybindings_init();
-	notebook_init();
-	templates_init();
-	document_init_doclist();
 	// do this here to let cmdline options overwrite configuration settings
 #ifdef HAVE_VTE
 	app->have_vte = app->load_vte;
 	if (no_vte) app->have_vte = FALSE;
 #endif
+	if (no_msgwin) app->msgwindow_visible = FALSE;
+
+	keybindings_init();
+	notebook_init();
+	templates_init();
+	document_init_doclist();
 	filetypes_init_types();
 	if (generate_datafiles)
 	{


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