osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove leftover debug code/comment 

svn path=/trunk/; revision=34166
This commit is contained in:
Anders Broman 2010-09-21 05:10:38 +00:00
parent 381664535b
commit c237a52cca
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/menus.c
View File

@ -1574,12 +1574,6 @@ packet_list_heading_rename_col_cb(GtkWidget *widget, gpointer user_data)
new_packet_list_column_menu_cb( widget , user_data, COLUMN_SELECTED_RENAME);
}
static void
packet_list_heading_activate_all_columns(GtkWidget *widget _U_, gpointer user_data _U_)
{
new_packet_list_set_all_columns_visible ();
}
static void
packet_list_heading_hide_col_cb(GtkWidget *widget, gpointer user_data)
{
@ -2296,11 +2290,10 @@ static const char *ui_desc_packet_list_heading_menu_popup =
" <separator/>\n"
" <menuitem name='ColumnPreferences' action='/Column Preferences'/>\n"
" <separator/>\n"
" <menu name='DisplayedColumns' action='/Displayed Columns'>\n"
" <menuitem name='Display All' action='/Displayed Columns/Display All'/>\n"
" <menu name= 'DisplayedColumns' action='/Displayed Columns'>\n"
" <menuitem name='HideColumn' action='/Hide Column'/>\n"
" <menuitem name='RemoveColumn' action='/Remove Column'/>\n"
" </menu>\n"
" <menuitem name='HideColumn' action='/Hide Column'/>\n"
" <menuitem name='RemoveColumn' action='/Remove Column'/>\n"
" </popup>\n"
"</ui>\n";
@ -2315,7 +2308,6 @@ static const GtkActionEntry packet_list_heading_menu_popup_action_entries[] = {
{ "/Resize Column", WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize Column", NULL, NULL, G_CALLBACK(packet_list_heading_resize_col_cb) },
{ "/Rename Column Title", GTK_STOCK_BOLD, "Rename Column Title...", NULL, NULL, G_CALLBACK(packet_list_heading_rename_col_cb) },
{ "/Displayed Columns", NULL, "Displayed Columns", NULL, NULL, NULL },
{ "/Displayed Columns/Display All", NULL, "Display All", NULL, NULL, G_CALLBACK(packet_list_heading_activate_all_columns) },
{ "/Hide Column", NULL, "Hide Column", NULL, NULL, G_CALLBACK(packet_list_heading_hide_col_cb) },
{ "/Remove Column", GTK_STOCK_DELETE, "Remove Column", NULL, NULL, G_CALLBACK(packet_list_heading_remove_col_cb) },
};
@ -3061,7 +3053,6 @@ menus_init(void) {
G_CALLBACK(select_bytes_view_cb), /* the callback to connect to the changed signal */
popup_menu_object); /* data to pass to the action callbacks */
/*Debug */
ui_manager_bytes_menu = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (ui_manager_bytes_menu,
@ -3500,16 +3491,12 @@ set_menu_sensitivity(GtkUIManager *ui_manager, const gchar *path, gint val)
path);
return;
}
#if 0
#if GLIB_CHECK_VERSION(2,6,0)
gtk_action_set_sensitive (action,
val); /* TRUE to make the action sensitive */
#else
g_object_set (G_OBJECT (action), "sensitive", val, NULL);
#endif
#else
g_object_set (G_OBJECT (action), "sensitive", val, NULL);
#endif
}
#endif /* MENUS_USE_UIMANAGER */
@ -5273,13 +5260,11 @@ menu_visible_column_toggle (GtkWidget *w _U_, gpointer data)
new_packet_list_toggle_visible_column (GPOINTER_TO_INT(data));
}
#ifndef MENUS_USE_UIMANAGER
static void
menu_activate_all_columns (GtkWidget *w _U_, gpointer data _U_)
{
new_packet_list_set_all_columns_visible ();
}
#endif
void
rebuild_visible_columns_menu (void)
@ -5290,11 +5275,11 @@ rebuild_visible_columns_menu (void)
fmt_data *cfmt;
gchar *title;
gint i, col_id, cur_fmt;
menu_columns[0] = gtk_item_factory_get_widget(main_menu_factory, "/View/Displayed Columns");
#ifdef MENUS_USE_UIMANAGER
menu_columns[0] = gtk_item_factory_get_widget(main_menu_factory, "/View/DisplayedColumns");
menu_columns[1] = gtk_ui_manager_get_widget(ui_manager_packet_list_heading, "/PacketListHeadingPopup/DisplayedColumns");
#else
menu_columns[0] = gtk_item_factory_get_widget(main_menu_factory, "/View/Displayed Columns");
menu_columns[1] = gtk_item_factory_get_widget(packet_list_heading_factory, "/Displayed Columns");
#endif
/* Debug */
@ -5332,11 +5317,7 @@ rebuild_visible_columns_menu (void)
menu_item = gtk_menu_item_new_with_label ("Display All");
gtk_menu_shell_append (GTK_MENU_SHELL(sub_menu), menu_item);
#ifdef MENUS_USE_UIMANAGER
g_signal_connect(menu_item, "activate", G_CALLBACK(packet_list_heading_activate_all_columns), NULL);
#else
g_signal_connect(menu_item, "activate", G_CALLBACK(menu_activate_all_columns), NULL);
#endif
gtk_widget_show (menu_item);
}
}