diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-10-18 18:05:11 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-10-18 18:05:11 +0000 |
| commit | 3d7ad335e866233cd295fd797845839ee44afcdf (patch) | |
| tree | bb39363aebc1ca662a55a31f3498bca0156b0fed /gtk | |
| parent | 82e0b650388aa4f89c4fc371eab057b278b59f92 (diff) | |
There's only one expert info dialog now; dispense with the "composite" part
of the name (at least what we show users; the files and functions still
reference composite).
svn path=/trunk/; revision=39462
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/expert_comp_dlg.c | 12 | ||||
| -rw-r--r-- | gtk/main_menubar.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c index 8901efa092..624c5a6629 100644 --- a/gtk/expert_comp_dlg.c +++ b/gtk/expert_comp_dlg.c @@ -197,7 +197,7 @@ error_set_title(expert_comp_dlg_t *ss) { char *title; - title = g_strdup_printf("Expert Info Composite: %s", + title = g_strdup_printf("Expert Info: %s", cf_get_display_name(&cfile)); gtk_window_set_title(GTK_WINDOW(ss->win), title); g_free(title); @@ -635,7 +635,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) GtkWidget *close_bt; GtkWidget *help_bt; expert_tapdata_t *etd; - + ss=g_malloc(sizeof(expert_comp_dlg_t)); ss->disp_events = 0; @@ -665,7 +665,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) ss->error_label = gtk_label_new("Errors: 0/y"); gtk_widget_show(ss->error_label); hbox = gtk_hbox_new(FALSE, 3); - if ( prefs.gui_expert_composite_eyecandy ) { + if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_error_pb_data); gtk_widget_show(image); gtk_container_add(GTK_CONTAINER(hbox), image); @@ -679,7 +679,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) ss->warn_label = gtk_label_new("Warnings: 0/y"); gtk_widget_show(ss->warn_label); hbox = gtk_hbox_new(FALSE, 3); - if ( prefs.gui_expert_composite_eyecandy ) { + if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_warn_pb_data); gtk_widget_show(image); gtk_container_add(GTK_CONTAINER(hbox), image); @@ -693,7 +693,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) ss->note_label = gtk_label_new("Notes: 0/y"); gtk_widget_show(ss->note_label); hbox = gtk_hbox_new(FALSE, 3); - if ( prefs.gui_expert_composite_eyecandy ) { + if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_note_pb_data); gtk_widget_show(image); gtk_container_add(GTK_CONTAINER(hbox), image); @@ -707,7 +707,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) ss->chat_label = gtk_label_new("Chats: 0/y"); gtk_widget_show(ss->chat_label); hbox = gtk_hbox_new(FALSE, 3); - if ( prefs.gui_expert_composite_eyecandy ) { + if ( prefs.gui_expert_composite_eyecandy ) { image = pixbuf_to_widget(expert_chat_pb_data); gtk_widget_show(image); gtk_container_add(GTK_CONTAINER(hbox), image); diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c index f1a09af894..89e0584684 100644 --- a/gtk/main_menubar.c +++ b/gtk/main_menubar.c @@ -1176,7 +1176,7 @@ static const char *ui_desc_menubar = " <menuitem name='FollowTCPStream' action='/Analyze/FollowTCPStream'/>\n" " <menuitem name='FollowUDPStream' action='/Analyze/FollowUDPStream'/>\n" " <menuitem name='FollowSSLStream' action='/Analyze/FollowSSLStream'/>\n" -" <menuitem name='ExpertInfoComposite' action='/Analyze/ExpertInfoComposite'/>\n" +" <menuitem name='ExpertInfo' action='/Analyze/ExpertInfo'/>\n" " <menu name= 'ConversationFilterMenu' action='/Analyze/ConversationFilter'>\n" " <placeholder name='Filters'/>\n" " </menu>\n" @@ -1638,7 +1638,7 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Analyze/FollowUDPStream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, { "/Analyze/FollowSSLStream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, - { "/Analyze/ExpertInfoComposite",WIRESHARK_STOCK_EXPERT_INFO, "Expert Info _Composite", NULL, NULL, G_CALLBACK(expert_comp_dlg_launch) }, + { "/Analyze/ExpertInfo", WIRESHARK_STOCK_EXPERT_INFO, "Expert _Info", NULL, NULL, G_CALLBACK(expert_comp_dlg_launch) }, { "/Analyze/ConversationFilter", NULL, "Conversation Filter", NULL, NULL, NULL }, |