SF.net SVN: geany:[4734] trunk

[eht16 at users.sourceforge.net]

Revision: 4734
          http://geany.svn.sourceforge.net/geany/?rev=4734&view=rev
Author:   eht16
Date:     2010-03-07 17:57:45 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Properly show/hide the mesages window when using the View menu item (closes #2961282).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-07 17:44:14 UTC (rev 4733)
+++ trunk/ChangeLog	2010-03-07 17:57:45 UTC (rev 4734)
@@ -30,6 +30,8 @@
  * src/callbacks.c:
    Focus the editor widget after hiding the sidebar when it had the
    input focus (patch by Can Koy, thanks).
+   Properly show/hide the mesages window when using the View menu item
+   (closes #2961282).
 
 
 2010-03-05  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2010-03-07 17:44:14 UTC (rev 4733)
+++ trunk/src/callbacks.c	2010-03-07 17:57:45 UTC (rev 4734)
@@ -984,10 +984,11 @@
 on_show_messages_window1_toggled       (GtkCheckMenuItem *checkmenuitem,
                                         gpointer          user_data)
 {
-	if (ignore_callback) return;
+	if (ignore_callback)
+		return;
 
 	ui_prefs.msgwindow_visible = (ui_prefs.msgwindow_visible) ? FALSE : TRUE;
-	ui_widget_show_hide(ui_lookup_widget(main_widgets.window, "scrolledwindow1"), ui_prefs.msgwindow_visible);
+	msgwin_show_hide(ui_prefs.msgwindow_visible);
 }
 
 
@@ -1664,9 +1665,11 @@
 
 #if GTK_CHECK_VERSION(2, 14, 0)
 	/* if window has input focus, set it back to the editor before toggling off */
-	if (ui_prefs.sidebar_visible == FALSE &&
+	if (! ui_prefs.sidebar_visible &&
 		gtk_container_get_focus_child(GTK_CONTAINER(main_widgets.sidebar_notebook)) != NULL)
+	{
 		keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR);
+	}
 #endif
 
 	ui_sidebar_show_hide();


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