Fixed opening correct preferences page.

svn path=/trunk/; revision=31149

3 files changed, 20 insertions, 6 deletions

diff --git a/gtk/menus.c b/gtk/menus.c
index 9e263d6d42..b44ad115dc 100644
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -531,7 +531,7 @@ static GtkItemFactoryEntry menu_items[] =
     {"/Edit/Find Previous Reference", "<alt><shift><control>B", GTK_MENU_FUNC(reftime_frame_cb), REFTIME_FIND_PREV, NULL, NULL,},
     {"/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
     {"/Edit/_Configuration Profiles...", "<shift><control>A", GTK_MENU_FUNC(profile_dialog_cb), 0, NULL, NULL,},
-    {"/Edit/_Preferences...", "<shift><control>P", GTK_MENU_FUNC(prefs_cb),
+    {"/Edit/_Preferences...", "<shift><control>P", GTK_MENU_FUNC(prefs_page_cb),
                              PREFS_PAGE_USER_INTERFACE, "<StockItem>", GTK_STOCK_PREFERENCES,},
     {"/_View", NULL, NULL, 0, "<Branch>", NULL,},
     {"/View/_Main Toolbar", NULL, GTK_MENU_FUNC(show_hide_cb), SHOW_HIDE_MAIN_TOOLBAR, "<CheckItem>", NULL,},
@@ -777,7 +777,7 @@ static GtkItemFactoryEntry packet_list_heading_items[] =
 
     {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 
-    {"/Column Preferences...", NULL, GTK_MENU_FUNC(prefs_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,},
+    {"/Column Preferences...", NULL, GTK_MENU_FUNC(prefs_page_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,},
     {"/Resize Column", NULL, GTK_MENU_FUNC(new_packet_list_column_menu_cb), COLUMN_SELECTED_RESIZE, "<StockItem>", WIRESHARK_STOCK_RESIZE_COLUMNS,},
     {"/Rename Column Title...", NULL, GTK_MENU_FUNC(new_packet_list_column_menu_cb), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,},
 
@@ -790,7 +790,7 @@ static GtkItemFactoryEntry packet_list_heading_items[] =
 
     {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 
-    {"/Column Preferences...", NULL, GTK_MENU_FUNC(prefs_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,},
+    {"/Column Preferences...", NULL, GTK_MENU_FUNC(prefs_page_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,},
     {"/Resize Column", NULL, GTK_MENU_FUNC(packet_list_column_menu_cb), COLUMN_SELECTED_RESIZE, "<StockItem>", WIRESHARK_STOCK_RESIZE_COLUMNS,},
     {"/Rename Column Title...", NULL, GTK_MENU_FUNC(packet_list_column_menu_cb), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,},
 
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index c44b89cde2..7315a05f21 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -409,7 +409,13 @@ prefs_nb_page_add(GtkWidget *notebook, const gchar *title, GtkWidget *page, cons
 
 /* show the dialog */
 void
-prefs_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page)
+prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
+{
+  prefs_page_cb (w, dummy, PREFS_PAGE_USER_INTERFACE);
+}
+
+void
+prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page)
 {
   GtkWidget         *top_hb, *bbox, *prefs_nb, *ct_sb,
                     *ok_bt, *apply_bt, *save_bt, *cancel_bt, *help_bt;
@@ -1764,7 +1770,7 @@ properties_cb(GtkWidget *w, gpointer dummy)
   if (prefs_w != NULL) {
     reactivate_window(prefs_w);
   } else {
-    prefs_cb(w, dummy, PREFS_PAGE_USER_INTERFACE);
+    prefs_cb(w, dummy);
   }
 
   /* Search all the pages in that window for the one with the specified
diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index 95659415d1..28e3fe9ef0 100644
--- a/gtk/prefs_dlg.h
+++ b/gtk/prefs_dlg.h
@@ -74,7 +74,15 @@ typedef enum {
  * @param widget parent widget (unused)
  * @param data unused
  */
-extern void prefs_cb(GtkWidget *widget, gpointer data, PREFS_PAGE_E prefs_page);
+extern void prefs_cb(GtkWidget *widget, gpointer data);
+
+/** Show the preferences dialog in given page.
+ * 
+ * @param widget parent widget (unused)
+ * @param data unused
+ * @param prefs_page page to show
+ */
+extern void prefs_page_cb(GtkWidget *widget, gpointer data, PREFS_PAGE_E prefs_page);
 
 /** Show the protocol properties dialog.
  *