Correctly expand the menubar if the toolbar is appended to it but not visible (closes #3204955)

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5585 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2011-03-10  Colomban Wendling  <colomban(at)geany(dot)org>
+
+ * src/toolbar.c:
+   Correctly expand the menubar if the toolbar is appended to it but
+   not visible (closes #3204955).
+
+
 2011-03-08  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/geany.h:

src/toolbar.c

@@ -480,7 +480,8 @@ void toolbar_update_ui(void)
 	/* we need to adjust the packing flags for the menubar to expand it if it is alone in the
 	 * hbox and not expand it if the toolbar is appended */
 	gtk_box_set_child_packing(GTK_BOX(hbox_menubar), menubar,
-		! toolbar_prefs.append_to_menu, ! toolbar_prefs.append_to_menu, 0, GTK_PACK_START);
+		! (toolbar_prefs.visible && toolbar_prefs.append_to_menu),
+		! (toolbar_prefs.visible && toolbar_prefs.append_to_menu), 0, GTK_PACK_START);
 }