SF.net SVN: geany:[5760] trunk

[ntrel at users.sourceforge.net]

Revision: 5760
          http://geany.svn.sourceforge.net/geany/?rev=5760&view=rev
Author:   ntrel
Date:     2011-05-06 15:59:30 +0000 (Fri, 06 May 2011)

Log Message:
-----------
Fix 'Toolbar Preferences' popup menu item (oops).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-05-03 20:37:00 UTC (rev 5759)
+++ trunk/ChangeLog	2011-05-06 15:59:30 UTC (rev 5760)
@@ -1,3 +1,9 @@
+2011-05-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/callbacks.c:
+   Fix 'Toolbar Preferences' popup menu item (oops).
+
+
 2011-05-03  Colomban Wendling  <colomban(at)geany(dot)org>
 
  * doc/geany.txt, doc/geany.html:

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2011-05-03 20:37:00 UTC (rev 5759)
+++ trunk/src/callbacks.c	2011-05-06 15:59:30 UTC (rev 5760)
@@ -2225,25 +2225,33 @@
 }
 
 
-void
-on_customize_toolbar1_activate         (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
+static void show_notebook_page(const gchar *notebook_name, const gchar *page_name)
 {
 	GtkWidget *widget;
 	GtkNotebook *notebook;
 
-	prefs_show_dialog();
+	widget = ui_lookup_widget(ui_widgets.prefs_dialog, page_name);
+	notebook = GTK_NOTEBOOK(ui_lookup_widget(ui_widgets.prefs_dialog, notebook_name));
 
-	/* select the KB page */
-	widget = ui_lookup_widget(ui_widgets.prefs_dialog, "vbox15");
-	notebook = GTK_NOTEBOOK(ui_lookup_widget(ui_widgets.prefs_dialog, "notebook2"));
-
 	if (notebook != NULL && widget != NULL)
 		gtk_notebook_set_current_page(notebook, gtk_notebook_page_num(notebook, widget));
 }
 
 
 void
+on_customize_toolbar1_activate         (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+	prefs_show_dialog();
+
+	/* select the Interface page */
+	show_notebook_page("notebook2", "notebook6");
+	/* select the Toolbar subpage */
+	show_notebook_page("notebook6", "vbox15");
+}
+
+
+void
 on_button_customize_toolbar_clicked    (GtkButton       *button,
                                         gpointer         user_data)
 {


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