Function rename:

new_packet_list_column_clicked() -> new_packet_list_column_menu_cb() 
packet_list_column_clicked() -> packet_list_column_menu_cb() 

svn path=/trunk/; revision=31130

5 files changed, 16 insertions, 16 deletions

diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c
index ef40edfd81..0403ff8a60 100644
--- a/gtk/main_packet_list.c
+++ b/gtk/main_packet_list.c
@@ -301,7 +301,7 @@ packet_list_sort_column(gint column, gpointer data, GtkSortType order)
 
 
 void
-packet_list_column_clicked (GtkWidget *w _U_, gpointer user_data _U_, COLUMN_SELECTED_E action)
+packet_list_column_menu_cb (GtkWidget *w _U_, gpointer user_data _U_, COLUMN_SELECTED_E action)
 {
       gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(packet_list), E_MPACKET_LIST_COL_KEY));
       gpointer data = g_object_get_data (G_OBJECT(packet_list), E_MPACKET_LIST_COL_ARROWS_KEY);
diff --git a/gtk/main_packet_list.h b/gtk/main_packet_list.h
index 96ee531ac7..aa48ef8784 100644
--- a/gtk/main_packet_list.h
+++ b/gtk/main_packet_list.h
@@ -59,7 +59,7 @@ extern void packet_list_recreate(void);
  */
 extern void packet_list_set_column_titles(void);
 
-extern void packet_list_column_clicked (GtkWidget *w, gpointer data, COLUMN_SELECTED_E action);
+extern void packet_list_column_menu_cb (GtkWidget *w, gpointer data, COLUMN_SELECTED_E action);
 
 /** Resize columns
  *
diff --git a/gtk/menus.c b/gtk/menus.c
index f544f7696e..6dd14d3750 100644
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -764,36 +764,36 @@ static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
 static GtkItemFactoryEntry packet_list_heading_items[] =
 {
 #ifdef NEW_PACKET_LIST
-    {"/Sort Ascending", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_SORT_ASCENDING, "<StockItem>", GTK_STOCK_SORT_ASCENDING,},
-    {"/Sort Descending", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_SORT_DESCENDING, "<StockItem>", GTK_STOCK_SORT_DESCENDING,},
+    {"/Sort Ascending", NULL, GTK_MENU_FUNC(new_packet_list_column_menu_cb), COLUMN_SELECTED_SORT_ASCENDING, "<StockItem>", GTK_STOCK_SORT_ASCENDING,},
+    {"/Sort Descending", NULL, GTK_MENU_FUNC(new_packet_list_column_menu_cb), COLUMN_SELECTED_SORT_DESCENDING, "<StockItem>", GTK_STOCK_SORT_DESCENDING,},
 
     {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 
-    {"/Align Left", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_ALIGN_LEFT, "<StockItem>", GTK_STOCK_JUSTIFY_LEFT,},
-    {"/Align Right", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_ALIGN_RIGHT, "<StockItem>", GTK_STOCK_JUSTIFY_RIGHT,},
+    {"/Align Left", NULL, GTK_MENU_FUNC(new_packet_list_column_menu_cb), COLUMN_SELECTED_ALIGN_LEFT, "<StockItem>", GTK_STOCK_JUSTIFY_LEFT,},
+    {"/Align Right", NULL, GTK_MENU_FUNC(new_packet_list_column_menu_cb), COLUMN_SELECTED_ALIGN_RIGHT, "<StockItem>", GTK_STOCK_JUSTIFY_RIGHT,},
 
     {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 
     {"/Column Preferences", NULL, GTK_MENU_FUNC(prefs_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,},
-    {"/Resize Column", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_RESIZE, "<StockItem>", WIRESHARK_STOCK_RESIZE_COLUMNS,},
-    {"/Rename Column Title", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,},
+    {"/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,},
 
     {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 
-    {"/Remove Column", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_REMOVE, "<StockItem>", GTK_STOCK_DELETE,}
+    {"/Remove Column", NULL, GTK_MENU_FUNC(new_packet_list_column_menu_cb), COLUMN_SELECTED_REMOVE, "<StockItem>", GTK_STOCK_DELETE,}
 #else
-    {"/Sort Ascending", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_SORT_ASCENDING, "<StockItem>", GTK_STOCK_SORT_ASCENDING,},
-    {"/Sort Descending", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_SORT_DESCENDING, "<StockItem>", GTK_STOCK_SORT_DESCENDING,},
+    {"/Sort Ascending", NULL, GTK_MENU_FUNC(packet_list_column_menu_cb), COLUMN_SELECTED_SORT_ASCENDING, "<StockItem>", GTK_STOCK_SORT_ASCENDING,},
+    {"/Sort Descending", NULL, GTK_MENU_FUNC(packet_list_column_menu_cb), COLUMN_SELECTED_SORT_DESCENDING, "<StockItem>", GTK_STOCK_SORT_DESCENDING,},
 
     {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 
     {"/Column Preferences", NULL, GTK_MENU_FUNC(prefs_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,},
-    {"/Resize Column", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_RESIZE, "<StockItem>", WIRESHARK_STOCK_RESIZE_COLUMNS,},
-    {"/Rename Column Title", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,},
+    {"/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,},
 
     {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 
-    {"/Remove Column", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_REMOVE, "<StockItem>", GTK_STOCK_DELETE,}
+    {"/Remove Column", NULL, GTK_MENU_FUNC(packet_list_column_menu_cb), COLUMN_SELECTED_REMOVE, "<StockItem>", GTK_STOCK_DELETE,}
 #endif
 };
 
diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index 6e38380e23..08fa121ef6 100644
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -294,7 +294,7 @@ new_packet_list_remove_column (gint col_id, GtkTreeViewColumn *col _U_)
 }
 
 void
-new_packet_list_column_clicked (GtkWidget *w _U_, gpointer user_data _U_, COLUMN_SELECTED_E action)
+new_packet_list_column_menu_cb (GtkWidget *w _U_, gpointer user_data _U_, COLUMN_SELECTED_E action)
 {
 	GtkTreeViewColumn *col = (GtkTreeViewColumn *)
 	  g_object_get_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY);
diff --git a/gtk/new_packet_list.h b/gtk/new_packet_list.h
index ff65a60730..f604c34a4d 100644
--- a/gtk/new_packet_list.h
+++ b/gtk/new_packet_list.h
@@ -42,7 +42,7 @@ typedef enum {
 
 GtkWidget *new_packet_list_create(void);
 void new_packet_list_recreate(void);
-void new_packet_list_column_clicked (GtkWidget *w, gpointer data, COLUMN_SELECTED_E action);
+void new_packet_list_column_menu_cb (GtkWidget *w, gpointer data, COLUMN_SELECTED_E action);
 void new_packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_);
 gboolean new_packet_list_get_event_row_column(GdkEventButton *event_button, gint *physical_row, gint *row, gint *column);