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

Fix [-W shadow] issue in SVN #47958 in a slightly different manner than the fix SVN #47960. 

svn path=/trunk/; revision=47976
This commit is contained in:
Bill Meier 2013-03-01 16:31:42 +00:00
parent ce6f1d2f9c
commit 93be111c38
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/gtk/color_dlg.c
View File

@ -802,7 +802,7 @@ create_new_color_filter(GtkButton *button, const char *filter)
select_row(color_filters, 0);
/* open the edit dialog */
color_edit_dlg(color_filters, TRUE /* is a new filter */);
color_edit_dlg_new(color_filters, TRUE /* is a new filter */);
gtk_widget_grab_focus(color_filters);
}
@ -824,7 +824,7 @@ color_edit_cb(GtkButton *button, gpointer user_data _U_)
color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL);
g_assert(color_dlg_row_selected != -1);
color_edit_dlg(color_filters, FALSE /* is not a new filter */);
color_edit_dlg_new(color_filters, FALSE /* is not a new filter */);
}
/* User double-clicked on the coloring rule */
@ -833,7 +833,7 @@ color_filters_button_cb(GtkWidget *list, GdkEventButton *event,
gpointer data _U_)
{
if (event->type == GDK_2BUTTON_PRESS) {
color_edit_dlg(list, FALSE);
color_edit_dlg_new(list, FALSE);
}
return FALSE;

28
ui/gtk/color_edit_dlg.c
View File

@ -157,13 +157,13 @@ colorize_filter_new(GtkWidget *colorize_hbox,
/* Create a "color edit dialog" for a given color filter, and
associate it with that color filter. */
void
color_edit_dlg(GtkWidget *color_filters,
gboolean is_new_filter)
color_edit_dlg_new(GtkWidget *color_filters,
gboolean is_new_filter)
{
color_edit_dlg_info_t *cedi;
color_filter_t *colorf;
GtkWidget *color_edit_window;
GtkWidget *color_edit_dlg;
GtkWidget *dialog_vbox;
GtkWidget *filter_fr;
GtkWidget *filter_fr_vbox;
@ -206,15 +206,15 @@ color_edit_dlg(GtkWidget *color_filters,
}
/* dialog window */
color_edit_window = dlg_conf_window_new ("Wireshark: Edit Color Filter");
gtk_window_set_default_size(GTK_WINDOW(color_edit_window), 500, -1);
/* XXX: set color_edit_window as 'modal' to prevent simultaneously opening
color_edit_dlg = dlg_conf_window_new ("Wireshark: Edit Color Filter");
gtk_window_set_default_size(GTK_WINDOW(color_edit_dlg), 500, -1);
/* XXX: set color_edit_dlg as 'modal' to prevent simultaneously opening
* dialog windows for different filters ? is 'transient for' also needed ?
*/
dialog_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);
gtk_container_add (GTK_CONTAINER (color_edit_window), dialog_vbox);
gtk_container_add (GTK_CONTAINER (color_edit_dlg), dialog_vbox);
/* Filter frame */
filter_fr = gtk_frame_new("Filter");
@ -266,7 +266,7 @@ color_edit_dlg(GtkWidget *color_filters,
g_signal_connect(filt_text_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(filter_string_hbox), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(filt_text_entry, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(color_edit_window, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
g_signal_connect(color_edit_dlg, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
gtk_entry_set_text(GTK_ENTRY(filt_text_entry), colorf->filter_text);
gtk_box_pack_start (GTK_BOX (filter_string_hbox), filt_text_entry, TRUE, TRUE, 0);
@ -329,7 +329,7 @@ color_edit_dlg(GtkWidget *color_filters,
edit_color_filter_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
gtk_widget_set_tooltip_text(edit_color_filter_cancel, "Reject filter color change");
/* escape will select cancel */
window_set_cancel_button(color_edit_window, edit_color_filter_cancel, window_cancel_button_cb);
window_set_cancel_button(color_edit_dlg, edit_color_filter_cancel, window_cancel_button_cb);
/** Ok **/
edit_color_filter_ok = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
@ -341,12 +341,12 @@ color_edit_dlg(GtkWidget *color_filters,
cedi->color_filters = color_filters;
cedi->colorf = colorf;
cedi->color_edit_dlg = color_edit_window;
cedi->color_edit_dlg = color_edit_dlg;
cedi->filt_name_entry = filt_name_entry;
cedi->filt_text_entry = filt_text_entry;
cedi->disabled_cb = disabled_cb;
g_signal_connect(color_edit_window, "destroy", G_CALLBACK(color_edit_dlg_destroy_cb), cedi);
g_signal_connect(color_edit_dlg, "destroy", G_CALLBACK(color_edit_dlg_destroy_cb), cedi);
g_signal_connect(edit_color_filter_ok, "clicked", G_CALLBACK(color_edit_dlg_ok_cb), cedi);
@ -355,10 +355,10 @@ color_edit_dlg(GtkWidget *color_filters,
G_CALLBACK(color_edit_dlg_cancel_cb), cedi);
}
g_signal_connect(color_edit_window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
g_signal_connect(color_edit_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
gtk_widget_show_all(color_edit_window);
window_present(color_edit_window);
gtk_widget_show_all(color_edit_dlg);
window_present(color_edit_dlg);
}

4
ui/gtk/color_edit_dlg.h
View File

@ -36,8 +36,8 @@ typedef struct _color_edit_dlg_info_t color_edit_dlg_info_t;
/* new color filter edit dialog */
extern void
color_edit_dlg(GtkWidget *color_filters,
gboolean is_new_filter);
color_edit_dlg_new(GtkWidget *color_filters,
gboolean is_new_filter);
#if 1 /* doesn't really belong here */
/* edit dialog wants to destroy itself */