diff options
| author | Bill Meier <wmeier@newsguy.com> | 2015-02-15 13:58:39 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2015-02-15 19:02:30 +0000 |
| commit | bfde04b845485c5ebf0a9bed15392cf9f0c47374 (patch) | |
| tree | 7a5ef55dbc0bf4163aa1eacc9c3964ea46b58f8b /ui | |
| parent | 7229c54ae95c7cb6bf0637a1eb21ceeed53dc28d (diff) | |
| download | wireshark-bfde04b845485c5ebf0a9bed15392cf9f0c47374.tar.gz | |
ui/gtk/*.c: Add editor modelines; As needed: Fix indentation
Change-Id: I8cd9d9fe5f12c284f46b8f725766f681faccd753
Reviewed-on: https://code.wireshark.org/review/7138
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'ui')
99 files changed, 2723 insertions, 1443 deletions
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index b032dc9aa6..0ed474af9b 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -78,9 +78,9 @@ static GtkWidget *about_wireshark_w; static void about_wireshark(GtkWidget *parent _U_, GtkWidget *main_vb) { - GtkWidget *msg_label, *icon; - gchar *message; - const char *title = "Network Protocol Analyzer"; + GtkWidget *msg_label, *icon; + gchar *message; + const char *title = "Network Protocol Analyzer"; /*icon = xpm_to_widget_from_parent(parent, wssplash_xpm);*/ icon = pixbuf_to_widget(wssplash_pb_data); @@ -170,9 +170,9 @@ splash_update(register_action_e action, const char *message, gpointer client_dat GtkWidget *main_lb; GtkWidget *prog_bar; GtkWidget *percentage_lb; - gfloat percentage; - gulong ul_percentage; - gchar tmp[100]; + gfloat percentage; + gulong ul_percentage; + gchar tmp[100]; const char *action_msg; static gulong ul_sofar = 0; @@ -204,35 +204,35 @@ splash_update(register_action_e action, const char *message, gpointer client_dat /* the action has changed */ switch(action) { case RA_DISSECTORS: - action_msg = "Initializing dissectors ..."; - break; + action_msg = "Initializing dissectors ..."; + break; case RA_LISTENERS: - action_msg = "Initializing tap listeners ..."; - break; + action_msg = "Initializing tap listeners ..."; + break; case RA_REGISTER: - action_msg = "Registering dissector ..."; - break; + action_msg = "Registering dissector ..."; + break; case RA_PLUGIN_REGISTER: - action_msg = "Registering plugins ..."; - break; + action_msg = "Registering plugins ..."; + break; case RA_HANDOFF: - action_msg = "Handing off dissector ..."; - break; + action_msg = "Handing off dissector ..."; + break; case RA_PLUGIN_HANDOFF: - action_msg = "Handing off plugins ..."; - break; + action_msg = "Handing off plugins ..."; + break; case RA_LUA_PLUGINS: - action_msg = "Loading Lua plugins ..."; - break; + action_msg = "Loading Lua plugins ..."; + break; case RA_PREFERENCES: - action_msg = "Loading module preferences ..."; - break; + action_msg = "Loading module preferences ..."; + break; case RA_CONFIGURATION: - action_msg = "Loading configuration files ..."; - break; + action_msg = "Loading configuration files ..."; + break; default: - action_msg = "(Unknown action)"; - break; + action_msg = "(Unknown action)"; + break; } splash_update_label(win, action_msg); last_action = action; @@ -240,9 +240,9 @@ splash_update(register_action_e action, const char *message, gpointer client_dat if(ul_count == 0) { /* get the count of dissectors */ ul_count = register_count() + 6; /* additional 6 for: - dissectors, listeners, - registering plugins, handingoff plugins, - preferences and configuration */ + dissectors, listeners, + registering plugins, handingoff plugins, + preferences and configuration */ #ifdef HAVE_LUA ul_count += wslua_count_plugins (); /* get count of lua plugins */ #endif @@ -253,9 +253,9 @@ splash_update(register_action_e action, const char *message, gpointer client_dat so we need to strip off the leading elements to get back to the protocol */ if(message) { if(!strncmp(message, "proto_register_", 15)) - message += 15; + message += 15; else if(!strncmp(message, "proto_reg_handoff_", 18)) - message += 18; + message += 18; } gtk_label_set_text(GTK_LABEL(main_lb), message ? message : ""); @@ -293,8 +293,8 @@ splash_destroy(GtkWidget *win) static GtkWidget * about_wireshark_page_new(void) { - GtkWidget *main_box, *msg_label /*, *icon*/; - gchar *message; + GtkWidget *main_box, *msg_label /*, *icon*/; + gchar *message; main_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 6, FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_box), 12); @@ -333,8 +333,8 @@ about_wireshark_page_new(void) static GtkWidget * about_authors_page_new(void) { - GtkWidget *page; - char *absolute_path; + GtkWidget *page; + char *absolute_path; absolute_path = get_datafile_path("AUTHORS-SHORT"); page = text_page_new(absolute_path); @@ -345,9 +345,9 @@ about_authors_page_new(void) static gboolean about_folders_callback(GtkWidget *widget, GdkEventButton *event, gint id _U_) { GtkTreeSelection *tree_selection; - GtkTreeModel *model; - GtkTreeIter iter; - gchar *path; + GtkTreeModel *model; + GtkTreeIter iter; + gchar *path; tree_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); @@ -376,17 +376,17 @@ about_folders_row(GtkWidget *table, const char *label, const char *dir, const ch static GtkWidget * about_folders_page_new(void) { - GtkWidget *table; - const char *constpath; - char *path; + GtkWidget *table; + const char *constpath; + char *path; static const gchar *titles[] = { "Name", "Folder", "Typical Files"}; - GtkWidget *scrolledwindow; + GtkWidget *scrolledwindow; #if defined(HAVE_LIBSMI) || defined(HAVE_GEOIP) || defined(HAVE_EXTCAP) - gint i; - gchar **resultArray; + gint i; + gchar **resultArray; #endif #if 0 - const gchar * const *dirs; + const gchar *const *dirs; #endif scrolledwindow = scrolled_window_new(NULL, NULL); @@ -398,7 +398,7 @@ about_folders_page_new(void) /* connect a callback so we can spot a double-click */ g_signal_connect(table, "button_press_event", - G_CALLBACK(about_folders_callback), NULL); + G_CALLBACK(about_folders_callback), NULL); simple_list_url_col(table, 1); @@ -425,7 +425,7 @@ about_folders_page_new(void) #if 0 dirs = g_get_system_data_dirs (); for (i = 0; dirs[i]; i++){ - g_warning("glibs data path %u %s",i+1,dirs[i]); + g_warning("glibs data path %u %s",i+1,dirs[i]); } #endif /* system */ @@ -458,7 +458,7 @@ about_folders_page_new(void) for(i = 0; resultArray[i]; i++) about_folders_row(table, "GeoIP path", g_strstrip(resultArray[i]), - "GeoIP database search path"); + "GeoIP database search path"); g_strfreev(resultArray); g_free(path); #endif @@ -471,7 +471,7 @@ about_folders_page_new(void) for(i = 0; resultArray[i]; i++) about_folders_row(table, "MIB/PIB path", g_strstrip(resultArray[i]), - "SMI MIB/PIB search path"); + "SMI MIB/PIB search path"); g_strfreev(resultArray); g_free(path); #endif @@ -484,7 +484,7 @@ about_folders_page_new(void) for(i = 0; resultArray[i]; i++) about_folders_row(table, "Extcap path", g_strstrip(resultArray[i]), - "Extcap Plugins search path"); + "Extcap Plugins search path"); g_strfreev(resultArray); #endif @@ -496,8 +496,8 @@ about_folders_page_new(void) static GtkWidget * about_license_page_new(void) { - GtkWidget *page; - char *absolute_path; + GtkWidget *page; + char *absolute_path; #if defined(_WIN32) absolute_path = get_datafile_path("COPYING.txt"); @@ -512,14 +512,14 @@ about_license_page_new(void) void about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ ) { - GtkWidget *main_box, *main_nb, *bbox, *ok_btn; - GtkWidget *page_lb, *about_page, *folders_page; + GtkWidget *main_box, *main_nb, *bbox, *ok_btn; + GtkWidget *page_lb, *about_page, *folders_page; #if defined(HAVE_PLUGINS) || defined(HAVE_LUA) - GtkWidget *plugins_page; + GtkWidget *plugins_page; #endif - GtkWidget *authors_page, *license_page; + GtkWidget *authors_page, *license_page; if (about_wireshark_w != NULL) { /* There's already an "About Wireshark" dialog box; reactivate it. */ @@ -593,3 +593,16 @@ about_wireshark_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) /* Note that we no longer have an "About Wireshark" dialog box. */ about_wireshark_w = NULL; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index 7ec9f6a546..f58122a4c9 100644 --- a/ui/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.c @@ -201,3 +201,16 @@ register_tap_listener_gtkafpstat(void) register_param_stat(&afp_stat_dlg, "AFP", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c index 8b84505315..8af272e097 100644 --- a/ui/gtk/ansi_a_stat.c +++ b/ui/gtk/ansi_a_stat.c @@ -185,12 +185,12 @@ static GtkWidget* create_list(void) { - GtkListStore *list_store; - GtkWidget *list; + GtkListStore *list_store; + GtkWidget *list; GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkTreeSortable *sortable; - GtkTreeView *list_view; + GtkCellRenderer *renderer; + GtkTreeSortable *sortable; + GtkTreeView *list_view; GtkTreeSelection *selection; /* Create the store */ @@ -368,3 +368,15 @@ register_tap_listener_gtkansi_a_stat(void) } } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index 644b8ad29e..81e6948b89 100644 --- a/ui/gtk/ansi_map_stat.c +++ b/ui/gtk/ansi_map_stat.c @@ -379,3 +379,16 @@ register_tap_listener_gtkansi_map_stat(void) } register_stat_tap_ui(&ansi_map_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c index 19fe10eef2..a6c042da71 100644 --- a/ui/gtk/bootp_stat.c +++ b/ui/gtk/bootp_stat.c @@ -84,14 +84,14 @@ dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar *unused /* g_snprintf(string_buff, sizeof(string_buff), "%s (0X%x)", data->name, *key); */ tmp = gtk_label_new(data->name /* string_buff */); ws_gtk_grid_attach_extended(GTK_GRID(data->sp->grid_message_type), tmp, x, y, 1, 1, - (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); + (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT); gtk_widget_show(tmp); g_snprintf(string_buff, sizeof(string_buff), "%9d", data->packets); data->widget = gtk_label_new(string_buff); ws_gtk_grid_attach_extended(GTK_GRID(data->sp->grid_message_type), data->widget, x+1, y, 1, 1, - (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); + (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_label_set_justify(GTK_LABEL(data->widget), GTK_JUSTIFY_LEFT); gtk_widget_show(data->widget); @@ -268,3 +268,16 @@ register_tap_listener_gtkdhcpstat(void) register_param_stat(&dhcp_stat_dlg, "BOOTP-DHCP", REGISTER_STAT_GROUP_UNSORTED); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index 94974f6d6e..8069a6259a 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -923,12 +923,12 @@ bytes_view_expose(GtkWidget *widget, GdkEventExpose *event) #if !GTK_CHECK_VERSION(2, 14, 0) static void _gtk_adjustment_configure(GtkAdjustment *adj, - gdouble value, - gdouble lower, - gdouble upper, - gdouble step_increment, - gdouble page_increment, - gdouble page_size) + gdouble value, + gdouble lower, + gdouble upper, + gdouble step_increment, + gdouble page_increment, + gdouble page_size) { adj->value = value; adj->lower = lower; @@ -1486,3 +1486,16 @@ bytes_view_new(void) return widget; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c index f5286b6230..739436b955 100644 --- a/ui/gtk/camel_counter.c +++ b/ui/gtk/camel_counter.c @@ -45,9 +45,9 @@ static void gtk_camelcounter_reset(void *phs); static int gtk_camelcounter_packet(void *phs, - packet_info *pinfo _U_, - epan_dissect_t *edt _U_, - const void *phi); + packet_info *pinfo _U_, + epan_dissect_t *edt _U_, + const void *phi); static void gtk_camelcounter_draw(void *phs); static void win_destroy_cb(GtkWindow *win _U_, gpointer data); static void gtk_camelcounter_init(const char *opt_arg, void *userdata _U_); @@ -56,12 +56,12 @@ void register_tap_listener_gtk_camelcounter(void); /* following values represent the size of their valuestring arrays */ struct camelcounter_t { - GtkWidget *win; - GtkWidget *vbox; - char *filter; - GtkWidget *scrolled_window; + GtkWidget *win; + GtkWidget *vbox; + char *filter; + GtkWidget *scrolled_window; GtkTreeView *table; - guint32 camel_msg[camel_MAX_NUM_OPR_CODES]; + guint32 camel_msg[camel_MAX_NUM_OPR_CODES]; }; static void gtk_camelcounter_reset(void *phs) @@ -80,9 +80,9 @@ static void gtk_camelcounter_reset(void *phs) * If there is a valid camel operation, increase the value in the array of counter */ static int gtk_camelcounter_packet(void *phs, - packet_info *pinfo _U_, - epan_dissect_t *edt _U_, - const void *phi) + packet_info *pinfo _U_, + epan_dissect_t *edt _U_, + const void *phi) { struct camelcounter_t * p_counter =(struct camelcounter_t *)phs; const struct camelsrt_info_t * pi=(const struct camelsrt_info_t *)phi; @@ -95,11 +95,11 @@ static int gtk_camelcounter_packet(void *phs, static void gtk_camelcounter_draw(void *phs) { struct camelcounter_t *p_counter=(struct camelcounter_t *)phs; - int i; - char str[256]; - gchar* tmp_str; + int i; + char str[256]; + gchar *tmp_str; GtkListStore *store; - GtkTreeIter iter; + GtkTreeIter iter; /* Now print Message and Reason Counter Table */ /* clear list before printing */ @@ -115,9 +115,9 @@ static void gtk_camelcounter_draw(void *phs) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, str, - 1, p_counter->camel_msg[i], - -1); + 0, str, + 1, p_counter->camel_msg[i], + -1); } } /* Message Type */ } @@ -143,10 +143,10 @@ static const stat_column titles[]={ static void gtk_camelcounter_init(const char *opt_arg, void *userdata _U_) { struct camelcounter_t *p_camelcounter; - const char *filter=NULL; - GString *error_string; - GtkWidget *bbox; - GtkWidget *close_bt; + const char *filter = NULL; + GString *error_string; + GtkWidget *bbox; + GtkWidget *close_bt; if(strncmp(opt_arg,"camel,counter,",14) == 0){ filter=opt_arg+14; @@ -163,7 +163,7 @@ static void gtk_camelcounter_init(const char *opt_arg, void *userdata _U_) p_camelcounter->win=dlg_window_new("Wireshark: CAMEL counters"); gtk_window_set_destroy_with_parent (GTK_WINDOW(p_camelcounter->win), TRUE); - gtk_window_set_default_size(GTK_WINDOW(p_camelcounter->win), 500, 300); + gtk_window_set_default_size(GTK_WINDOW(p_camelcounter->win), 500, 300); p_camelcounter->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_set_border_width(GTK_CONTAINER(p_camelcounter->vbox), 12); @@ -176,9 +176,9 @@ static void gtk_camelcounter_init(const char *opt_arg, void *userdata _U_) p_camelcounter->table = create_stat_table(p_camelcounter->scrolled_window, p_camelcounter->vbox, 2, titles); error_string=register_tap_listener("CAMEL", p_camelcounter, filter, 0, - gtk_camelcounter_reset, - gtk_camelcounter_packet, - gtk_camelcounter_draw); + gtk_camelcounter_reset, + gtk_camelcounter_packet, + gtk_camelcounter_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); @@ -221,6 +221,19 @@ void /* Next line mandatory */ register_tap_listener_gtk_camelcounter(void) { register_param_stat(&camel_counter_dlg, "CAMEL Messages and Response Status", - REGISTER_STAT_GROUP_TELEPHONY_GSM); + REGISTER_STAT_GROUP_TELEPHONY_GSM); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index 2513c25636..2b027d424f 100644 --- a/ui/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.c @@ -51,9 +51,9 @@ struct camelsrt_t { static void camelsrt_set_title(struct camelsrt_t * p_camelsrt); static void camelsrt_reset(void *phs); static int camelsrt_packet(void *phs, - packet_info *pinfo _U_, - epan_dissect_t *edt _U_, - const void *phi); + packet_info *pinfo _U_, + epan_dissect_t *edt _U_, + const void *phi); static void camelsrt_draw(void *phs); static void win_destroy_cb(GtkWindow *win _U_, gpointer data); @@ -81,9 +81,9 @@ static void camelsrt_reset(void *phs) * Then, if the measurement is provided, check if it is valid, and update the table */ static int camelsrt_packet(void *phs, - packet_info *pinfo _U_, - epan_dissect_t *edt _U_, - const void *phi) + packet_info *pinfo _U_, + epan_dissect_t *edt _U_, + const void *phi) { struct camelsrt_t *hs=(struct camelsrt_t *)phs; const struct camelsrt_info_t * pi=(const struct camelsrt_info_t *)phi; @@ -91,9 +91,9 @@ static int camelsrt_packet(void *phs, for (i=1; i<NB_CAMELSRT_CATEGORY; i++) { if ( pi->bool_msginfo[i] && - pi->msginfo[i].is_delta_time - && pi->msginfo[i].request_available - && !pi->msginfo[i].is_duplicate ) { + pi->msginfo[i].is_delta_time + && pi->msginfo[i].request_available + && !pi->msginfo[i].is_duplicate ) { add_srt_table_data(&hs->camel_srt_table, i, &pi->msginfo[i].req_time, pinfo); @@ -182,12 +182,12 @@ static void gtk_camelsrt_init(const char *opt_arg, void *userdata _U_) } error_string=register_tap_listener("CAMEL", - p_camelsrt, - filter, - 0, - camelsrt_reset, - camelsrt_packet, - camelsrt_draw); + p_camelsrt, + filter, + 0, + camelsrt_reset, + camelsrt_packet, + camelsrt_draw); if(error_string){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); @@ -230,5 +230,18 @@ void /* Next line mandatory */ register_tap_listener_gtk_camelsrt(void) { register_param_stat(&camel_srt_dlg, "CAMEL", - REGISTER_STAT_GROUP_RESPONSE_TIME); + REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c index d22ad07652..63158944f2 100644 --- a/ui/gtk/capture_info_dlg.c +++ b/ui/gtk/capture_info_dlg.c @@ -373,3 +373,16 @@ capture_info *cinfo) #endif /* HAVE_LIBPCAP */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/color_utils.c b/ui/gtk/color_utils.c index ab762be64b..73a98163e3 100644 --- a/ui/gtk/color_utils.c +++ b/ui/gtk/color_utils.c @@ -164,3 +164,15 @@ gdkRGBAcolor_to_GdkColor(GdkColor *target, const GdkRGBA *source) target->blue = (guint16)(source->blue*65535); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index a674464d73..099c2133d7 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -517,7 +517,7 @@ void gtk_dcerpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) GtkWidget *vers_label, *vers_combo_box; GtkWidget *filter_box, *filter_bt; GtkWidget *bbox, *start_button, *cancel_button; - GtkCellRenderer *cell_renderer; + GtkCellRenderer *cell_renderer; #if 0 GtkTreeIter program_first_item_iter; #endif @@ -565,17 +565,17 @@ void gtk_dcerpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) (to show the children) but is "insensitive": ie: cannot be selected. (dcerpcstat_add_program_to_menu() does the actual work to add entries to the combo box). - XXX: A simpler alternative might be to just do away with all the two-level - complexity and just use a standard ws_combo_box... even though the - list of "program names" is quite large. - XXX: The gtkrc file distributed with Windows Wireshark has the - "appears-as-list" GtkComboBox style property set to 1 and thus - on Windows the entries for this combo box will appear as a tree-view. - The default is 0(FALSE). In this case the the combo box entries will - display as a menu with sub-menus. - A possibility would be to set "appears-as-list" to 0 just for this - particular combo box on Windows so that the entries will appear as a - menu even on Windows). + XXX: A simpler alternative might be to just do away with all the two-level + complexity and just use a standard ws_combo_box... even though the + list of "program names" is quite large. + XXX: The gtkrc file distributed with Windows Wireshark has the + "appears-as-list" GtkComboBox style property set to 1 and thus + on Windows the entries for this combo box will appear as a tree-view. + The default is 0(FALSE). In this case the the combo box entries will + display as a menu with sub-menus. + A possibility would be to set "appears-as-list" to 0 just for this + particular combo box on Windows so that the entries will appear as a + menu even on Windows). */ prog_combo_box = ws_combo_box_new_text_and_pointer_full(&cell_renderer); { @@ -725,3 +725,16 @@ register_tap_listener_gtkdcerpcstat(void) { register_stat_tap_ui(&dcerpcstat_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index e63ca6a6ee..b97194f793 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -74,9 +74,9 @@ * to the row of the table as additional information. */ #define E_LIST_S_PROTO_NAME 0 -#define E_LIST_S_TABLE 1 +#define E_LIST_S_TABLE 1 /* The following is for debugging in decode_add_to_list */ -#define E_LIST_S_MAX E_LIST_S_TABLE +#define E_LIST_S_MAX E_LIST_S_TABLE #define E_LIST_S_COLUMNS (E_LIST_S_MAX + 1) #define E_PAGE_LIST "notebook_page_list" @@ -135,10 +135,10 @@ enum action_type requested_action = (enum action_type)-1; * Data structure to hold information of the "Decode As" entry. */ struct da_entry { - gchar *table; - guint selector; - gchar *initial; - gchar *current; + gchar *table; + guint selector; + gchar *initial; + gchar *current; }; /* @@ -157,10 +157,10 @@ GSList *da_entries = NULL; static void free_da_entry(gpointer item, gpointer user_data _U_) { - da_entry_t *entry = (da_entry_t *)item; - g_free(entry->table); - g_free(entry->initial); - g_free(entry->current); + da_entry_t *entry = (da_entry_t *)item; + g_free(entry->table); + g_free(entry->initial); + g_free(entry->current); } @@ -440,7 +440,7 @@ decode_show_destroy_cb (GtkWidget *win _U_, gpointer user_data _U_) static void decode_show_save_cb (GtkWidget *win _U_, gpointer user_data _U_) { - save_decode_as_entries(); + save_decode_as_entries(); } /* add a single binding to the Show list */ @@ -590,11 +590,11 @@ decode_show_cb (GtkWidget *w _U_, gpointer user_data _U_) static void decode_debug (GtkTreeView *tree_view, gchar *leadin) { - GtkListStore *store; - GtkTreeSelection *selection; - GtkTreeIter iter; - char *string, *text[E_LIST_S_COLUMNS]; - dissector_handle_t handle; + GtkListStore *store; + GtkTreeSelection *selection; + GtkTreeIter iter; + char *string, *text[E_LIST_S_COLUMNS]; + dissector_handle_t handle; selection = gtk_tree_view_get_selection(tree_view); @@ -630,17 +630,17 @@ decode_debug (GtkTreeView *tree_view, gchar *leadin) static void decode_simple (GtkWidget *notebook_pg) { - GtkWidget *list, *combo_box; - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - decode_as_t *entry; - gchar *table_name, *abbrev; - dissector_handle_t handle; - guint value_loop, *selector_type; - gpointer ptr, value_ptr; - gint requested_index = 0; - gboolean add_reset_list = FALSE; + GtkWidget *list, *combo_box; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + decode_as_t *entry; + gchar *table_name, *abbrev; + dissector_handle_t handle; + guint value_loop, *selector_type; + gpointer ptr, value_ptr; + gint requested_index = 0; + gboolean add_reset_list = FALSE; list = (GtkWidget *)g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_LIST); if (requested_action == E_DECODE_NO) @@ -709,9 +709,9 @@ decode_simple (GtkWidget *notebook_pg) static void decode_ok_cb (GtkWidget *ok_bt _U_, gpointer parent_w) { - GtkWidget *notebook, *notebook_pg; - void (* func)(GtkWidget *); - gint page_num; + GtkWidget *notebook, *notebook_pg; + void (* func)(GtkWidget *); + gint page_num; decode_as_t *entry; /* Call the right routine for the page that was currently in front. */ @@ -873,8 +873,8 @@ decode_clear_cb(GtkWidget *clear_bt _U_, gpointer user_data _U_) static void decode_update_action (GtkWidget *w _U_, gpointer user_data) { - GSList *tmp; - gboolean enable; + GSList *tmp; + gboolean enable; requested_action = (enum action_type)GPOINTER_TO_INT(user_data); enable = (requested_action == E_DECODE_YES); @@ -1021,7 +1021,7 @@ lookup_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter, static void decode_add_to_list (const gchar *table_name, const gchar *proto_name, gpointer value, gpointer user_data) { - const gchar *text[E_LIST_S_COLUMNS]; + const gchar *text[E_LIST_S_COLUMNS]; GtkTreeView *list; GtkListStore *store; GtkTreeIter iter; @@ -1052,25 +1052,25 @@ decode_add_to_list (const gchar *table_name, const gchar *proto_name, gpointer v static gboolean decode_list_button_press_cb(GtkWidget *list, GdkEventButton *event, gpointer user_data _U_) { - if (event->type == GDK_2BUTTON_PRESS) { - GtkWidget *main_w = gtk_widget_get_toplevel(list); + if (event->type == GDK_2BUTTON_PRESS) { + GtkWidget *main_w = gtk_widget_get_toplevel(list); - decode_ok_cb (NULL, main_w); - } + decode_ok_cb (NULL, main_w); + } - return FALSE; + return FALSE; } static gboolean decode_list_key_release_cb(GtkWidget *list, GdkEventKey *event, gpointer user_data _U_) { - if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) { - GtkWidget *main_w = gtk_widget_get_toplevel(list); + if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) { + GtkWidget *main_w = gtk_widget_get_toplevel(list); - decode_ok_cb (NULL, main_w); - } + decode_ok_cb (NULL, main_w); + } - return FALSE; + return FALSE; } /* @@ -1254,12 +1254,12 @@ decode_add_simple_page (decode_as_t *entry) gboolean decode_as_ok(void) { - wmem_list_frame_t * protos = wmem_list_head(cfile.edt->pi.layers); - int proto_id; - const char* proto_name; - GList *list_entry; - decode_as_t *entry; - dissector_table_t sub_dissectors; + wmem_list_frame_t *protos = wmem_list_head(cfile.edt->pi.layers); + int proto_id; + const char* proto_name; + GList *list_entry; + decode_as_t *entry; + dissector_table_t sub_dissectors; while (protos != NULL) { @@ -1297,13 +1297,13 @@ decode_as_ok(void) static void decode_add_notebook (GtkWidget *format_hb) { - GtkWidget *notebook, *page, *label; - wmem_list_frame_t * protos = wmem_list_head(cfile.edt->pi.layers); - int proto_id; - const char* proto_name; - GList *list_entry; - decode_as_t *entry; - dissector_table_t sub_dissectors; + GtkWidget *notebook, *page, *label; + wmem_list_frame_t *protos = wmem_list_head(cfile.edt->pi.layers); + int proto_id; + const char* proto_name; + GList *list_entry; + decode_as_t *entry; + dissector_table_t sub_dissectors; /* Start a nootbook for flipping between sets of changes */ notebook = gtk_notebook_new(); @@ -1390,14 +1390,14 @@ decode_as_cb (GtkWidget * w _U_, gpointer user_data _U_) g_signal_connect(button, "clicked", G_CALLBACK(decode_show_cb), NULL); gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end(GTK_BOX(button_vb), button, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(button, "Open a dialog showing the current settings.\n" - "Note you need to select and press apply first to be able to save the current setting"); + gtk_widget_set_tooltip_text(button, "Open a dialog showing the current settings.\n" + "Note you need to select and press apply first to be able to save the current setting"); button = ws_gtk_button_new_from_stock(GTK_STOCK_CLEAR); g_signal_connect(button, "clicked", G_CALLBACK(decode_clear_cb), NULL); gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end(GTK_BOX(button_vb), button, FALSE, FALSE, 0); - gtk_widget_set_tooltip_text(button, "Clear ALL settings."); + gtk_widget_set_tooltip_text(button, "Clear ALL settings."); decode_add_notebook(format_hb); @@ -1408,16 +1408,16 @@ decode_as_cb (GtkWidget * w _U_, gpointer user_data _U_) ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(ok_bt, "clicked", G_CALLBACK(decode_ok_cb), decode_w); - gtk_widget_set_tooltip_text(ok_bt, "Apply current setting, close dialog and redissect packets."); + gtk_widget_set_tooltip_text(ok_bt, "Apply current setting, close dialog and redissect packets."); apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); g_signal_connect(apply_bt, "clicked", G_CALLBACK(decode_apply_cb), decode_w); - gtk_widget_set_tooltip_text(apply_bt, "Apply current setting, redissect packets and keep dialog open."); + gtk_widget_set_tooltip_text(apply_bt, "Apply current setting, redissect packets and keep dialog open."); close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(decode_w, close_bt, NULL); g_signal_connect(close_bt, "clicked", G_CALLBACK(decode_close_cb), decode_w); - gtk_widget_set_tooltip_text(close_bt, "Close the dialog, don't redissect packets."); + gtk_widget_set_tooltip_text(close_bt, "Close the dialog, don't redissect packets."); help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_DECODE_AS_DIALOG); @@ -1430,3 +1430,16 @@ decode_as_cb (GtkWidget * w _U_, gpointer user_data _U_) gtk_widget_show_all(decode_w); window_present(decode_w); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c index 4256090b3c..16ca3cabc4 100644 --- a/ui/gtk/dfilter_expr_dlg.c +++ b/ui/gtk/dfilter_expr_dlg.c @@ -29,9 +29,9 @@ /* Todo - * may want to check the enable field to decide if protocol should be in tree * improve speed of dialog box creation - * - I believe this is slow because of tree widget creation. - * 1) could improve the widget - * 2) keep a copy in memory after the first time. + * - I believe this is slow because of tree widget creation. + * 1) could improve the widget + * 2) keep a copy in memory after the first time. * user can pop multiple tree dialogs by pressing the "Tree" button multiple * times. not a good thing. * Sort the protocols and children @@ -52,18 +52,18 @@ #include "ui/gtk/proto_hier_tree_model.h" -#define E_DFILTER_EXPR_TREE_KEY "dfilter_expr_tree" -#define E_DFILTER_EXPR_CURRENT_VAR_KEY "dfilter_expr_current_var" -#define E_DFILTER_EXPR_RELATION_LIST_KEY "dfilter_expr_relation_list" -#define E_DFILTER_EXPR_RANGE_LABEL_KEY "dfilter_expr_range_label" -#define E_DFILTER_EXPR_RANGE_ENTRY_KEY "dfilter_expr_range_entry" -#define E_DFILTER_EXPR_VALUE_LABEL_KEY "dfilter_expr_value_label" -#define E_DFILTER_EXPR_VALUE_ENTRY_KEY "dfilter_expr_value_entry" -#define E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY "dfilter_expr_value_list_label" -#define E_DFILTER_EXPR_VALUE_LIST_KEY "dfilter_expr_value_list" -#define E_DFILTER_EXPR_VALUE_LIST_SW_KEY "dfilter_expr_value_list_sw" -#define E_DFILTER_EXPR_OK_BT_KEY "dfilter_expr_accept_bt" -#define E_DFILTER_EXPR_VALUE_KEY "dfilter_expr_value" +#define E_DFILTER_EXPR_TREE_KEY "dfilter_expr_tree" +#define E_DFILTER_EXPR_CURRENT_VAR_KEY "dfilter_expr_current_var" +#define E_DFILTER_EXPR_RELATION_LIST_KEY "dfilter_expr_relation_list" +#define E_DFILTER_EXPR_RANGE_LABEL_KEY "dfilter_expr_range_label" +#define E_DFILTER_EXPR_RANGE_ENTRY_KEY "dfilter_expr_range_entry" +#define E_DFILTER_EXPR_VALUE_LABEL_KEY "dfilter_expr_value_label" +#define E_DFILTER_EXPR_VALUE_ENTRY_KEY "dfilter_expr_value_entry" +#define E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY "dfilter_expr_value_list_label" +#define E_DFILTER_EXPR_VALUE_LIST_KEY "dfilter_expr_value_list" +#define E_DFILTER_EXPR_VALUE_LIST_SW_KEY "dfilter_expr_value_list_sw" +#define E_DFILTER_EXPR_OK_BT_KEY "dfilter_expr_accept_bt" +#define E_DFILTER_EXPR_VALUE_KEY "dfilter_expr_value" static void show_relations(GtkWidget *relation_list, ftenum_t ftype); static gboolean relation_is_presence_test(const char *string); @@ -181,7 +181,7 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer tree) * If this has a value_string table (not a range_string table) associated with it, * fill up the list of values, otherwise clear the list of values. */ - /* XXX: ToDo: Implement "range-string" filter ? */ + /* XXX: ToDo: Implement "range-string" filter ? */ if ((hfinfo->strings != NULL) && ! (hfinfo->display & BASE_RANGE_STRING) && ! (hfinfo->display & BASE_VAL64_STRING) && @@ -219,36 +219,36 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer tree) static void show_relations(GtkWidget *relation_list, ftenum_t ftype) { - GtkTreeIter iter; - /* - * Clear out the currently displayed list of relations. - */ - gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(relation_list)))); - - /* - * Add the supported relations. - */ - add_relation_list(relation_list, "is present", TRUE); - add_relation_list(relation_list, "==", - ftype_can_eq(ftype) || (ftype_can_slice(ftype) && ftype_can_eq(FT_BYTES))); - add_relation_list(relation_list, "!=", - ftype_can_ne(ftype) || (ftype_can_slice(ftype) && ftype_can_ne(FT_BYTES))); - add_relation_list(relation_list, ">", - ftype_can_gt(ftype) || (ftype_can_slice(ftype) && ftype_can_gt(FT_BYTES))); - - add_relation_list(relation_list, "<", - ftype_can_lt(ftype) || (ftype_can_slice(ftype) && ftype_can_lt(FT_BYTES))); - add_relation_list(relation_list, ">=", - ftype_can_ge(ftype) || (ftype_can_slice(ftype) && ftype_can_ge(FT_BYTES))); - add_relation_list(relation_list, "<=", - ftype_can_le(ftype) || (ftype_can_slice(ftype) && ftype_can_le(FT_BYTES))); - add_relation_list(relation_list, "contains", - ftype_can_contains(ftype) || (ftype_can_slice(ftype) && ftype_can_contains(FT_BYTES))); - add_relation_list(relation_list, "matches", - ftype_can_matches(ftype) || (ftype_can_slice(ftype) && ftype_can_matches(FT_BYTES))); - - gtk_tree_model_get_iter_first(gtk_tree_view_get_model(GTK_TREE_VIEW(relation_list)), &iter); - gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list)), &iter); + GtkTreeIter iter; + /* + * Clear out the currently displayed list of relations. + */ + gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(relation_list)))); + + /* + * Add the supported relations. + */ + add_relation_list(relation_list, "is present", TRUE); + add_relation_list(relation_list, "==", + ftype_can_eq(ftype) || (ftype_can_slice(ftype) && ftype_can_eq(FT_BYTES))); + add_relation_list(relation_list, "!=", + ftype_can_ne(ftype) || (ftype_can_slice(ftype) && ftype_can_ne(FT_BYTES))); + add_relation_list(relation_list, ">", + ftype_can_gt(ftype) || (ftype_can_slice(ftype) && ftype_can_gt(FT_BYTES))); + + add_relation_list(relation_list, "<", + ftype_can_lt(ftype) || (ftype_can_slice(ftype) && ftype_can_lt(FT_BYTES))); + add_relation_list(relation_list, ">=", + ftype_can_ge(ftype) || (ftype_can_slice(ftype) && ftype_can_ge(FT_BYTES))); + add_relation_list(relation_list, "<=", + ftype_can_le(ftype) || (ftype_can_slice(ftype) && ftype_can_le(FT_BYTES))); + add_relation_list(relation_list, "contains", + ftype_can_contains(ftype) || (ftype_can_slice(ftype) && ftype_can_contains(FT_BYTES))); + add_relation_list(relation_list, "matches", + ftype_can_matches(ftype) || (ftype_can_slice(ftype) && ftype_can_matches(FT_BYTES))); + + gtk_tree_model_get_iter_first(gtk_tree_view_get_model(GTK_TREE_VIEW(relation_list)), &iter); + gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list)), &iter); } /* @@ -258,7 +258,7 @@ show_relations(GtkWidget *relation_list, ftenum_t ftype) static gboolean relation_is_presence_test(const char *string) { - return (strcmp(string, "is present") == 0); + return (strcmp(string, "is present") == 0); } static void @@ -420,85 +420,85 @@ display_value_fields(header_field_info *hfinfo, gboolean is_comparison, GtkWidget *value_list_scrolled_win, GtkWidget *range_label, GtkWidget *range_entry) { - /* Default values */ - gboolean show_value_label = FALSE; - gboolean show_value_list = FALSE; - gboolean show_range = FALSE; - - /* - * Either: - * - * this is an FT_NONE variable, in which case you can - * only check whether it's present or absent in the - * protocol tree - * - * or - * - * this is a Boolean variable, in which case you - * can't specify a value to compare with, you can - * only specify whether to test for the Boolean - * being true or to test for it being false - * - * or - * - * this isn't a Boolean variable, in which case you - * can test for its presence in the protocol tree, - * and the relation is such a test, in - * which case you don't compare with a value - * - * so we hide the value entry. - */ - - switch (hfinfo->type) { - - case FT_BOOLEAN: - if (is_comparison) { - show_value_label = TRUE; /* XXX: Allow value entry (contrary to the comment above) ?? */ - show_value_list = TRUE; - } - break; - - case FT_UINT8: - case FT_UINT16: - case FT_UINT24: - case FT_UINT32: - case FT_INT8: - case FT_INT16: - case FT_INT24: - case FT_INT32: - if (is_comparison) { - show_value_label = TRUE; - if ((hfinfo->strings != NULL) && !(hfinfo->display & BASE_RANGE_STRING)) { - /* - * We have a list of values to show. - */ - show_value_list = TRUE; - } - } - break; - - default: - /* - * There is no list of names for values; only show the value_label if needed. - */ - if (is_comparison) - show_value_label = TRUE; - break; - } - - gtk_widget_set_sensitive(value_label, show_value_label); - gtk_widget_set_sensitive(value_entry, show_value_label); - - gtk_widget_set_sensitive(value_list_label, show_value_list); - gtk_widget_set_sensitive(value_list_scrolled_win, show_value_list); - - /* - * Is this a comparison, and are ranges supported by this type? - * If both are true, show the range stuff, otherwise hide it. - */ - show_range = (is_comparison && ftype_can_slice(hfinfo->type)); - gtk_widget_set_sensitive(range_label, show_range); - gtk_widget_set_sensitive(range_entry, show_range); + /* Default values */ + gboolean show_value_label = FALSE; + gboolean show_value_list = FALSE; + gboolean show_range = FALSE; + + /* + * Either: + * + * this is an FT_NONE variable, in which case you can + * only check whether it's present or absent in the + * protocol tree + * + * or + * + * this is a Boolean variable, in which case you + * can't specify a value to compare with, you can + * only specify whether to test for the Boolean + * being true or to test for it being false + * + * or + * + * this isn't a Boolean variable, in which case you + * can test for its presence in the protocol tree, + * and the relation is such a test, in + * which case you don't compare with a value + * + * so we hide the value entry. + */ + + switch (hfinfo->type) { + + case FT_BOOLEAN: + if (is_comparison) { + show_value_label = TRUE; /* XXX: Allow value entry (contrary to the comment above) ?? */ + show_value_list = TRUE; + } + break; + + case FT_UINT8: + case FT_UINT16: + case FT_UINT24: + case FT_UINT32: + case FT_INT8: + case FT_INT16: + case FT_INT24: + case FT_INT32: + if (is_comparison) { + show_value_label = TRUE; + if ((hfinfo->strings != NULL) && !(hfinfo->display & BASE_RANGE_STRING)) { + /* + * We have a list of values to show. + */ + show_value_list = TRUE; + } + } + break; + + default: + /* + * There is no list of names for values; only show the value_label if needed. + */ + if (is_comparison) + show_value_label = TRUE; + break; + } + + gtk_widget_set_sensitive(value_label, show_value_label); + gtk_widget_set_sensitive(value_entry, show_value_label); + + gtk_widget_set_sensitive(value_list_label, show_value_list); + gtk_widget_set_sensitive(value_list_scrolled_win, show_value_list); + + /* + * Is this a comparison, and are ranges supported by this type? + * If both are true, show the range stuff, otherwise hide it. + */ + show_range = (is_comparison && ftype_can_slice(hfinfo->type)); + gtk_widget_set_sensitive(range_label, show_range); + gtk_widget_set_sensitive(range_entry, show_range); } static void @@ -529,9 +529,9 @@ value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg) * testing for "false". */ if (value != NULL) - value_display_string = g_strdup("1"); + value_display_string = g_strdup("1"); else - value_display_string = g_strdup("0"); + value_display_string = g_strdup("0"); } else { /* * Numeric type; get the value corresponding to the @@ -685,7 +685,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) else if (strcmp(item_str, "matches") == 0) can_compare = ftype_can_matches(ftype); else - can_compare = TRUE; /* not a comparison */ + can_compare = TRUE; /* not a comparison */ if (!can_compare) { if (range_str == NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, @@ -729,14 +729,14 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) * for the type of the field; if a range string was * specified, must be valid for FT_BYTES. */ - if (strcmp(item_str, "contains") == 0) { + if (strcmp(item_str, "contains") == 0) { fvalue = fvalue_from_unparsed(ftype, stripped_value_str, TRUE, &err_msg); - } - else { + } + else { fvalue = fvalue_from_unparsed(ftype, stripped_value_str, FALSE, &err_msg); - } + } if (fvalue == NULL) { /* * It's not valid. @@ -846,10 +846,10 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) static void dfilter_expr_dlg_cancel_cb(GtkWidget *w _U_, gpointer parent_w) { - /* - * User pressed the cancel button; close the dialog box. - */ - window_destroy(GTK_WIDGET(parent_w)); + /* + * User pressed the cancel button; close the dialog box. + */ + window_destroy(GTK_WIDGET(parent_w)); } /* Treat this as a cancel, by calling "prefs_main_cancel_cb()" */ @@ -857,20 +857,20 @@ static gboolean dfilter_expr_dlg_delete_event_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer parent_w) { - dfilter_expr_dlg_cancel_cb(NULL, parent_w); - return FALSE; + dfilter_expr_dlg_cancel_cb(NULL, parent_w); + return FALSE; } static void dfilter_expr_dlg_destroy_cb(GtkWidget *w, gpointer filter_te) { - /* - * The dialog box is being destroyed; disconnect from the - * "destroy" signal on the text entry box to which we're - * attached, as the handler for that signal is supposed - * to destroy us, but we're already gone. - */ - g_signal_handlers_disconnect_by_func(filter_te, dfilter_expr_dlg_cancel_cb, w); + /* + * The dialog box is being destroyed; disconnect from the + * "destroy" signal on the text entry box to which we're + * attached, as the handler for that signal is supposed + * to destroy us, but we're already gone. + */ + g_signal_handlers_disconnect_by_func(filter_te, dfilter_expr_dlg_cancel_cb, w); } GtkWidget * @@ -899,7 +899,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) GtkListStore *l_store; GtkTreeSelection *l_sel; - proto_initialize_all_prefixes(); + proto_initialize_all_prefixes(); window = dlg_conf_window_new("Wireshark: Filter Expression"); gtk_window_set_default_size(GTK_WINDOW(window), 500, 400); @@ -1146,3 +1146,16 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) return window; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index 25a4d2170d..44dc3e90a1 100644 --- a/ui/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.c @@ -227,3 +227,16 @@ register_tap_listener_gtkdiameterstat(void) register_param_stat(&diameter_stat_dlg, "Diameter", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index 7522caa3ff..7422000a66 100644 --- a/ui/gtk/dlg_utils.c +++ b/ui/gtk/dlg_utils.c @@ -550,3 +550,15 @@ dlg_activate (GtkWidget *widget _U_, gpointer ok_button) gtk_widget_activate(GTK_WIDGET(ok_button)); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index 8eb27ebf54..1432f5a662 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -332,4 +332,15 @@ dnd_init(GtkWidget *w) #endif } - +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c index 01f14d1bba..d0d6090c03 100644 --- a/ui/gtk/edit_packet_comment_dlg.c +++ b/ui/gtk/edit_packet_comment_dlg.c @@ -251,3 +251,16 @@ edit_capture_comment_dlg_hide(void) { window_destroy(edit_or_add_capture_comment_dlg); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 7b22a05620..d4b6d89ac9 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -1024,3 +1024,16 @@ expert_comp_packet_comment_updated(void) if (expert_comp_dlg_w) cf_retap_packets(&cfile); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 3f5e73e020..82313eb359 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -271,7 +271,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call case ACTION_MATCH: gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str); main_filter_packets(&cfile, str, FALSE); - gdk_window_raise(gtk_widget_get_window(top_level)); + gdk_window_raise(gtk_widget_get_window(top_level)); break; case ACTION_PREPARE: gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str); @@ -520,49 +520,49 @@ static const char *ui_desc_expert_filter_popup = * const gchar *tooltip; * GCallback callback; * } GtkActionEntry; - * const gchar *name; The name of the action. - * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. - * const gchar *label; The label for the action. This field should typically be marked for translation, - * see gtk_action_group_set_translation_domain(). - * If label is NULL, the label of the stock item with id stock_id is used. - * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). - * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * const gchar *name; The name of the action. + * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. + * const gchar *label; The label for the action. This field should typically be marked for translation, * see gtk_action_group_set_translation_domain(). - * GCallback callback; The function to call when the action is activated. + * If label is NULL, the label of the stock item with id stock_id is used. + * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). + * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * see gtk_action_group_set_translation_domain(). + * GCallback callback; The function to call when the action is activated. * */ static const GtkActionEntry expert_popup_entries[] = { - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, - { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, - { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(apply_as_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, - { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(prep_as_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, - { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, - { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, - { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, - { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, - { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, - { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, - { "/Colorize Procedure/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(color_selected_cb) }, - { "/Colorize Procedure/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(color_not_selected_cb) }, - { "/Internet Search", WIRESHARK_STOCK_INTERNET, "Internet Search", NULL, "Internet Search", NULL }, - { "/For Info Text", NULL, "For Info Text", NULL, "For Info Text", G_CALLBACK(internet_search_cb) }, - { "/Copy", NULL, "Copy", NULL, "Copy", NULL }, - { "/Copy/Protocol Plus Summary", NULL, "Protocol Plus Summary", NULL, "Protocol Plus Summary", G_CALLBACK(copy_cb) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, + { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, + { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, + { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(apply_as_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, + { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(prep_as_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, + { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, + { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, + { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, + { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, + { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, + { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, + { "/Colorize Procedure/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(color_selected_cb) }, + { "/Colorize Procedure/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(color_not_selected_cb) }, + { "/Internet Search", WIRESHARK_STOCK_INTERNET, "Internet Search", NULL, "Internet Search", NULL }, + { "/For Info Text", NULL, "For Info Text", NULL, "For Info Text", G_CALLBACK(internet_search_cb) }, + { "/Copy", NULL, "Copy", NULL, "Copy", NULL }, + { "/Copy/Protocol Plus Summary", NULL, "Protocol Plus Summary", NULL, "Protocol Plus Summary", G_CALLBACK(copy_cb) }, }; int gselection_count = 0; @@ -656,7 +656,7 @@ init_error_table(error_equiv_table *err, guint num_procs, GtkWidget *vbox) /* Create the first column, associating the "text" attribute of the * cell_renderer to the first column of the model - */ + */ column = gtk_tree_view_column_new_with_attributes ("Group", renderer, NULL); gtk_tree_view_column_set_sort_column_id(column, GROUP_COLUMN); gtk_tree_view_column_set_resizable(column, TRUE); @@ -852,3 +852,16 @@ free_error_table_data(error_equiv_table *err) g_string_chunk_free(err->text); g_array_free(err->procs_array, TRUE); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/export_object_dlg.c b/ui/gtk/export_object_dlg.c index c29bdcdd49..ed19775a6d 100644 --- a/ui/gtk/export_object_dlg.c +++ b/ui/gtk/export_object_dlg.c @@ -477,7 +477,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_widget_show(bbox); /* Setup cancel/delete/destroy signal handlers */ - g_signal_connect(object_list->dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(object_list->dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); g_signal_connect(object_list->dlg, "destroy", G_CALLBACK(eo_win_destroy_cb), object_list); window_set_cancel_button(object_list->dlg, cancel_bt, @@ -515,3 +515,16 @@ eo_tftp_cb(GtkWidget *widget _U_, gpointer data _U_) /* Call the export_object window */ export_object_window("tftp_eo", "TFTP", eo_tftp_packet, eo_tftp_cleanup); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c index 6a7c7f7a5e..34873fd6d3 100644 --- a/ui/gtk/export_sslkeys.c +++ b/ui/gtk/export_sslkeys.c @@ -116,9 +116,9 @@ static char * gtk_export_sslkeys_file(guint keylist_len) { GtkWidget *savesslkeys_dlg; - gchar *label; + gchar *label; GtkWidget *dlg_lb; - char *pathname; + char *pathname; /* * Build the dialog box we need. @@ -150,8 +150,8 @@ gtk_export_sslkeys_file(guint keylist_len) void savesslkeys_cb(GtkWidget * w _U_, gpointer data _U_) { - char *pathname; - guint keylist_len; + char *pathname; + guint keylist_len; gchar *keylist; keylist_len = ssl_session_key_count(); @@ -186,3 +186,16 @@ savesslkeys_cb(GtkWidget * w _U_, gpointer data _U_) } } #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index ec5f70cf6a..0be421ef48 100644 --- a/ui/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.c @@ -205,3 +205,16 @@ register_tap_listener_gtkfcstat(void) register_param_stat(&fc_stat_dlg, "Fibre Channel", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c index ea5e0caabb..bb3c2a7752 100644 --- a/ui/gtk/file_dlg.c +++ b/ui/gtk/file_dlg.c @@ -477,3 +477,16 @@ get_last_open_dir(void) { return last_open_dir; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index 60bc756b4b..96893fa82e 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -398,3 +398,16 @@ fileset_file_closed(void) fileset_get_previous() != NULL, fileset_get_next() != NULL ); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c index c69879da7e..b7ecf36b91 100644 --- a/ui/gtk/filter_autocomplete.c +++ b/ui/gtk/filter_autocomplete.c @@ -876,3 +876,16 @@ filter_parent_dlg_key_pressed_cb(GtkWidget *win, GdkEventKey *event, gpointer us return FALSE; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index 80f0489d79..d41f563a8b 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -345,3 +345,16 @@ filter_save_frame_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) /* Note that we no longer have a "Filter Save" dialog box. */ filter_save_frame_w = NULL; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/filter_utils.c b/ui/gtk/filter_utils.c index e97d7d6880..3e270eb7b3 100644 --- a/ui/gtk/filter_utils.c +++ b/ui/gtk/filter_utils.c @@ -100,3 +100,16 @@ apply_selected_filter (guint callback_action, const char *filter) } g_free (str); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index 7a128e552d..1d3c7b59a5 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.c @@ -376,8 +376,8 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) void find_frame_with_filter(char *filter) { - find_frame_cb(NULL, NULL); - gtk_entry_set_text(GTK_ENTRY(filter_text_box), filter); + find_frame_cb(NULL, NULL); + gtk_entry_set_text(GTK_ENTRY(filter_text_box), filter); } /* @@ -439,23 +439,23 @@ find_filter_te_syntax_check_cb(GtkWidget *w, gpointer parent_w) static void hex_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { - GtkWidget *filter_tb, *hex_rb, *filter_entry; + GtkWidget *filter_tb, *hex_rb, *filter_entry; - filter_tb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); - hex_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_HEXDATA_KEY); + filter_tb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); + hex_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_HEXDATA_KEY); - filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); - gtk_widget_grab_focus(filter_entry); + filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); + gtk_widget_grab_focus(filter_entry); - /* Disable AutoCompletion feature */ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hex_rb)) && g_signal_handler_is_connected(filter_tb, te_presskey_handler_id)) { - g_signal_handler_disconnect(filter_tb, te_presskey_handler_id); - g_signal_handler_disconnect(parent_w, win_presskey_handler_id); - } + /* Disable AutoCompletion feature */ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hex_rb)) && g_signal_handler_is_connected(filter_tb, te_presskey_handler_id)) { + g_signal_handler_disconnect(filter_tb, te_presskey_handler_id); + g_signal_handler_disconnect(parent_w, win_presskey_handler_id); + } - /* Re-check the display filter. */ - find_filter_te_syntax_check_cb(filter_tb, parent_w); - return; + /* Re-check the display filter. */ + find_filter_te_syntax_check_cb(filter_tb, parent_w); + return; } /* @@ -465,47 +465,47 @@ hex_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) static void string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { - GtkWidget *string_rb, *packet_data_rb, *decode_data_rb, *summary_data_rb, - *data_combo_lb, *data_combo_cb, *data_case_cb, *filter_tb, *filter_entry; - - string_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGDATA_KEY); - packet_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_DATA_KEY); - decode_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_DECODE_KEY); - summary_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_SUMMARY_KEY); - - data_combo_lb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGTYPE_LABEL_KEY); - data_combo_cb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGTYPE_KEY); - data_case_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CASE_SEARCH_KEY); - filter_tb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); - - filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); - gtk_widget_grab_focus(filter_entry); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(string_rb))) { - gtk_widget_set_sensitive(GTK_WIDGET(packet_data_rb), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(summary_data_rb), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(data_combo_lb), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(data_combo_cb), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(data_case_cb), TRUE); - - /* Disable AutoCompletion feature */ - if(g_signal_handler_is_connected(filter_tb, te_presskey_handler_id)) { - g_signal_handler_disconnect(filter_tb, te_presskey_handler_id); - g_signal_handler_disconnect(parent_w, win_presskey_handler_id); - } + GtkWidget *string_rb, *packet_data_rb, *decode_data_rb, *summary_data_rb, + *data_combo_lb, *data_combo_cb, *data_case_cb, *filter_tb, *filter_entry; - } else { - gtk_widget_set_sensitive(GTK_WIDGET(packet_data_rb), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(summary_data_rb), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(data_combo_lb), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(data_combo_cb), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(data_case_cb), FALSE); + string_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGDATA_KEY); + packet_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_DATA_KEY); + decode_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_DECODE_KEY); + summary_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_SUMMARY_KEY); + + data_combo_lb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGTYPE_LABEL_KEY); + data_combo_cb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGTYPE_KEY); + data_case_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CASE_SEARCH_KEY); + filter_tb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); + + filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); + gtk_widget_grab_focus(filter_entry); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(string_rb))) { + gtk_widget_set_sensitive(GTK_WIDGET(packet_data_rb), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(summary_data_rb), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(data_combo_lb), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(data_combo_cb), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(data_case_cb), TRUE); + + /* Disable AutoCompletion feature */ + if(g_signal_handler_is_connected(filter_tb, te_presskey_handler_id)) { + g_signal_handler_disconnect(filter_tb, te_presskey_handler_id); + g_signal_handler_disconnect(parent_w, win_presskey_handler_id); } - /* Re-check the display filter. */ - find_filter_te_syntax_check_cb(filter_tb, parent_w); - return; + + } else { + gtk_widget_set_sensitive(GTK_WIDGET(packet_data_rb), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(decode_data_rb), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(summary_data_rb), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(data_combo_lb), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(data_combo_cb), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(data_case_cb), FALSE); + } + /* Re-check the display filter. */ + find_filter_te_syntax_check_cb(filter_tb, parent_w); + return; } /* @@ -515,29 +515,29 @@ string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) static void filter_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { - GtkWidget *filter_bt, *filter_rb, *filter_te, *filter_entry; - - filter_bt = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_BUTTON_KEY); - filter_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_FILTERDATA_KEY); - filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); - - filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); - gtk_widget_grab_focus(filter_entry); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_rb))) - { - gtk_widget_set_sensitive(GTK_WIDGET(filter_bt), TRUE); - /* Enable AutoCompletion feature */ - if(!g_signal_handler_is_connected(filter_te, te_presskey_handler_id)) { - te_presskey_handler_id = g_signal_connect(filter_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL); - win_presskey_handler_id = g_signal_connect(parent_w, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL); - } - } - else - { - gtk_widget_set_sensitive(GTK_WIDGET(filter_bt), FALSE); + GtkWidget *filter_bt, *filter_rb, *filter_te, *filter_entry; + + filter_bt = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_BUTTON_KEY); + filter_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_FILTERDATA_KEY); + filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); + + filter_entry = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),E_FIND_FILT_KEY); + gtk_widget_grab_focus(filter_entry); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_rb))) + { + gtk_widget_set_sensitive(GTK_WIDGET(filter_bt), TRUE); + /* Enable AutoCompletion feature */ + if(!g_signal_handler_is_connected(filter_te, te_presskey_handler_id)) { + te_presskey_handler_id = g_signal_connect(filter_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL); + win_presskey_handler_id = g_signal_connect(parent_w, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL); } - return; + } + else + { + gtk_widget_set_sensitive(GTK_WIDGET(filter_bt), FALSE); + } + return; } static void @@ -554,7 +554,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) gboolean found_packet=FALSE; gboolean hex_search; gboolean string_search; - int string_type; + int string_type; filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_FILT_KEY); up_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_BACKWARD_KEY); @@ -732,10 +732,10 @@ find_previous_next(GtkWidget *w, gpointer d, search_direction dir) if (cfile.hex) { bytes = convert_string_to_hex(cfile.sfilter, &nbytes); if (bytes == NULL) { - /* - * XXX - this shouldn't happen, as we've already successfully - * translated the string once. - */ + /* + * XXX - this shouldn't happen, as we've already successfully + * translated the string once. + */ return; } cf_find_packet_data(&cfile, bytes, nbytes, dir); @@ -756,17 +756,17 @@ find_previous_next(GtkWidget *w, gpointer d, search_direction dir) g_free(string); } else { if (!dfilter_compile(cfile.sfilter, &sfcode, NULL)) { - /* - * XXX - this shouldn't happen, as we've already successfully - * translated the string once. - */ + /* + * XXX - this shouldn't happen, as we've already successfully + * translated the string once. + */ return; } if (sfcode == NULL) { - /* - * XXX - this shouldn't happen, as we've already found that the - * string wasn't null. - */ + /* + * XXX - this shouldn't happen, as we've already found that the + * string wasn't null. + */ return; } cf_find_packet_dfilter(&cfile, sfcode, dir); @@ -787,3 +787,16 @@ find_previous_cb(GtkWidget *w , gpointer d) { find_previous_next(w, d, SD_BACKWARD); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index 20195660e9..93c6bf884e 100644 --- a/ui/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -186,10 +186,10 @@ forget_rule_info(rule_info_t *rule_info) void firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) { - GtkWidget *rule_w, *vbox, *txt_scrollw, *text; + GtkWidget *rule_w, *vbox, *txt_scrollw, *text; GtkWidget *label, *product_combo_box; - GtkWidget *hbox, *button_hbox, *button; - rule_info_t *rule_info; + GtkWidget *hbox, *button_hbox, *button; + rule_info_t *rule_info; packet_info *pinfo = &cfile.edt->pi; guint i; @@ -272,15 +272,15 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) /* Create Copy Button */ button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_COPY); g_signal_connect(button, "clicked", G_CALLBACK(firewall_copy_cmd_cb), rule_info); - gtk_widget_set_tooltip_text(button, "Copy rule to clipboard"); + gtk_widget_set_tooltip_text(button, "Copy rule to clipboard"); /* Create Save Button */ button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_SAVE); g_signal_connect(button, "clicked", G_CALLBACK(firewall_save_as_cmd_cb), rule_info); - gtk_widget_set_tooltip_text(button, "Save the rule as currently displayed"); + gtk_widget_set_tooltip_text(button, "Save the rule as currently displayed"); button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_CANCEL); - gtk_widget_set_tooltip_text(button, "Cancel the dialog"); + gtk_widget_set_tooltip_text(button, "Cancel the dialog"); window_set_cancel_button(rule_w, button, window_cancel_button_cb); button = (GtkWidget *)g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_HELP); @@ -299,7 +299,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(rule_w)); - */ + */ gtk_combo_box_set_active(GTK_COMBO_BOX(product_combo_box), 0); /* invokes select_product callback */ gtk_widget_show_all(rule_w); @@ -319,13 +319,13 @@ static void select_product(GtkWidget *w, gpointer data _U_) { guint prod = gtk_combo_box_get_active(GTK_COMBO_BOX(w)); - rule_info_t *rule_info; + rule_info_t *rule_info; gchar name[MAX_RULE_LEN], addr_str[MAX_RULE_LEN]; address *addr; rule_type_t rule_type = RT_NONE; gboolean sensitive = FALSE; - rule_info =(rule_info_t *)g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY); + rule_info =(rule_info_t *)g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY); if (prod >= NUM_PRODS || !rule_info) return; @@ -399,7 +399,7 @@ static void select_filter(GtkWidget *w, gpointer data _U_) { rule_type_t cur_type; - rule_info_t *rule_info; + rule_info_t *rule_info; gpointer ptr; rule_info = (rule_info_t *)g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY); @@ -424,7 +424,7 @@ select_filter(GtkWidget *w, gpointer data _U_) static void toggle_inbound(GtkToggleButton *t, gpointer data) { - rule_info_t *rule_info = (rule_info_t *) data; + rule_info_t *rule_info = (rule_info_t *) data; rule_info->inbound = gtk_toggle_button_get_active(t); @@ -435,7 +435,7 @@ toggle_inbound(GtkToggleButton *t, gpointer data) static void toggle_deny(GtkToggleButton *t, gpointer data) { - rule_info_t *rule_info = (rule_info_t *) data; + rule_info_t *rule_info = (rule_info_t *) data; rule_info->deny = gtk_toggle_button_get_active(t); @@ -652,7 +652,7 @@ firewall_destroy_cb(GtkWidget *w, gpointer data _U_) static void firewall_copy_cmd_cb(GtkWidget *w _U_, gpointer data) { - rule_info_t *rule_info = (rule_info_t *)data; + rule_info_t *rule_info = (rule_info_t *)data; GtkTextIter start, end; GtkTextBuffer *buf; @@ -667,8 +667,8 @@ firewall_copy_cmd_cb(GtkWidget *w _U_, gpointer data) static gboolean firewall_save_as_ok_cb(char *to_name, rule_info_t *rule_info) { - FILE *fh; - gchar *rule; + FILE *fh; + gchar *rule; GtkTextIter start, end; GtkTextBuffer *buf; @@ -717,7 +717,7 @@ static void firewall_save_as_cmd_cb(GtkWidget *w, gpointer data) { GtkWidget *caller = gtk_widget_get_toplevel(w); - rule_info_t *rule_info = (rule_info_t *)data; + rule_info_t *rule_info = (rule_info_t *)data; char *pathname; /* @@ -738,3 +738,16 @@ firewall_save_as_cmd_cb(GtkWidget *w, gpointer data) g_free(pathname); } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c index fbef048561..825d13f552 100644 --- a/ui/gtk/font_utils.c +++ b/ui/gtk/font_utils.c @@ -373,3 +373,16 @@ void font_init(void) /* Call this for the side-effects that set_fonts() produces */ set_fonts(m_r_font); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index c61de1bd1f..319f80ec75 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -630,3 +630,16 @@ register_tap_listener_gtkfunnel(void) { funnel_register_all_menus(register_menu_cb); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c index 641cd716c3..4948efa4d9 100644 --- a/ui/gtk/goto_dlg.c +++ b/ui/gtk/goto_dlg.c @@ -124,7 +124,7 @@ goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) reject attempts to type in characters other than digits? What about numbers > the maximum possible guint? */ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "The packet number you entered isn't a valid number."); + "The packet number you entered isn't a valid number."); return; } @@ -140,30 +140,42 @@ goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) void goto_framenum_cb(GtkWidget *w _U_, gpointer data _U_) { - cf_goto_framenum(&cfile); + cf_goto_framenum(&cfile); } void goto_top_frame_cb(GtkWidget *w _U_, gpointer d _U_) { - cf_goto_top_frame(); + cf_goto_top_frame(); } void goto_bottom_frame_cb(GtkWidget *w _U_, gpointer d _U_) { - cf_goto_bottom_frame(); + cf_goto_bottom_frame(); } void goto_next_frame_cb(GtkWidget *w _U_, gpointer d _U_) { - packet_list_next(); + packet_list_next(); } void goto_previous_frame_cb(GtkWidget *w _U_, gpointer d _U_) { - packet_list_prev(); + packet_list_prev(); } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index e852483248..5830c98706 100644 --- a/ui/gtk/gsm_a_stat.c +++ b/ui/gtk/gsm_a_stat.c @@ -765,3 +765,16 @@ register_tap_listener_gtkgsm_a_stat(void) register_stat_tap_ui(&gsm_a_stat_sacch_rr_ui,NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index 967a77caa1..67b2244ffa 100644 --- a/ui/gtk/gsm_map_stat.c +++ b/ui/gtk/gsm_map_stat.c @@ -480,3 +480,16 @@ register_tap_listener_gtkgsm_map_stat(void) register_stat_tap_ui(&gsm_map_stat_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index d75de2e641..13d79a4ba1 100644 --- a/ui/gtk/gsm_map_summary.c +++ b/ui/gtk/gsm_map_summary.c @@ -64,16 +64,16 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) summary_tally summary; GtkWidget *sum_open_w, *main_vb, *file_fr, *data_fr, *file_box, - *data_box, *bbox, *close_bt, - *invoke_fr, *invoke_box, - *rr_fr, *rr_box, - *tot_fr, *tot_box; + *data_box, *bbox, *close_bt, + *invoke_fr, *invoke_box, + *rr_fr, *rr_box, + *tot_fr, *tot_box; gchar string_buff[SUM_STR_MAX]; double seconds; - int i; - int tot_invokes, tot_rr; - double tot_invokes_size, tot_rr_size; + int i; + int tot_invokes, tot_rr; + double tot_invokes_size, tot_rr_size; if (cfile.state == FILE_CLOSED) { return; @@ -352,3 +352,16 @@ void register_tap_listener_gtkgsm_map_summary(void) { } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/gtk_iface_monitor.c b/ui/gtk/gtk_iface_monitor.c index 7de2cf80d1..fe465182da 100644 --- a/ui/gtk/gtk_iface_monitor.c +++ b/ui/gtk/gtk_iface_monitor.c @@ -112,3 +112,16 @@ gtk_iface_mon_stop(void) } #endif /* HAVE_LIBPCAP */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index 945681490f..2634cf7262 100644 --- a/ui/gtk/gtp_stat.c +++ b/ui/gtk/gtp_stat.c @@ -222,3 +222,16 @@ register_tap_listener_gtkgtpstat(void) register_param_stat(>p_stat_dlg, "GTP", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c index 0b3f9c5c15..1dfcdc9e71 100644 --- a/ui/gtk/gui_stat_util.c +++ b/ui/gtk/gui_stat_util.c @@ -109,3 +109,16 @@ create_stat_table(GtkWidget *scrolled_window, GtkWidget *vbox, int columns, cons return table; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index b30cc87246..e0b2a1f9e2 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -1076,11 +1076,11 @@ copy_binary_to_clipboard(const guint8 *data_p, int len) { static GtkTargetEntry target_entry[] = { - {(char *)"application/octet-stream", 0, 0}}; - /* XXX - this is not understood by most applications, - * but can be pasted into the better hex editors - is - * there something better that we can do? - */ + {(char *)"application/octet-stream", 0, 0}}; + /* XXX - this is not understood by most applications, + * but can be pasted into the better hex editors - is + * there something better that we can do? + */ GtkClipboard *cb; copy_binary_t *copy_data; @@ -2023,11 +2023,24 @@ ws_gtk_grid_set_homogeneous(GtkGrid *grid, gboolean homogeneous) void gdk_cairo_set_source_rgba(cairo_t *cr, const GdkRGBA *rgba) { - GdkColor color; + GdkColor color; - gdkRGBAcolor_to_GdkColor(&color, rgba); + gdkRGBAcolor_to_GdkColor(&color, rgba); - gdk_cairo_set_source_color(cr, &color); + gdk_cairo_set_source_color(cr, &color); } #endif /* GTK_CHECK_VERSION(3,0,0) */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c index 15c3138763..c088de0e54 100644 --- a/ui/gtk/h225_counter.c +++ b/ui/gtk/h225_counter.c @@ -83,19 +83,19 @@ typedef struct _h225counter_t { GtkWidget *scrolled_window; GtkTreeView *table; guint32 ras_msg[RAS_MSG_TYPES + 1]; - guint32 cs_msg[CS_MSG_TYPES + 1]; - guint32 grj_reason[GRJ_REASONS + 1]; - guint32 rrj_reason[RRJ_REASONS + 1]; - guint32 urq_reason[URQ_REASONS + 1]; - guint32 urj_reason[URJ_REASONS + 1]; - guint32 arj_reason[ARJ_REASONS + 1]; - guint32 brj_reason[BRJ_REASONS + 1]; - guint32 drq_reason[DRQ_REASONS + 1]; - guint32 drj_reason[DRJ_REASONS + 1]; - guint32 lrj_reason[LRJ_REASONS + 1]; - guint32 irqnak_reason[IRQNAK_REASONS + 1]; - guint32 rel_cmp_reason[REL_CMP_REASONS + 1]; - guint32 facility_reason[FACILITY_REASONS + 1]; + guint32 cs_msg[CS_MSG_TYPES + 1]; + guint32 grj_reason[GRJ_REASONS + 1]; + guint32 rrj_reason[RRJ_REASONS + 1]; + guint32 urq_reason[URQ_REASONS + 1]; + guint32 urj_reason[URJ_REASONS + 1]; + guint32 arj_reason[ARJ_REASONS + 1]; + guint32 brj_reason[BRJ_REASONS + 1]; + guint32 drq_reason[DRQ_REASONS + 1]; + guint32 drj_reason[DRJ_REASONS + 1]; + guint32 lrj_reason[LRJ_REASONS + 1]; + guint32 irqnak_reason[IRQNAK_REASONS + 1]; + guint32 rel_cmp_reason[REL_CMP_REASONS + 1]; + guint32 facility_reason[FACILITY_REASONS + 1]; } h225counter_t; @@ -299,8 +299,8 @@ h225counter_draw(void *phs) /* Now print Message and Reason Counter Table */ /* clear list before printing */ - store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table)); - gtk_list_store_clear(store); + store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table)); + gtk_list_store_clear(store); for(i=0;i<=RAS_MSG_TYPES;i++) { if(hs->ras_msg[i]!=0) { @@ -509,8 +509,8 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) } static const stat_column titles[]={ - {G_TYPE_STRING, LEFT, "Message Type or Reason"}, - {G_TYPE_UINT, RIGHT, "Count" } + {G_TYPE_STRING, LEFT, "Message Type or Reason"}, + {G_TYPE_UINT, RIGHT, "Count" } }; static void @@ -541,7 +541,7 @@ gtk_h225counter_init(const char *opt_arg, void *userdata _U_) init_main_stat_window(hs->win, hs->vbox, "H.225 Message and Message Reason Counter", hs->filter); - /* init a scrolled window*/ + /* init a scrolled window*/ hs->scrolled_window = scrolled_window_new(NULL, NULL); hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 2, titles); @@ -578,3 +578,16 @@ register_tap_listener_gtk_h225counter(void) register_param_stat(&h225_counter_dlg, "_H.225", REGISTER_STAT_GROUP_TELEPHONY); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index 12a6ff6148..7b7ebd7eb9 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.c @@ -61,14 +61,14 @@ static tap_param_dlg h225_rassrt_dlg = { #define NUM_RAS_STATS 7 static const value_string ras_message_category[] = { - { 0, "Gatekeeper "}, - { 1, "Registration "}, - { 2, "UnRegistration"}, - { 3, "Admission "}, - { 4, "Bandwidth "}, - { 5, "Disengage "}, - { 6, "Location "}, - { 0, NULL } + { 0, "Gatekeeper "}, + { 1, "Registration "}, + { 2, "UnRegistration"}, + { 3, "Admission "}, + { 4, "Bandwidth "}, + { 5, "Disengage "}, + { 6, "Location "}, + { 0, NULL } }; typedef enum _ras_type { @@ -120,11 +120,11 @@ h225rassrt_reset(void *phs) hs->ras_rtd[i].stats.min_num = 0; hs->ras_rtd[i].stats.max_num = 0; hs->ras_rtd[i].stats.min.secs = 0; - hs->ras_rtd[i].stats.min.nsecs = 0; - hs->ras_rtd[i].stats.max.secs = 0; - hs->ras_rtd[i].stats.max.nsecs = 0; - hs->ras_rtd[i].stats.tot.secs = 0; - hs->ras_rtd[i].stats.tot.nsecs = 0; + hs->ras_rtd[i].stats.min.nsecs = 0; + hs->ras_rtd[i].stats.max.secs = 0; + hs->ras_rtd[i].stats.max.nsecs = 0; + hs->ras_rtd[i].stats.tot.secs = 0; + hs->ras_rtd[i].stats.tot.nsecs = 0; hs->ras_rtd[i].open_req_num = 0; hs->ras_rtd[i].disc_rsp_num = 0; hs->ras_rtd[i].req_dup_num = 0; @@ -204,8 +204,8 @@ h225rassrt_draw(void *phs) /* Now print Message and Reason Counter Table */ /* clear list before printing */ - store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table)); - gtk_list_store_clear(store); + store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table)); + gtk_list_store_clear(store); for(i=0;i<NUM_RAS_STATS;i++) { /* nothing seen, nothing to do */ @@ -294,7 +294,7 @@ gtk_h225rassrt_init(const char *opt_arg, void *userdata _U_) init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", hs->filter); - /* init a scrolled window*/ + /* init a scrolled window*/ hs->scrolled_window = scrolled_window_new(NULL, NULL); hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 11, titles); @@ -331,3 +331,16 @@ register_tap_listener_gtk_h225rassrt(void) register_param_stat(&h225_rassrt_dlg, "H.225 RAS", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/help_dlg.c b/ui/gtk/help_dlg.c index fa31d69108..c02d878ac5 100644 --- a/ui/gtk/help_dlg.c +++ b/ui/gtk/help_dlg.c @@ -99,3 +99,16 @@ topic_menu_cb(GtkWidget *w _U_, GdkEventButton *event _U_, gpointer user_data) topic_action((topic_action_e)GPOINTER_TO_INT(user_data)); return TRUE; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 9d085bd4f9..7a9506c968 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -2180,3 +2180,16 @@ register_tap_listener_gtk_iostat(void) { register_stat_tap_ui(&iostat_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index 9a171b26d6..05d46a7a1a 100644 --- a/ui/gtk/ldap_stat.c +++ b/ui/gtk/ldap_stat.c @@ -236,3 +236,16 @@ register_tap_listener_gtkldapstat(void) register_param_stat(&ldap_stat_dlg, "LDAP", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index f572bafc5b..80f881a781 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -1420,3 +1420,16 @@ void register_tap_listener_mac_lte_stat(void) { register_param_stat(&mac_lte_stat_dlg, "_MAC", REGISTER_STAT_GROUP_TELEPHONY_LTE); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c index fcc950dc72..9965c7596b 100644 --- a/ui/gtk/macros_dlg.c +++ b/ui/gtk/macros_dlg.c @@ -50,3 +50,16 @@ void macros_dialog_cb(GtkWidget *w _U_, gpointer data _U_) { uat_window_cb(NULL,dfmuat); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c index a60fe62556..48ead08fa8 100644 --- a/ui/gtk/main_80211_toolbar.c +++ b/ui/gtk/main_80211_toolbar.c @@ -121,7 +121,7 @@ void tb80211_update_freq(void) tb80211_freq_cnt = tb80211_current_iface->frequencies->len; for (i = 0; i < tb80211_freq_cnt; i++) { - int freq; + int freq; freq = g_array_index(tb80211_current_iface->frequencies, int, i); str = g_strdup_printf("%d MHz (%d)", freq, ws80211_frequency_to_channel(freq)); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tb80211_freq_list_box), str); @@ -161,25 +161,25 @@ int get_selected_channel_type(void) static int tb80211_do_set_channel(char *iface, int freq, int type) { - gchar *freq_s; - const gchar *type_s; - gchar *data, *primary_msg, *secondary_msg; - int ret; - - freq_s = g_strdup_printf("%d", freq); - type_s = ws80211_chan_type_to_str(type); - ret = sync_interface_set_80211_chan(iface, freq_s, type_s, - &data, &primary_msg, &secondary_msg, main_window_update); - - /* Parse the error msg */ - if (ret && primary_msg) { - return atoi(primary_msg); - } - g_free(data); - g_free(primary_msg); - g_free(secondary_msg); - g_free(freq_s); - return ret; + gchar *freq_s; + const gchar *type_s; + gchar *data, *primary_msg, *secondary_msg; + int ret; + + freq_s = g_strdup_printf("%d", freq); + type_s = ws80211_chan_type_to_str(type); + ret = sync_interface_set_80211_chan(iface, freq_s, type_s, + &data, &primary_msg, &secondary_msg, main_window_update); + + /* Parse the error msg */ + if (ret && primary_msg) { + return atoi(primary_msg); + } + g_free(data); + g_free(primary_msg); + g_free(secondary_msg); + g_free(freq_s); + return ret; } /* Called on freq and type combo box change. */ @@ -203,7 +203,7 @@ tb80211_set_channel(void) err = tb80211_do_set_channel(tb80211_current_iface->ifname, new_freq, new_type); if (err) { info = g_strdup_printf("<b>Failed to set channel: %s</b>", g_strerror(abs(err))); - /* Try to set back to last working chan */ + /* Try to set back to last working chan */ err = tb80211_do_set_channel(tb80211_current_iface->ifname, tb80211_current_freq, tb80211_current_type); if (err) { gtk_combo_box_set_active(freq_combo, -1); @@ -332,7 +332,7 @@ static void tb80211_add_label(const gchar *text, GtkWidget *tb) { GtkWidget *label; - GtkToolItem *label_ti; + GtkToolItem *label_ti; label_ti = gtk_tool_item_new(); gtk_widget_show(GTK_WIDGET (label_ti)); @@ -345,7 +345,7 @@ tb80211_add_label(const gchar *text, GtkWidget *tb) GtkWidget * ws80211_toolbar_new(void) { - GtkToolItem *ti; + GtkToolItem *ti; int ret; /* filter toolbar */ @@ -414,3 +414,16 @@ ws80211_toolbar_new(void) return tb80211_tb; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c index eec3a2e871..44cb20a57e 100644 --- a/ui/gtk/main_airpcap_toolbar.c +++ b/ui/gtk/main_airpcap_toolbar.c @@ -83,71 +83,71 @@ airpcap_toolbar_fcs_filter_combo_cb(GtkWidget *fcs_filter_cb, gpointer user_data void airpcap_toolbar_encryption_cb(GtkWidget *entry _U_, gpointer user_data _U_) { - /* We need to directly access the .dll functions here... */ - gchar ebuf[AIRPCAP_ERRBUF_SIZE]; - PAirpcapHandle ad; - - gint n = 0; - gint i = 0; - airpcap_if_info_t* curr_if = NULL; - - /* Apply changes to the current adapter */ - if( (airpcap_if_active != NULL)) { - ad = airpcap_if_open(airpcap_if_active->name, ebuf); - - if(ad) { - if(airpcap_if_active->DecryptionOn == AIRPCAP_DECRYPTION_ON) { - airpcap_if_active->DecryptionOn = AIRPCAP_DECRYPTION_OFF; - airpcap_if_set_decryption_state(ad,airpcap_if_active->DecryptionOn); - /* Save configuration */ - if(!airpcap_if_store_cur_config_as_adapter_default(ad)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges."); - } - airpcap_if_close(ad); - } else { - airpcap_if_active->DecryptionOn = AIRPCAP_DECRYPTION_ON; - airpcap_if_set_decryption_state(ad,airpcap_if_active->DecryptionOn); - /* Save configuration */ - if(!airpcap_if_store_cur_config_as_adapter_default(ad)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges."); - } - airpcap_if_close(ad); - } - } - } else { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No active AirPcap Adapter selected."); - return; - } + /* We need to directly access the .dll functions here... */ + gchar ebuf[AIRPCAP_ERRBUF_SIZE]; + PAirpcapHandle ad; - if (!(airpcap_if_list == NULL)) { - n = g_list_length(airpcap_if_list); + gint n = 0; + gint i = 0; + airpcap_if_info_t* curr_if = NULL; - /* The same kind of settings should be propagated to all the adapters */ - /* Apply this change to all the adapters !!! */ - for(i = 0; i < n; i++) { - curr_if = (airpcap_if_info_t*)g_list_nth_data(airpcap_if_list,i); + /* Apply changes to the current adapter */ + if( (airpcap_if_active != NULL)) { + ad = airpcap_if_open(airpcap_if_active->name, ebuf); - if( (curr_if != NULL) && (curr_if != airpcap_if_selected) ) { - ad = airpcap_if_open(curr_if->name, ebuf); if(ad) { - curr_if->DecryptionOn = airpcap_if_selected->DecryptionOn; - airpcap_if_set_decryption_state(ad,curr_if->DecryptionOn); - /* Save configuration for the curr_if */ - if(!airpcap_if_store_cur_config_as_adapter_default(ad)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "Unable to save configuration." - "\nIn order to store the configuration in the registry you" - "\nhave to close all other AirPcap-based applications and" - "\nhave Administrator privileges."); - } - airpcap_if_close(ad); + if(airpcap_if_active->DecryptionOn == AIRPCAP_DECRYPTION_ON) { + airpcap_if_active->DecryptionOn = AIRPCAP_DECRYPTION_OFF; + airpcap_if_set_decryption_state(ad,airpcap_if_active->DecryptionOn); + /* Save configuration */ + if(!airpcap_if_store_cur_config_as_adapter_default(ad)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges."); + } + airpcap_if_close(ad); + } else { + airpcap_if_active->DecryptionOn = AIRPCAP_DECRYPTION_ON; + airpcap_if_set_decryption_state(ad,airpcap_if_active->DecryptionOn); + /* Save configuration */ + if(!airpcap_if_store_cur_config_as_adapter_default(ad)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Cannot save configuration!!!\nRemember that in order to store the configuration in the registry you have to:\n\n- Close all the airpcap-based applications.\n- Be sure to have administrative privileges."); + } + airpcap_if_close(ad); + } } - } + } else { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No active AirPcap Adapter selected."); + return; + } + + if (!(airpcap_if_list == NULL)) { + n = g_list_length(airpcap_if_list); + + /* The same kind of settings should be propagated to all the adapters */ + /* Apply this change to all the adapters !!! */ + for(i = 0; i < n; i++) { + curr_if = (airpcap_if_info_t*)g_list_nth_data(airpcap_if_list,i); + + if( (curr_if != NULL) && (curr_if != airpcap_if_selected) ) { + ad = airpcap_if_open(curr_if->name, ebuf); + if(ad) { + curr_if->DecryptionOn = airpcap_if_selected->DecryptionOn; + airpcap_if_set_decryption_state(ad,curr_if->DecryptionOn); + /* Save configuration for the curr_if */ + if(!airpcap_if_store_cur_config_as_adapter_default(ad)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, + "Unable to save configuration." + "\nIn order to store the configuration in the registry you" + "\nhave to close all other AirPcap-based applications and" + "\nhave Administrator privileges."); + } + airpcap_if_close(ad); + } + } + } + } else { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "AirPcap Adapter Error."); + return; } - } else { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "AirPcap Adapter Error."); - return; - } } /* @@ -373,49 +373,62 @@ driver_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) void airpcap_toolbar_show(GtkWidget *lcl_wireless_tb _U_) { - /* - * This will read the decryption keys from the preferences file, and will - * store them into the registry... - */ - if(airpcap_if_list != NULL && g_list_length(airpcap_if_list) > 0){ - if (!airpcap_check_decryption_keys(airpcap_if_list)) { - /* Ask the user what to do ...*/ - airpcap_keys_check_w(NULL,NULL); - } else { - /* Keys from lists are equals, or Wireshark has got no keys */ - airpcap_load_decryption_keys(airpcap_if_list); + /* + * This will read the decryption keys from the preferences file, and will + * store them into the registry... + */ + if(airpcap_if_list != NULL && g_list_length(airpcap_if_list) > 0){ + if (!airpcap_check_decryption_keys(airpcap_if_list)) { + /* Ask the user what to do ...*/ + airpcap_keys_check_w(NULL,NULL); + } else { + /* Keys from lists are equals, or Wireshark has got no keys */ + airpcap_load_decryption_keys(airpcap_if_list); + } } - } - switch (airpcap_dll_ret_val) { + switch (airpcap_dll_ret_val) { - case AIRPCAP_DLL_OK: - break; + case AIRPCAP_DLL_OK: + break; - case AIRPCAP_DLL_OLD: - if(recent.airpcap_driver_check_show) { - driver_warning_dialog = (GtkWidget *)simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", - "WARNING: The version of AirPcap on this system\n" - "does not support driver-level decryption. Please\n" - "download a more recent version from\n" "http://www.cacetech.com/support/downloads.htm \n"); - simple_dialog_check_set(driver_warning_dialog,"Don't show this message again."); - simple_dialog_set_cb(driver_warning_dialog, driver_warning_dialog_cb, NULL); - } - break; + case AIRPCAP_DLL_OLD: + if(recent.airpcap_driver_check_show) { + driver_warning_dialog = (GtkWidget *)simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", + "WARNING: The version of AirPcap on this system\n" + "does not support driver-level decryption. Please\n" + "download a more recent version from\n" "http://www.cacetech.com/support/downloads.htm \n"); + simple_dialog_check_set(driver_warning_dialog,"Don't show this message again."); + simple_dialog_set_cb(driver_warning_dialog, driver_warning_dialog_cb, NULL); + } + break; #if 0 - /* - * XXX - Maybe we need to warn the user if one of the following happens??? - */ - case AIRPCAP_DLL_ERROR: - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s","AIRPCAP_DLL_ERROR\n"); - break; - - case AIRPCAP_DLL_NOT_FOUND: - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s","AIRPCAP_DDL_NOT_FOUND\n"); - break; + /* + * XXX - Maybe we need to warn the user if one of the following happens??? + */ + case AIRPCAP_DLL_ERROR: + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s","AIRPCAP_DLL_ERROR\n"); + break; + + case AIRPCAP_DLL_NOT_FOUND: + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s","AIRPCAP_DDL_NOT_FOUND\n"); + break; #endif - } + } } #endif /* HAVE_AIRPCAP */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index a6111cac03..5714b84fe7 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -1135,3 +1135,16 @@ statusbar_capture_callback(gint event, capture_session *cap_session, } } #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c index aa0c57f130..e1728d48a3 100644 --- a/ui/gtk/main_titlebar.c +++ b/ui/gtk/main_titlebar.c @@ -87,28 +87,41 @@ main_titlebar_update(void) void set_titlebar_for_capture_file(capture_file *cf) { - gchar *display_name; - gchar *window_name; - - if (cf && cf->filename) { - display_name = cf_get_display_name(cf); - window_name = g_strdup_printf("%s%s", cf_has_unsaved_data(cf) ? "*" : "", - display_name); - g_free(display_name); - main_set_window_name(window_name); - g_free(window_name); - } else { - main_set_window_name("The Wireshark Network Analyzer"); - } + gchar *display_name; + gchar *window_name; + + if (cf && cf->filename) { + display_name = cf_get_display_name(cf); + window_name = g_strdup_printf("%s%s", cf_has_unsaved_data(cf) ? "*" : "", + display_name); + g_free(display_name); + main_set_window_name(window_name); + g_free(window_name); + } else { + main_set_window_name("The Wireshark Network Analyzer"); + } } /* Set titlebar to reflect a capture in progress */ void set_titlebar_for_capture_in_progress(capture_file *cf) { - gchar *window_name; + gchar *window_name; - window_name = g_strdup_printf("Capturing from %s", cf_get_tempfile_source(cf)); - main_set_window_name(window_name); - g_free(window_name); + window_name = g_strdup_printf("Capturing from %s", cf_get_tempfile_source(cf)); + main_set_window_name(window_name); + g_free(window_name); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c index 1b74a57032..3ebf45be49 100644 --- a/ui/gtk/main_toolbar.c +++ b/ui/gtk/main_toolbar.c @@ -84,12 +84,12 @@ toolbar_redraw_all(void) gtk_toolbar_set_style(GTK_TOOLBAR(main_tb), (GtkToolbarStyle)prefs.gui_toolbar_main_style); - filter_tb = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_TB_FILTER_KEY); + filter_tb = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_TB_FILTER_KEY); - /* In case the filter toolbar hasn't been built */ - if(filter_tb) - gtk_toolbar_set_style(GTK_TOOLBAR(filter_tb), - (GtkToolbarStyle)prefs.gui_toolbar_filter_style); + /* In case the filter toolbar hasn't been built */ + if(filter_tb) + gtk_toolbar_set_style(GTK_TOOLBAR(filter_tb), + (GtkToolbarStyle)prefs.gui_toolbar_filter_style); } #ifdef HAVE_LIBPCAP @@ -137,13 +137,13 @@ void set_toolbar_for_capture_in_progress(gboolean capture_in_progress) { if (toolbar_init) { #ifdef HAVE_LIBPCAP - gtk_widget_set_sensitive(GTK_WIDGET(capture_options_button), !capture_in_progress); + gtk_widget_set_sensitive(GTK_WIDGET(capture_options_button), !capture_in_progress); gtk_widget_set_sensitive(GTK_WIDGET(new_button), !capture_in_progress); gtk_widget_set_sensitive(GTK_WIDGET(stop_button), capture_in_progress); - gtk_widget_set_sensitive(GTK_WIDGET(clear_button), capture_in_progress); - if (!capture_in_progress) { - gtk_widget_set_sensitive(GTK_WIDGET(new_button), (global_capture_opts.num_selected > 0)); - } + gtk_widget_set_sensitive(GTK_WIDGET(clear_button), capture_in_progress); + if (!capture_in_progress) { + gtk_widget_set_sensitive(GTK_WIDGET(new_button), (global_capture_opts.num_selected > 0)); + } /*if (capture_in_progress) { gtk_widget_hide(GTK_WIDGET(new_button)); gtk_widget_show(GTK_WIDGET(stop_button)); @@ -179,30 +179,30 @@ void set_toolbar_for_captured_packets(gboolean have_captured_packets) { if (toolbar_init) { gtk_widget_set_sensitive(GTK_WIDGET(find_button), - have_captured_packets); + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(history_back_button), - have_captured_packets); - gtk_widget_set_sensitive(GTK_WIDGET(history_forward_button), - have_captured_packets); + have_captured_packets); + gtk_widget_set_sensitive(GTK_WIDGET(history_forward_button), + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(go_to_button), - have_captured_packets); + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(go_to_top_button), - have_captured_packets); + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(go_to_bottom_button), - have_captured_packets); + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(zoom_in_button), - have_captured_packets); + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(zoom_out_button), - have_captured_packets); + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(zoom_100_button), - have_captured_packets); + have_captured_packets); gtk_widget_set_sensitive(GTK_WIDGET(resize_columns_button), - have_captured_packets); + have_captured_packets); /* XXX - I don't see a reason why this should be done (as it is in the * menus) */ /* gtk_widget_set_sensitive(GTK_WIDGET(color_display_button), - have_captured_packets);*/ + have_captured_packets);*/ } } @@ -226,7 +226,7 @@ static void toolbar_append_separator(GtkWidget *toolbar) { #define toolbar_toggle_button(new_item, window, toolbar, stock, tooltip_text, callback, user_data) { \ new_item = ws_gtk_toggle_tool_button_new_from_stock(stock); \ - gtk_widget_set_tooltip_text(GTK_WIDGET(new_item), tooltip_text); \ + gtk_widget_set_tooltip_text(GTK_WIDGET(new_item), tooltip_text); \ g_signal_connect(new_item, "toggled", G_CALLBACK(callback), user_data); \ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), new_item, -1); \ gtk_widget_show_all(GTK_WIDGET(new_item)); \ @@ -291,75 +291,75 @@ toolbar_new(void) #ifdef HAVE_LIBPCAP toolbar_item(if_button, main_tb, - WIRESHARK_STOCK_CAPTURE_INTERFACES, "List the available capture interfaces...", capture_if_cb, NULL); + WIRESHARK_STOCK_CAPTURE_INTERFACES, "List the available capture interfaces...", capture_if_cb, NULL); toolbar_item(capture_options_button, main_tb, - WIRESHARK_STOCK_CAPTURE_OPTIONS, "Show the capture options...", capture_prep_cb, NULL); + WIRESHARK_STOCK_CAPTURE_OPTIONS, "Show the capture options...", capture_prep_cb, NULL); toolbar_item(new_button, main_tb, - WIRESHARK_STOCK_CAPTURE_START, "Start a new live capture", capture_start_cb, NULL); + WIRESHARK_STOCK_CAPTURE_START, "Start a new live capture", capture_start_cb, NULL); toolbar_item(stop_button, main_tb, - WIRESHARK_STOCK_CAPTURE_STOP, "Stop the running live capture", capture_stop_cb, NULL); + WIRESHARK_STOCK_CAPTURE_STOP, "Stop the running live capture", capture_stop_cb, NULL); toolbar_item(clear_button, main_tb, - WIRESHARK_STOCK_CAPTURE_RESTART, "Restart the running live capture", capture_restart_cb, NULL); + WIRESHARK_STOCK_CAPTURE_RESTART, "Restart the running live capture", capture_restart_cb, NULL); toolbar_append_separator(main_tb); #endif /* HAVE_LIBPCAP */ toolbar_item(open_button, main_tb, - GTK_STOCK_OPEN, "Open a capture file...", file_open_cmd_cb, NULL); + GTK_STOCK_OPEN, "Open a capture file...", file_open_cmd_cb, NULL); toolbar_item(save_button, main_tb, - WIRESHARK_STOCK_SAVE, "Save this capture file", file_save_cmd_cb, NULL); + WIRESHARK_STOCK_SAVE, "Save this capture file", file_save_cmd_cb, NULL); toolbar_item(close_button, main_tb, - GTK_STOCK_CLOSE, "Close this capture file", file_close_cmd_cb, NULL); + GTK_STOCK_CLOSE, "Close this capture file", file_close_cmd_cb, NULL); toolbar_item(reload_button, main_tb, - GTK_STOCK_REFRESH, "Reload this capture file", file_reload_cmd_cb, NULL); + GTK_STOCK_REFRESH, "Reload this capture file", file_reload_cmd_cb, NULL); toolbar_append_separator(main_tb); toolbar_item(find_button, main_tb, - GTK_STOCK_FIND, "Find a packet...", find_frame_cb, NULL); + GTK_STOCK_FIND, "Find a packet...", find_frame_cb, NULL); toolbar_item(history_back_button, main_tb, - GTK_STOCK_GO_BACK, "Go back in packet history", history_back_cb, NULL); + GTK_STOCK_GO_BACK, "Go back in packet history", history_back_cb, NULL); toolbar_item(history_forward_button, main_tb, - GTK_STOCK_GO_FORWARD, "Go forward in packet history", history_forward_cb, NULL); + GTK_STOCK_GO_FORWARD, "Go forward in packet history", history_forward_cb, NULL); toolbar_item(go_to_button, main_tb, - GTK_STOCK_JUMP_TO, "Go to the packet with number...", goto_frame_cb, NULL); + GTK_STOCK_JUMP_TO, "Go to the packet with number...", goto_frame_cb, NULL); toolbar_item(go_to_top_button, main_tb, - GTK_STOCK_GOTO_TOP, "Go to the first packet", goto_top_frame_cb, NULL); + GTK_STOCK_GOTO_TOP, "Go to the first packet", goto_top_frame_cb, NULL); toolbar_item(go_to_bottom_button, main_tb, - GTK_STOCK_GOTO_BOTTOM, "Go to the last packet", goto_bottom_frame_cb, NULL); + GTK_STOCK_GOTO_BOTTOM, "Go to the last packet", goto_bottom_frame_cb, NULL); toolbar_append_separator(main_tb); toolbar_toggle_button(colorize_button, window, main_tb, - WIRESHARK_STOCK_COLORIZE, "Colorize Packet List", colorize_toggle_cb, NULL); + WIRESHARK_STOCK_COLORIZE, "Colorize Packet List", colorize_toggle_cb, NULL); #ifdef HAVE_LIBPCAP toolbar_toggle_button(autoscroll_button, window, main_tb, - WIRESHARK_STOCK_AUTOSCROLL, "Auto Scroll Packet List in Live Capture", auto_scroll_live_toggle_cb, NULL); + WIRESHARK_STOCK_AUTOSCROLL, "Auto Scroll Packet List in Live Capture", auto_scroll_live_toggle_cb, NULL); #endif toolbar_append_separator(main_tb); toolbar_item(zoom_in_button, main_tb, - GTK_STOCK_ZOOM_IN, "Zoom in", view_zoom_in_cb, NULL); + GTK_STOCK_ZOOM_IN, "Zoom in", view_zoom_in_cb, NULL); toolbar_item(zoom_out_button, main_tb, - GTK_STOCK_ZOOM_OUT, "Zoom out", view_zoom_out_cb, NULL); + GTK_STOCK_ZOOM_OUT, "Zoom out", view_zoom_out_cb, NULL); toolbar_item(zoom_100_button, main_tb, - GTK_STOCK_ZOOM_100, "Zoom 100%", view_zoom_100_cb, NULL); + GTK_STOCK_ZOOM_100, "Zoom 100%", view_zoom_100_cb, NULL); toolbar_item(resize_columns_button, main_tb, WIRESHARK_STOCK_RESIZE_COLUMNS, "Resize All Columns", packet_list_resize_columns_cb, NULL); @@ -368,23 +368,23 @@ toolbar_new(void) #ifdef HAVE_LIBPCAP toolbar_item(capture_filter_button, main_tb, - WIRESHARK_STOCK_CAPTURE_FILTER, "Edit capture filter...", cfilter_dialog_cb, NULL); + WIRESHARK_STOCK_CAPTURE_FILTER, "Edit capture filter...", cfilter_dialog_cb, NULL); #endif /* HAVE_LIBPCAP */ toolbar_item(display_filter_button, main_tb, - WIRESHARK_STOCK_DISPLAY_FILTER, "Edit/apply display filter...", dfilter_dialog_cb, NULL); + WIRESHARK_STOCK_DISPLAY_FILTER, "Edit/apply display filter...", dfilter_dialog_cb, NULL); toolbar_item(color_display_button, main_tb, - GTK_STOCK_SELECT_COLOR, "Edit coloring rules...", color_display_cb, NULL); + GTK_STOCK_SELECT_COLOR, "Edit coloring rules...", color_display_cb, NULL); /* the preference button uses its own Stock icon label "Prefs", as "Preferences" is too long */ toolbar_item(prefs_button, main_tb, - GTK_STOCK_PREFERENCES, "Edit preferences...", prefs_cb, NULL); + GTK_STOCK_PREFERENCES, "Edit preferences...", prefs_cb, NULL); toolbar_append_separator(main_tb); toolbar_item(help_button, main_tb, - GTK_STOCK_HELP, "Show some help...", topic_cb, GINT_TO_POINTER(HELP_CONTENT)); + GTK_STOCK_HELP, "Show some help...", topic_cb, GINT_TO_POINTER(HELP_CONTENT)); /* disable all "sensitive" items by default */ toolbar_init = TRUE; @@ -406,3 +406,16 @@ set_toolbar_object_data(const gchar *key, gpointer data) g_object_set_data(G_OBJECT(open_button), key, data); g_object_set_data(G_OBJECT(reload_button), key, data); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index fdf021c260..cf1eb41746 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -1450,3 +1450,16 @@ get_welcome_window(void) { return welcome_hb; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index 33f232032d..0fae93da27 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -194,3 +194,16 @@ manual_addr_resolv_dlg(GtkWidget *w _U_, gpointer data) gtk_widget_show_all(man_addr_resolv_dlg); window_present(man_addr_resolv_dlg); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index ba5d644023..ef9876589a 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -59,11 +59,11 @@ megacostat_reset(void *pms) ms->rtd[i].min_num=0; ms->rtd[i].max_num=0; ms->rtd[i].min.secs=0; - ms->rtd[i].min.nsecs=0; - ms->rtd[i].max.secs=0; - ms->rtd[i].max.nsecs=0; - ms->rtd[i].tot.secs=0; - ms->rtd[i].tot.nsecs=0; + ms->rtd[i].min.nsecs=0; + ms->rtd[i].max.secs=0; + ms->rtd[i].max.nsecs=0; + ms->rtd[i].tot.secs=0; + ms->rtd[i].tot.nsecs=0; } ms->open_req_num=0; @@ -83,8 +83,8 @@ megacostat_draw(void *pms) GtkTreeIter iter; /* clear list before printing */ - store = GTK_LIST_STORE(gtk_tree_view_get_model(ms->table)); - gtk_list_store_clear(store); + store = GTK_LIST_STORE(gtk_tree_view_get_model(ms->table)); + gtk_list_store_clear(store); for(i=0;i<NUM_TIMESTATS;i++) { /* nothing seen, nothing to do */ @@ -225,3 +225,16 @@ register_tap_listener_gtkmegacostat(void) register_param_stat(&megaco_srt_dlg, "MEGACO", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/memory_dlg.c b/ui/gtk/memory_dlg.c index 3e0933f2af..93f428303b 100644 --- a/ui/gtk/memory_dlg.c +++ b/ui/gtk/memory_dlg.c @@ -121,24 +121,24 @@ get_it_value(io_stat_t *io, int graph, int idx) static void print_interval_string(char *buf, int buf_len, guint32 interval, io_stat_t *io) { - struct tm *tmp; - time_t sec_val = interval/1000 + io->start_time.secs; - gint32 nsec_val = interval%1000 + io->start_time.nsecs/1000000; + struct tm *tmp; + time_t sec_val = interval/1000 + io->start_time.secs; + gint32 nsec_val = interval%1000 + io->start_time.nsecs/1000000; - if (nsec_val >= 1000) { - sec_val++; - nsec_val -= 1000; - } - tmp = localtime (&sec_val); - if (INTERVAL >= 1000) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec); - } else if (INTERVAL >= 100) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%1d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/100); - } else if (INTERVAL >= 10) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/10); - } else { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%03d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val); - } + if (nsec_val >= 1000) { + sec_val++; + nsec_val -= 1000; + } + tmp = localtime (&sec_val); + if (INTERVAL >= 1000) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + } else if (INTERVAL >= 100) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%1d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/100); + } else if (INTERVAL >= 10) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/10); + } else { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%03d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val); + } } static void @@ -588,8 +588,8 @@ create_filter_area(io_stat_t *io, GtkWidget *box) const char *label = memory_usage_get(i, NULL); GtkWidget *display_button; - if (!label) - break; + if (!label) + break; display_button = gtk_toggle_button_new_with_label(label); gtk_box_pack_start(GTK_BOX(hbox), display_button, FALSE, FALSE, 0); @@ -660,10 +660,10 @@ call_it(gpointer user_data) for (i = 0; i < MAX_GRAPHS; i++) { const char *label; - label = memory_usage_get(i, &io->graphs[i].items[idx]->bytes); + label = memory_usage_get(i, &io->graphs[i].items[idx]->bytes); - if (!label) - break; + if (!label) + break; tmp = format_size(io->graphs[i].items[idx]->bytes, format_size_unit_bytes); g_snprintf(buf, sizeof(buf), "%s [%s]", label, tmp); @@ -722,3 +722,16 @@ memory_stat_init(void) io->timer_id = g_timeout_add(INTERVAL, call_it, io); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index 8ad8ce0074..dc9740687b 100644 --- a/ui/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.c @@ -52,7 +52,7 @@ typedef struct _mgcpstat_t { char *filter; GtkWidget *scrolled_window; GtkTreeView *table; - timestat_t rtd[NUM_TIMESTATS]; + timestat_t rtd[NUM_TIMESTATS]; guint32 open_req_num; guint32 disc_rsp_num; guint32 req_dup_num; @@ -60,16 +60,16 @@ typedef struct _mgcpstat_t { } mgcpstat_t; static const value_string mgcp_mesage_type[] = { - { 0, "EPCF"}, - { 1, "CRCX"}, - { 2, "MDCX"}, - { 3, "DLCX"}, - { 4, "RQNT"}, - { 5, "NTFY"}, - { 6, "AUEP"}, - { 7, "AUCX"}, - { 8, "RSIP"}, - { 0, NULL} + { 0, "EPCF"}, + { 1, "CRCX"}, + { 2, "MDCX"}, + { 3, "DLCX"}, + { 4, "RQNT"}, + { 5, "NTFY"}, + { 6, "AUEP"}, + { 7, "AUCX"}, + { 8, "RSIP"}, + { 0, NULL} }; static void @@ -83,11 +83,11 @@ mgcpstat_reset(void *pms) ms->rtd[i].min_num=0; ms->rtd[i].max_num=0; ms->rtd[i].min.secs=0; - ms->rtd[i].min.nsecs=0; - ms->rtd[i].max.secs=0; - ms->rtd[i].max.nsecs=0; - ms->rtd[i].tot.secs=0; - ms->rtd[i].tot.nsecs=0; + ms->rtd[i].min.nsecs=0; + ms->rtd[i].max.secs=0; + ms->rtd[i].max.nsecs=0; + ms->rtd[i].tot.secs=0; + ms->rtd[i].tot.nsecs=0; } ms->open_req_num=0; @@ -184,8 +184,8 @@ mgcpstat_draw(void *pms) GtkTreeIter iter; /* clear list before printing */ - store = GTK_LIST_STORE(gtk_tree_view_get_model(ms->table)); - gtk_list_store_clear(store); + store = GTK_LIST_STORE(gtk_tree_view_get_model(ms->table)); + gtk_list_store_clear(store); for(i=0;i<NUM_TIMESTATS;i++) { /* nothing seen, nothing to do */ @@ -227,13 +227,13 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) } static const stat_column titles[]={ - {G_TYPE_STRING, LEFT, "Type" }, + {G_TYPE_STRING, LEFT, "Type" }, {G_TYPE_UINT, RIGHT, "Messages" }, {G_TYPE_STRING, RIGHT, "Min SRT" }, {G_TYPE_STRING, RIGHT, "Max SRT" }, {G_TYPE_STRING, RIGHT, "Avg SRT" }, - {G_TYPE_UINT, RIGHT, "Min in Frame" }, - {G_TYPE_UINT, RIGHT, "Max in Frame" } + {G_TYPE_UINT, RIGHT, "Min in Frame" }, + {G_TYPE_UINT, RIGHT, "Max in Frame" } }; static void @@ -313,3 +313,16 @@ register_tap_listener_gtkmgcpstat(void) register_param_stat(&mgcp_srt_dlg, "MGCP", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index c79a3dfa38..63457e4fa4 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -447,3 +447,16 @@ register_tap_listener_gtkmtp3_stat(void) } register_stat_tap_ui(&mtp3_stat_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index 163f8c14a6..85b319f8ec 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -56,13 +56,13 @@ typedef struct _my_columns_t { enum { - SI_COLUMN, - NUM_MSUS_COLUMN, - NUM_MSUS_SEC_COLUMN, - NUM_BYTES_COLUMN, - NUM_BYTES_MSU_COLUMN, - NUM_BYTES_SEC_COLUMN, - N_COLUMN /* The number of columns */ + SI_COLUMN, + NUM_MSUS_COLUMN, + NUM_MSUS_SEC_COLUMN, + NUM_BYTES_COLUMN, + NUM_BYTES_MSU_COLUMN, + NUM_BYTES_SEC_COLUMN, + N_COLUMN /* The number of columns */ }; /* Create list */ @@ -440,3 +440,16 @@ void register_tap_listener_gtkmtp3_summary(void) { } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index 360848c5b5..57c1fed7d9 100644 --- a/ui/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.c @@ -43,8 +43,8 @@ void register_tap_listener_gtkncpstat(void); /* used to keep track of the statistics for an entire program interface */ typedef struct _ncpstat_t { - GtkWidget *win; - srt_stat_table ncp_srt_table; + GtkWidget *win; + srt_stat_table ncp_srt_table; srt_stat_table nds_srt_table; srt_stat_table func_srt_table; srt_stat_table sss_srt_table; @@ -71,239 +71,239 @@ typedef struct _ncpstat_t { } ncpstat_t; static const value_string ncp_group_vals[] = { - { 0, "Synchronization" }, - { 1, "Print" }, - { 2, "File System" }, - { 3, "Connection" }, - { 4, "File Server Environment" }, - { 5, "Message" }, - { 6, "Bindery" }, - { 7, "Queue Management System (QMS)" }, - { 8, "Accounting" }, - { 9, "Transaction Tracking" }, - { 10, "AFP" }, - { 11, "NCP Extension" }, - { 12, "Extended Attribute" }, - { 13, "Auditing" }, - { 14, "Enhanced File System" }, - { 15, "Migration" }, - { 16, "Novell Modular Authentication Services (NMAS)" }, - { 17, "Secret Store Services (SSS)" }, - { 18, "Packet Burst" }, - { 19, "Novell Directory Services (NDS)" }, - { 20, "Time Synchronization" }, - { 21, "Server Statistics" }, - { 22, "Remote" }, - { 0, NULL} + { 0, "Synchronization" }, + { 1, "Print" }, + { 2, "File System" }, + { 3, "Connection" }, + { 4, "File Server Environment" }, + { 5, "Message" }, + { 6, "Bindery" }, + { 7, "Queue Management System (QMS)" }, + { 8, "Accounting" }, + { 9, "Transaction Tracking" }, + { 10, "AFP" }, + { 11, "NCP Extension" }, + { 12, "Extended Attribute" }, + { 13, "Auditing" }, + { 14, "Enhanced File System" }, + { 15, "Migration" }, + { 16, "Novell Modular Authentication Services (NMAS)" }, + { 17, "Secret Store Services (SSS)" }, + { 18, "Packet Burst" }, + { 19, "Novell Directory Services (NDS)" }, + { 20, "Time Synchronization" }, + { 21, "Server Statistics" }, + { 22, "Remote" }, + { 0, NULL} }; static const value_string sss_verb_enum[] = { - { 0x00000000, "Query Server" }, - { 0x00000001, "Read App Secrets" }, - { 0x00000002, "Write App Secrets" }, - { 0x00000003, "Add Secret ID" }, - { 0x00000004, "Remove Secret ID" }, - { 0x00000005, "Remove SecretStore" }, - { 0x00000006, "Enumerate Secret IDs" }, - { 0x00000007, "Unlock Store" }, - { 0x00000008, "Set Master Password" }, - { 0x00000009, "Get Service Information" }, - { 0x000000ff, "Fragment"}, - { 0x00000000, NULL} + { 0x00000000, "Query Server" }, + { 0x00000001, "Read App Secrets" }, + { 0x00000002, "Write App Secrets" }, + { 0x00000003, "Add Secret ID" }, + { 0x00000004, "Remove Secret ID" }, + { 0x00000005, "Remove SecretStore" }, + { 0x00000006, "Enumerate Secret IDs" }, + { 0x00000007, "Unlock Store" }, + { 0x00000008, "Set Master Password" }, + { 0x00000009, "Get Service Information" }, + { 0x000000ff, "Fragment"}, + { 0x00000000, NULL} }; static const value_string nmas_subverb_enum[] = { - { 0, "Fragmented Ping" }, - { 2, "Client Put Data" }, - { 4, "Client Get Data" }, - { 6, "Client Get User NDS Credentials" }, - { 8, "Login Store Management" }, - { 10, "Writable Object Check" }, - { 1242, "Message Handler" }, - { 0, NULL} + { 0, "Fragmented Ping" }, + { 2, "Client Put Data" }, + { 4, "Client Get Data" }, + { 6, "Client Get User NDS Credentials" }, + { 8, "Login Store Management" }, + { 10, "Writable Object Check" }, + { 1242, "Message Handler" }, + { 0, NULL} }; static const value_string ncp_nds_verb_vals[] = { - { 1, "Resolve Name" }, - { 2, "Read Entry Information" }, - { 3, "Read" }, - { 4, "Compare" }, - { 5, "List" }, - { 6, "Search Entries" }, - { 7, "Add Entry" }, - { 8, "Remove Entry" }, - { 9, "Modify Entry" }, - { 10, "Modify RDN" }, - { 11, "Create Attribute" }, - { 12, "Read Attribute Definition" }, - { 13, "Remove Attribute Definition" }, - { 14, "Define Class" }, - { 15, "Read Class Definition" }, - { 16, "Modify Class Definition" }, - { 17, "Remove Class Definition" }, - { 18, "List Containable Classes" }, - { 19, "Get Effective Rights" }, - { 20, "Add Partition" }, - { 21, "Remove Partition" }, - { 22, "List Partitions" }, - { 23, "Split Partition" }, - { 24, "Join Partitions" }, - { 25, "Add Replica" }, - { 26, "Remove Replica" }, - { 27, "Open Stream" }, - { 28, "Search Filter" }, - { 29, "Create Subordinate Reference" }, - { 30, "Link Replica" }, - { 31, "Change Replica Type" }, - { 32, "Start Update Schema" }, - { 33, "End Update Schema" }, - { 34, "Update Schema" }, - { 35, "Start Update Replica" }, - { 36, "End Update Replica" }, - { 37, "Update Replica" }, - { 38, "Synchronize Partition" }, - { 39, "Synchronize Schema" }, - { 40, "Read Syntaxes" }, - { 41, "Get Replica Root ID" }, - { 42, "Begin Move Entry" }, - { 43, "Finish Move Entry" }, - { 44, "Release Moved Entry" }, - { 45, "Backup Entry" }, - { 46, "Restore Entry" }, - { 47, "Save DIB (Obsolete)" }, - { 48, "Control" }, - { 49, "Remove Backlink" }, - { 50, "Close Iteration" }, - { 51, "Mutate Entry" }, - { 52, "Audit Skulking" }, - { 53, "Get Server Address" }, - { 54, "Set Keys" }, - { 55, "Change Password" }, - { 56, "Verify Password" }, - { 57, "Begin Login" }, - { 58, "Finish Login" }, - { 59, "Begin Authentication" }, - { 60, "Finish Authentication" }, - { 61, "Logout" }, - { 62, "Repair Ring (Obsolete)" }, - { 63, "Repair Timestamps" }, - { 64, "Create Back Link" }, - { 65, "Delete External Reference" }, - { 66, "Rename External Reference" }, - { 67, "Create Queue Entry Directory" }, - { 68, "Remove Queue Entry Directory" }, - { 69, "Merge Entries" }, - { 70, "Change Tree Name" }, - { 71, "Partition Entry Count" }, - { 72, "Check Login Restrictions" }, - { 73, "Start Join" }, - { 74, "Low Level Split" }, - { 75, "Low Level Join" }, - { 76, "Abort Partition Operation" }, - { 77, "Get All Servers" }, - { 78, "Partition Function" }, - { 79, "Read References" }, - { 80, "Inspect Entry" }, - { 81, "Get Remote Entry ID" }, - { 82, "Change Security" }, - { 83, "Check Console Operator" }, - { 84, "Start Move Tree" }, - { 85, "Move Tree" }, - { 86, "End Move Tree" }, - { 87, "Low Level Abort Join" }, - { 88, "Check Security Equivalence" }, - { 89, "Merge Tree" }, - { 90, "Sync External Reference" }, - { 91, "Resend Entry" }, - { 92, "New Schema Epoch" }, - { 93, "Statistics" }, - { 94, "Ping" }, - { 95, "Get Bindery Contexts" }, - { 96, "Monitor Connection" }, - { 97, "Get DS Statistics" }, - { 98, "Reset DS Counters" }, - { 99, "Console" }, - { 100, "Read Stream" }, - { 101, "Write Stream" }, - { 102, "Create Orphan Partition" }, - { 103, "Remove Orphan Partition" }, - { 104, "Link Orphan Partition" }, - { 105, "Set Distributed Reference Link (DRL)" }, - { 106, "Available" }, - { 107, "Available" }, - { 108, "Verify Distributed Reference Link (DRL)" }, - { 109, "Verify Partition" }, - { 110, "Iterator" }, - { 111, "Available" }, - { 112, "Close Stream" }, - { 113, "Available" }, - { 114, "Read Status" }, - { 115, "Partition Sync Status" }, - { 116, "Read Reference Data" }, - { 117, "Write Reference Data" }, - { 118, "Resource Event" }, - { 119, "DIB Request (obsolete)" }, - { 120, "Set Replication Filter" }, - { 121, "Get Replication Filter" }, - { 122, "Change Attribute Definition" }, - { 123, "Schema in Use" }, - { 124, "Remove Keys" }, - { 125, "Clone" }, - { 126, "Multiple Operations Transaction" }, - { 240, "Ping" }, - { 255, "EDirectory Call" }, - { 0, NULL } + { 1, "Resolve Name" }, + { 2, "Read Entry Information" }, + { 3, "Read" }, + { 4, "Compare" }, + { 5, "List" }, + { 6, "Search Entries" }, + { 7, "Add Entry" }, + { 8, "Remove Entry" }, + { 9, "Modify Entry" }, + { 10, "Modify RDN" }, + { 11, "Create Attribute" }, + { 12, "Read Attribute Definition" }, + { 13, "Remove Attribute Definition" }, + { 14, "Define Class" }, + { 15, "Read Class Definition" }, + { 16, "Modify Class Definition" }, + { 17, "Remove Class Definition" }, + { 18, "List Containable Classes" }, + { 19, "Get Effective Rights" }, + { 20, "Add Partition" }, + { 21, "Remove Partition" }, + { 22, "List Partitions" }, + { 23, "Split Partition" }, + { 24, "Join Partitions" }, + { 25, "Add Replica" }, + { 26, "Remove Replica" }, + { 27, "Open Stream" }, + { 28, "Search Filter" }, + { 29, "Create Subordinate Reference" }, + { 30, "Link Replica" }, + { 31, "Change Replica Type" }, + { 32, "Start Update Schema" }, + { 33, "End Update Schema" }, + { 34, "Update Schema" }, + { 35, "Start Update Replica" }, + { 36, "End Update Replica" }, + { 37, "Update Replica" }, + { 38, "Synchronize Partition" }, + { 39, "Synchronize Schema" }, + { 40, "Read Syntaxes" }, + { 41, "Get Replica Root ID" }, + { 42, "Begin Move Entry" }, + { 43, "Finish Move Entry" }, + { 44, "Release Moved Entry" }, + { 45, "Backup Entry" }, + { 46, "Restore Entry" }, + { 47, "Save DIB (Obsolete)" }, + { 48, "Control" }, + { 49, "Remove Backlink" }, + { 50, "Close Iteration" }, + { 51, "Mutate Entry" }, + { 52, "Audit Skulking" }, + { 53, "Get Server Address" }, + { 54, "Set Keys" }, + { 55, "Change Password" }, + { 56, "Verify Password" }, + { 57, "Begin Login" }, + { 58, "Finish Login" }, + { 59, "Begin Authentication" }, + { 60, "Finish Authentication" }, + { 61, "Logout" }, + { 62, "Repair Ring (Obsolete)" }, + { 63, "Repair Timestamps" }, + { 64, "Create Back Link" }, + { 65, "Delete External Reference" }, + { 66, "Rename External Reference" }, + { 67, "Create Queue Entry Directory" }, + { 68, "Remove Queue Entry Directory" }, + { 69, "Merge Entries" }, + { 70, "Change Tree Name" }, + { 71, "Partition Entry Count" }, + { 72, "Check Login Restrictions" }, + { 73, "Start Join" }, + { 74, "Low Level Split" }, + { 75, "Low Level Join" }, + { 76, "Abort Partition Operation" }, + { 77, "Get All Servers" }, + { 78, "Partition Function" }, + { 79, "Read References" }, + { 80, "Inspect Entry" }, + { 81, "Get Remote Entry ID" }, + { 82, "Change Security" }, + { 83, "Check Console Operator" }, + { 84, "Start Move Tree" }, + { 85, "Move Tree" }, + { 86, "End Move Tree" }, + { 87, "Low Level Abort Join" }, + { 88, "Check Security Equivalence" }, + { 89, "Merge Tree" }, + { 90, "Sync External Reference" }, + { 91, "Resend Entry" }, + { 92, "New Schema Epoch" }, + { 93, "Statistics" }, + { 94, "Ping" }, + { 95, "Get Bindery Contexts" }, + { 96, "Monitor Connection" }, + { 97, "Get DS Statistics" }, + { 98, "Reset DS Counters" }, + { 99, "Console" }, + { 100, "Read Stream" }, + { 101, "Write Stream" }, + { 102, "Create Orphan Partition" }, + { 103, "Remove Orphan Partition" }, + { 104, "Link Orphan Partition" }, + { 105, "Set Distributed Reference Link (DRL)" }, + { 106, "Available" }, + { 107, "Available" }, + { 108, "Verify Distributed Reference Link (DRL)" }, + { 109, "Verify Partition" }, + { 110, "Iterator" }, + { 111, "Available" }, + { 112, "Close Stream" }, + { 113, "Available" }, + { 114, "Read Status" }, + { 115, "Partition Sync Status" }, + { 116, "Read Reference Data" }, + { 117, "Write Reference Data" }, + { 118, "Resource Event" }, + { 119, "DIB Request (obsolete)" }, + { 120, "Set Replication Filter" }, + { 121, "Get Replication Filter" }, + { 122, "Change Attribute Definition" }, + { 123, "Schema in Use" }, + { 124, "Remove Keys" }, + { 125, "Clone" }, + { 126, "Multiple Operations Transaction" }, + { 240, "Ping" }, + { 255, "EDirectory Call" }, + { 0, NULL } }; static void ncpstat_set_title(ncpstat_t *ss) { - set_window_title(ss->win, "NCP Service Response Time statistics"); + set_window_title(ss->win, "NCP Service Response Time statistics"); } static void ncpstat_reset(void *pss) { - ncpstat_t *ss=(ncpstat_t *)pss; - - reset_srt_table_data(&ss->ncp_srt_table); - reset_srt_table_data(&ss->func_srt_table); - reset_srt_table_data(&ss->nds_srt_table); - reset_srt_table_data(&ss->sss_srt_table); - reset_srt_table_data(&ss->nmas_srt_table); - reset_srt_table_data(&ss->sub_17_srt_table); - reset_srt_table_data(&ss->sub_21_srt_table); - reset_srt_table_data(&ss->sub_22_srt_table); - reset_srt_table_data(&ss->sub_23_srt_table); - reset_srt_table_data(&ss->sub_32_srt_table); - reset_srt_table_data(&ss->sub_34_srt_table); - reset_srt_table_data(&ss->sub_35_srt_table); - reset_srt_table_data(&ss->sub_36_srt_table); - reset_srt_table_data(&ss->sub_86_srt_table); - reset_srt_table_data(&ss->sub_87_srt_table); - reset_srt_table_data(&ss->sub_89_srt_table); - reset_srt_table_data(&ss->sub_90_srt_table); - reset_srt_table_data(&ss->sub_92_srt_table); - reset_srt_table_data(&ss->sub_94_srt_table); - reset_srt_table_data(&ss->sub_104_srt_table); - reset_srt_table_data(&ss->sub_111_srt_table); - reset_srt_table_data(&ss->sub_114_srt_table); - reset_srt_table_data(&ss->sub_123_srt_table); - reset_srt_table_data(&ss->sub_131_srt_table); - ncpstat_set_title(ss); + ncpstat_t *ss=(ncpstat_t *)pss; + + reset_srt_table_data(&ss->ncp_srt_table); + reset_srt_table_data(&ss->func_srt_table); + reset_srt_table_data(&ss->nds_srt_table); + reset_srt_table_data(&ss->sss_srt_table); + reset_srt_table_data(&ss->nmas_srt_table); + reset_srt_table_data(&ss->sub_17_srt_table); + reset_srt_table_data(&ss->sub_21_srt_table); + reset_srt_table_data(&ss->sub_22_srt_table); + reset_srt_table_data(&ss->sub_23_srt_table); + reset_srt_table_data(&ss->sub_32_srt_table); + reset_srt_table_data(&ss->sub_34_srt_table); + reset_srt_table_data(&ss->sub_35_srt_table); + reset_srt_table_data(&ss->sub_36_srt_table); + reset_srt_table_data(&ss->sub_86_srt_table); + reset_srt_table_data(&ss->sub_87_srt_table); + reset_srt_table_data(&ss->sub_89_srt_table); + reset_srt_table_data(&ss->sub_90_srt_table); + reset_srt_table_data(&ss->sub_92_srt_table); + reset_srt_table_data(&ss->sub_94_srt_table); + reset_srt_table_data(&ss->sub_104_srt_table); + reset_srt_table_data(&ss->sub_111_srt_table); + reset_srt_table_data(&ss->sub_114_srt_table); + reset_srt_table_data(&ss->sub_123_srt_table); + reset_srt_table_data(&ss->sub_131_srt_table); + ncpstat_set_title(ss); } static int ncpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) { - ncpstat_t *ss=(ncpstat_t *)pss; + ncpstat_t *ss=(ncpstat_t *)pss; const ncp_req_hash_value *request_val=(const ncp_req_hash_value *)prv; gchar* tmp_str; - /* if we haven't seen the request, just ignore it */ - if(!request_val || request_val->ncp_rec==0){ - return 0; - } + /* if we haven't seen the request, just ignore it */ + if(!request_val || request_val->ncp_rec==0){ + return 0; + } /* By Group */ tmp_str = val_to_str_wmem(NULL, request_val->ncp_rec->group, ncp_group_vals, "Unknown(%u)"); init_srt_table_row(&ss->ncp_srt_table, request_val->ncp_rec->group, tmp_str); @@ -315,7 +315,7 @@ ncpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const voi add_srt_table_data(&ss->func_srt_table, request_val->ncp_rec->func, &request_val->req_frame_time, pinfo); } /* By Subfunction number */ - if(request_val->ncp_rec->subfunc!=0){ + if(request_val->ncp_rec->subfunc!=0){ if (request_val->ncp_rec->func==17) { init_srt_table_row(&ss->sub_17_srt_table, (request_val->ncp_rec->subfunc), request_val->ncp_rec->name); add_srt_table_data(&ss->sub_17_srt_table, (request_val->ncp_rec->subfunc), &request_val->req_frame_time, pinfo); @@ -392,7 +392,7 @@ ncpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const voi init_srt_table_row(&ss->sub_131_srt_table, (request_val->ncp_rec->subfunc), request_val->ncp_rec->name); add_srt_table_data(&ss->sub_131_srt_table, (request_val->ncp_rec->subfunc), &request_val->req_frame_time, pinfo); } - } + } /* By NDS verb */ if (request_val->ncp_rec->func==0x68) { tmp_str = val_to_str_wmem(NULL, request_val->nds_request_verb, ncp_nds_verb_vals, "Unknown(%u)"); @@ -420,66 +420,66 @@ ncpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const voi static void ncpstat_draw(void *pss) { - ncpstat_t *ss=(ncpstat_t *)pss; - - draw_srt_table_data(&ss->ncp_srt_table); - draw_srt_table_data(&ss->func_srt_table); - draw_srt_table_data(&ss->nds_srt_table); - draw_srt_table_data(&ss->sss_srt_table); - draw_srt_table_data(&ss->nmas_srt_table); - draw_srt_table_data(&ss->sub_17_srt_table); - draw_srt_table_data(&ss->sub_21_srt_table); - draw_srt_table_data(&ss->sub_22_srt_table); - draw_srt_table_data(&ss->sub_23_srt_table); - draw_srt_table_data(&ss->sub_32_srt_table); - draw_srt_table_data(&ss->sub_34_srt_table); - draw_srt_table_data(&ss->sub_35_srt_table); - draw_srt_table_data(&ss->sub_36_srt_table); - draw_srt_table_data(&ss->sub_86_srt_table); - draw_srt_table_data(&ss->sub_87_srt_table); - draw_srt_table_data(&ss->sub_89_srt_table); - draw_srt_table_data(&ss->sub_90_srt_table); - draw_srt_table_data(&ss->sub_92_srt_table); - draw_srt_table_data(&ss->sub_94_srt_table); - draw_srt_table_data(&ss->sub_104_srt_table); - draw_srt_table_data(&ss->sub_111_srt_table); - draw_srt_table_data(&ss->sub_114_srt_table); - draw_srt_table_data(&ss->sub_123_srt_table); - draw_srt_table_data(&ss->sub_131_srt_table); + ncpstat_t *ss=(ncpstat_t *)pss; + + draw_srt_table_data(&ss->ncp_srt_table); + draw_srt_table_data(&ss->func_srt_table); + draw_srt_table_data(&ss->nds_srt_table); + draw_srt_table_data(&ss->sss_srt_table); + draw_srt_table_data(&ss->nmas_srt_table); + draw_srt_table_data(&ss->sub_17_srt_table); + draw_srt_table_data(&ss->sub_21_srt_table); + draw_srt_table_data(&ss->sub_22_srt_table); + draw_srt_table_data(&ss->sub_23_srt_table); + draw_srt_table_data(&ss->sub_32_srt_table); + draw_srt_table_data(&ss->sub_34_srt_table); + draw_srt_table_data(&ss->sub_35_srt_table); + draw_srt_table_data(&ss->sub_36_srt_table); + draw_srt_table_data(&ss->sub_86_srt_table); + draw_srt_table_data(&ss->sub_87_srt_table); + draw_srt_table_data(&ss->sub_89_srt_table); + draw_srt_table_data(&ss->sub_90_srt_table); + draw_srt_table_data(&ss->sub_92_srt_table); + draw_srt_table_data(&ss->sub_94_srt_table); + draw_srt_table_data(&ss->sub_104_srt_table); + draw_srt_table_data(&ss->sub_111_srt_table); + draw_srt_table_data(&ss->sub_114_srt_table); + draw_srt_table_data(&ss->sub_123_srt_table); + draw_srt_table_data(&ss->sub_131_srt_table); } static void win_destroy_cb(GtkWindow *win _U_, gpointer data) { - ncpstat_t *ss=(ncpstat_t *)data; - - remove_tap_listener(ss); - - free_srt_table_data(&ss->ncp_srt_table); - free_srt_table_data(&ss->func_srt_table); - free_srt_table_data(&ss->nds_srt_table); - free_srt_table_data(&ss->sss_srt_table); - free_srt_table_data(&ss->nmas_srt_table); - free_srt_table_data(&ss->sub_17_srt_table); - free_srt_table_data(&ss->sub_21_srt_table); - free_srt_table_data(&ss->sub_22_srt_table); - free_srt_table_data(&ss->sub_23_srt_table); - free_srt_table_data(&ss->sub_32_srt_table); - free_srt_table_data(&ss->sub_34_srt_table); - free_srt_table_data(&ss->sub_35_srt_table); - free_srt_table_data(&ss->sub_36_srt_table); - free_srt_table_data(&ss->sub_86_srt_table); - free_srt_table_data(&ss->sub_87_srt_table); - free_srt_table_data(&ss->sub_89_srt_table); - free_srt_table_data(&ss->sub_90_srt_table); - free_srt_table_data(&ss->sub_92_srt_table); - free_srt_table_data(&ss->sub_94_srt_table); - free_srt_table_data(&ss->sub_104_srt_table); - free_srt_table_data(&ss->sub_111_srt_table); - free_srt_table_data(&ss->sub_114_srt_table); - free_srt_table_data(&ss->sub_123_srt_table); - free_srt_table_data(&ss->sub_131_srt_table); - g_free(ss); + ncpstat_t *ss=(ncpstat_t *)data; + + remove_tap_listener(ss); + + free_srt_table_data(&ss->ncp_srt_table); + free_srt_table_data(&ss->func_srt_table); + free_srt_table_data(&ss->nds_srt_table); + free_srt_table_data(&ss->sss_srt_table); + free_srt_table_data(&ss->nmas_srt_table); + free_srt_table_data(&ss->sub_17_srt_table); + free_srt_table_data(&ss->sub_21_srt_table); + free_srt_table_data(&ss->sub_22_srt_table); + free_srt_table_data(&ss->sub_23_srt_table); + free_srt_table_data(&ss->sub_32_srt_table); + free_srt_table_data(&ss->sub_34_srt_table); + free_srt_table_data(&ss->sub_35_srt_table); + free_srt_table_data(&ss->sub_36_srt_table); + free_srt_table_data(&ss->sub_86_srt_table); + free_srt_table_data(&ss->sub_87_srt_table); + free_srt_table_data(&ss->sub_89_srt_table); + free_srt_table_data(&ss->sub_90_srt_table); + free_srt_table_data(&ss->sub_92_srt_table); + free_srt_table_data(&ss->sub_94_srt_table); + free_srt_table_data(&ss->sub_104_srt_table); + free_srt_table_data(&ss->sub_111_srt_table); + free_srt_table_data(&ss->sub_114_srt_table); + free_srt_table_data(&ss->sub_123_srt_table); + free_srt_table_data(&ss->sub_131_srt_table); + g_free(ss); } @@ -505,8 +505,8 @@ gtk_ncpstat_init(const char *opt_arg, void *userdata _U_) ss=(ncpstat_t *)g_malloc(sizeof(ncpstat_t)); - ss->win = dlg_window_new("ncp-stat"); /* transient_for top_level */ - gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE); + ss->win = dlg_window_new("ncp-stat"); /* transient_for top_level */ + gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE); gtk_window_set_default_size(GTK_WINDOW(ss->win), 300, 400); ncpstat_set_title(ss); @@ -710,21 +710,34 @@ gtk_ncpstat_init(const char *opt_arg, void *userdata _U_) } static tap_param ncp_stat_params[] = { - { PARAM_FILTER, "filter", "Filter", NULL, TRUE } + { PARAM_FILTER, "filter", "Filter", NULL, TRUE } }; static tap_param_dlg ncp_stat_dlg = { - "NCP SRT Statistics", - "ncp,srt", - gtk_ncpstat_init, - -1, - G_N_ELEMENTS(ncp_stat_params), - ncp_stat_params + "NCP SRT Statistics", + "ncp,srt", + gtk_ncpstat_init, + -1, + G_N_ELEMENTS(ncp_stat_params), + ncp_stat_params }; void register_tap_listener_gtkncpstat(void) { - register_param_stat(&ncp_stat_dlg, "NCP", - REGISTER_STAT_GROUP_RESPONSE_TIME); + register_param_stat(&ncp_stat_dlg, "NCP", + REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/packet_history.c b/ui/gtk/packet_history.c index 65a3fee8ae..3b7dfefc0d 100644 --- a/ui/gtk/packet_history.c +++ b/ui/gtk/packet_history.c @@ -179,3 +179,16 @@ void history_back_cb(GtkWidget *widget _U_, gpointer data _U_) { packet_history_back(); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 28d4eeb016..1515da20af 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -1727,3 +1727,16 @@ query_packet_list_tooltip_cb(GtkWidget *widget, gint x, gint y, gboolean keyboar return result; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index 9537d2da77..cddc2778aa 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -1252,3 +1252,16 @@ packet_list_get_widest_column_string(PacketList *packet_list, gint col) return widest_column_str; } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index b5149b9bad..93caff2cad 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.c @@ -1444,3 +1444,16 @@ select_bytes_view (GtkWidget *w _U_, gpointer data _U_, gint view) redraw_packet_bytes_all(); } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index 16cfe774f9..c92dccf5d2 100644 --- a/ui/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -159,10 +159,10 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_) if (!ret) { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(save_as_w), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - "%s", error->message); + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "%s", error->message); gtk_dialog_run(GTK_DIALOG(msg_dialog)); gtk_widget_destroy(msg_dialog); continue; @@ -172,3 +172,16 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_) return; } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c index 4b8cae4aee..87fcf133ad 100644 --- a/ui/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -384,7 +384,7 @@ column_list_delete_cb(GtkWidget *w _U_, gpointer data) { if (gtk_tree_selection_get_selected(sel, &model, &iter)) { gtk_tree_model_get(model, &iter, DATA_COLUMN, &clp, -1); - column_prefs_remove_link(clp); + column_prefs_remove_link(clp); /* Change the row selection to the next row (if available) or */ /* the previous row (if available). If there's only one row */ @@ -757,3 +757,16 @@ column_prefs_apply(GtkWidget *w _U_) void column_prefs_destroy(GtkWidget *w _U_) { } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c index 7ba21e5406..8ce448c222 100644 --- a/ui/gtk/prefs_layout.c +++ b/ui/gtk/prefs_layout.c @@ -65,8 +65,8 @@ typedef struct { static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, int i, layout_pane_content_e content) { - GtkWidget *radio_vb, *radio_lb; - GtkWidget *radio_none_rb, *radio_plist_rb, *radio_pdetails_rb, *radio_pbytes_rb; + GtkWidget *radio_vb, *radio_lb; + GtkWidget *radio_none_rb, *radio_plist_rb, *radio_pdetails_rb, *radio_pbytes_rb; char buf[64]; @@ -120,20 +120,20 @@ static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, int i, layout_pa static void layout_type_changed_cb (GtkToggleButton * togglebutton, gpointer user_data) { - GtkWidget ** layout_type_buttons = (GtkWidget**) user_data; - static gboolean dampen_feedback_loop = FALSE; - - if (!dampen_feedback_loop) { - int i; - dampen_feedback_loop = TRUE; - for (i=0; i<LAYOUT_QTY; ++i) { - GtkToggleButton * tb = GTK_TOGGLE_BUTTON(layout_type_buttons[i]); - gboolean active = togglebutton==tb; - if (gtk_toggle_button_get_active(tb) != active) - gtk_toggle_button_set_active (tb, active); - } - dampen_feedback_loop = FALSE; - } + GtkWidget ** layout_type_buttons = (GtkWidget**) user_data; + static gboolean dampen_feedback_loop = FALSE; + + if (!dampen_feedback_loop) { + int i; + dampen_feedback_loop = TRUE; + for (i=0; i<LAYOUT_QTY; ++i) { + GtkToggleButton * tb = GTK_TOGGLE_BUTTON(layout_type_buttons[i]); + gboolean active = togglebutton==tb; + if (gtk_toggle_button_get_active(tb) != active) + gtk_toggle_button_set_active (tb, active); + } + dampen_feedback_loop = FALSE; + } } @@ -176,7 +176,7 @@ static void layout_pane_set_content(GtkWidget * radio_vb, layout_pane_content_e static void layout_set(GtkWidget * main_vb, layout_t *layout) { - GtkWidget *radio_vb; + GtkWidget *radio_vb; GtkWidget ** layout_type_buttons = (GtkWidget **)g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(layout_type_buttons[layout->type - 1]), TRUE); @@ -190,7 +190,7 @@ static void layout_set(GtkWidget * main_vb, layout_t *layout) { } static void layout_get(GtkWidget * main_vb, layout_t *layout_out) { - GtkWidget *radio_vb; + GtkWidget *radio_vb; GtkWidget ** layout_type_buttons = (GtkWidget **)g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); int i; @@ -212,33 +212,33 @@ static void layout_get(GtkWidget * main_vb, layout_t *layout_out) { static void layout_validate(layout_t *layout, int pane) { switch (pane) { - case 1: - if(layout->content[1] == layout->content[0]) { - layout->content[1] = layout_pane_content_none; - } - if(layout->content[2] == layout->content[0]) { - layout->content[2] = layout_pane_content_none; - } - break; - case 2: - if(layout->content[0] == layout->content[1]) { - layout->content[0] = layout_pane_content_none; - } - if(layout->content[2] == layout->content[1]) { - layout->content[2] = layout_pane_content_none; - } - break; - case 3: - if(layout->content[0] == layout->content[2]) { - layout->content[0] = layout_pane_content_none; - } - if(layout->content[1] == layout->content[2]) { - layout->content[1] = layout_pane_content_none; - } - break; - default: - /* If the user selects "None" we're not going to intervene. */ - break; + case 1: + if(layout->content[1] == layout->content[0]) { + layout->content[1] = layout_pane_content_none; + } + if(layout->content[2] == layout->content[0]) { + layout->content[2] = layout_pane_content_none; + } + break; + case 2: + if(layout->content[0] == layout->content[1]) { + layout->content[0] = layout_pane_content_none; + } + if(layout->content[2] == layout->content[1]) { + layout->content[2] = layout_pane_content_none; + } + break; + case 3: + if(layout->content[0] == layout->content[2]) { + layout->content[0] = layout_pane_content_none; + } + if(layout->content[1] == layout->content[2]) { + layout->content[1] = layout_pane_content_none; + } + break; + default: + /* If the user selects "None" we're not going to intervene. */ + break; } } @@ -269,7 +269,7 @@ layout_defaults_cb (GtkWidget * w _U_, gpointer data) } #define ALTERN_COLORS_KEY "altern_colors" -#define HEX_DUMP_HIGHLIGHT_STYLE_KEY "hex_dump_highlight_style" +#define HEX_DUMP_HIGHLIGHT_STYLE_KEY "hex_dump_highlight_style" #define FILTER_TOOLBAR_PLACEMENT_KEY "filter_toolbar_show_in_statusbar" #define GUI_TOOLBAR_STYLE_KEY "toolbar_style" #define GUI_FILTER_TOOLBAR_STYLE_KEY "filter_toolbar_style" @@ -300,17 +300,17 @@ static const enum_val_t toolbar_style_vals[] = { GtkWidget* layout_prefs_show(void) { - GtkWidget *main_vb, *button_hb, *type_tb; - GtkWidget *pane_fr, *pane_vb; - GtkWidget *radio_hb, *radio_vb; - GtkWidget *default_vb, *default_bt; + GtkWidget *main_vb, *button_hb, *type_tb; + GtkWidget *pane_fr, *pane_vb; + GtkWidget *radio_hb, *radio_vb; + GtkWidget *default_vb, *default_bt; GtkWidget *main_grid, *hbox; - GtkWidget *altern_colors_om; - GtkWidget *highlight_style_om; - GtkWidget *toolbar_style_om; - GtkWidget *filter_toolbar_style_om; - GtkWidget *filter_toolbar_placement_om; - GtkWidget *window_title_te; + GtkWidget *altern_colors_om; + GtkWidget *highlight_style_om; + GtkWidget *toolbar_style_om; + GtkWidget *filter_toolbar_style_om; + GtkWidget *filter_toolbar_placement_om; + GtkWidget *window_title_te; GtkWidget ** layout_type_buttons = (GtkWidget **)g_malloc (sizeof(GtkWidget*) * LAYOUT_QTY); GtkWidget *layout_pixbufs[LAYOUT_QTY]; @@ -348,15 +348,15 @@ layout_prefs_show(void) layout_pixbufs[5] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_inline(-1, layout_6_pb_data, FALSE, NULL)); for (i=0; i<LAYOUT_QTY; ++i) { - type_tb = gtk_toggle_button_new (); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(type_tb), - (layout_type_e)(i + 1) == prefs.gui_layout_type); + type_tb = gtk_toggle_button_new (); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(type_tb), + (layout_type_e)(i + 1) == prefs.gui_layout_type); - gtk_container_add (GTK_CONTAINER(type_tb), layout_pixbufs[i]); + gtk_container_add (GTK_CONTAINER(type_tb), layout_pixbufs[i]); - g_signal_connect(type_tb, "toggled", G_CALLBACK(layout_type_changed_cb), layout_type_buttons); - layout_type_buttons[i] = type_tb; - gtk_box_pack_start (GTK_BOX(button_hb), type_tb, TRUE, FALSE, 0); + g_signal_connect(type_tb, "toggled", G_CALLBACK(layout_type_changed_cb), layout_type_buttons); + layout_type_buttons[i] = type_tb; + gtk_box_pack_start (GTK_BOX(button_hb), type_tb, TRUE, FALSE, 0); } g_object_set_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY, layout_type_buttons); @@ -497,3 +497,16 @@ layout_prefs_destroy(GtkWidget *main_vb) g_free(layout_type_buttons); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c index 0ce4a36f68..d3f9b5deb7 100644 --- a/ui/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -1165,3 +1165,16 @@ print_destroy_cb(GtkWidget *win, gpointer user_data) /* Note that we no longer have a "Print" dialog box. */ *((gpointer *) user_data) = NULL; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c index 43a3fdc9eb..7e03ddd8eb 100644 --- a/ui/gtk/profile_dlg.c +++ b/ui/gtk/profile_dlg.c @@ -1000,3 +1000,16 @@ profile_dialog_cb(GtkWidget *w _U_) global_profile_w = profile_dialog_new(); } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index 5a1327e5ce..670662b91f 100644 --- a/ui/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.c @@ -32,7 +32,7 @@ #include "ui/gtk/gui_utils.h" -#define PROG_BAR_KEY "progress_bar" +#define PROG_BAR_KEY "progress_bar" static gboolean delete_event_cb(GtkWidget *w, GdkEvent *event, gpointer data); static void stop_cb(GtkWidget *w, gpointer data); @@ -41,15 +41,15 @@ static void stop_cb(GtkWidget *w, gpointer data); * Define the structure describing a progress dialog. */ struct progdlg { - GtkWidget *dlg_w; /* top-level window widget */ - GTimeVal start_time; - GTimeVal last_time; /* last time it was updated */ - - GtkLabel *status_lb; - GtkLabel *elapsed_lb; - GtkLabel *time_left_lb; - GtkLabel *percentage_lb; - gchar *title; + GtkWidget *dlg_w; /* top-level window widget */ + GTimeVal start_time; + GTimeVal last_time; /* last time it was updated */ + + GtkLabel *status_lb; + GtkLabel *elapsed_lb; + GtkLabel *time_left_lb; + GtkLabel *percentage_lb; + gchar *title; }; /* @@ -227,8 +227,8 @@ create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title progdlg_t * delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, - const gchar *item_title, gboolean terminate_is_stop, - gboolean *stop_flag, const GTimeVal *start_time, gfloat progress) + const gchar *item_title, gboolean terminate_is_stop, + gboolean *stop_flag, const GTimeVal *start_time, gfloat progress) { GTimeVal time_now; gdouble delta_time; @@ -291,7 +291,7 @@ delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_t * Flush out the dialog so we don't see an "empty" one until first update. */ while (gtk_events_pending()) - gtk_main_iteration(); + gtk_main_iteration(); /* set dialog start_time to the start of processing, not box creation */ dlg->start_time = *start_time; @@ -308,10 +308,10 @@ delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_t static gboolean delete_event_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) { - gboolean *stop_flag = (gboolean *) data; + gboolean *stop_flag = (gboolean *) data; - *stop_flag = TRUE; - return TRUE; + *stop_flag = TRUE; + return TRUE; } /* @@ -323,9 +323,9 @@ delete_event_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) static void stop_cb(GtkWidget *w _U_, gpointer data) { - gboolean *stop_flag = (gboolean *) data; + gboolean *stop_flag = (gboolean *) data; - *stop_flag = TRUE; + *stop_flag = TRUE; } /* @@ -334,65 +334,65 @@ stop_cb(GtkWidget *w _U_, gpointer data) void update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status) { - GtkWidget *dlg_w = dlg->dlg_w; - GtkWidget *prog_bar; - GTimeVal time_now; - gdouble delta_time; - gulong ul_left; - gulong ul_elapsed; - gulong ul_percentage; - gchar tmp[100]; + GtkWidget *dlg_w = dlg->dlg_w; + GtkWidget *prog_bar; + GTimeVal time_now; + gdouble delta_time; + gulong ul_left; + gulong ul_elapsed; + gulong ul_percentage; + gchar tmp[100]; - /* calculate some timing values */ - g_get_current_time(&time_now); + /* calculate some timing values */ + g_get_current_time(&time_now); - delta_time = (time_now.tv_sec - dlg->last_time.tv_sec) * 1e6 + - time_now.tv_usec - dlg->last_time.tv_usec; + delta_time = (time_now.tv_sec - dlg->last_time.tv_sec) * 1e6 + + time_now.tv_usec - dlg->last_time.tv_usec; - /* after the first time don't update more than every 100ms */ - if (dlg->last_time.tv_sec && delta_time < 100*1000) - return; + /* after the first time don't update more than every 100ms */ + if (dlg->last_time.tv_sec && delta_time < 100*1000) + return; - dlg->last_time = time_now; - delta_time = (time_now.tv_sec - dlg->start_time.tv_sec) * 1e6 + - time_now.tv_usec - dlg->start_time.tv_usec; + dlg->last_time = time_now; + delta_time = (time_now.tv_sec - dlg->start_time.tv_sec) * 1e6 + + time_now.tv_usec - dlg->start_time.tv_usec; - ul_percentage = (gulong) (percentage * 100); - ul_elapsed = (gulong) (delta_time / 1000 / 1000); + ul_percentage = (gulong) (percentage * 100); + ul_elapsed = (gulong) (delta_time / 1000 / 1000); - /* update labels */ - g_snprintf(tmp, sizeof(tmp), "%lu%% of %s", ul_percentage, dlg->title); - gtk_window_set_title(GTK_WINDOW(dlg_w), tmp); + /* update labels */ + g_snprintf(tmp, sizeof(tmp), "%lu%% of %s", ul_percentage, dlg->title); + gtk_window_set_title(GTK_WINDOW(dlg_w), tmp); - gtk_label_set_text(dlg->status_lb, status); + gtk_label_set_text(dlg->status_lb, status); - g_snprintf(tmp, sizeof(tmp), "%lu%%", ul_percentage); - gtk_label_set_text(dlg->percentage_lb, tmp); + g_snprintf(tmp, sizeof(tmp), "%lu%%", ul_percentage); + gtk_label_set_text(dlg->percentage_lb, tmp); - g_snprintf(tmp, sizeof(tmp), "%02lu:%02lu", ul_elapsed / 60, - ul_elapsed % 60); - gtk_label_set_text(dlg->elapsed_lb, tmp); + g_snprintf(tmp, sizeof(tmp), "%02lu:%02lu", ul_elapsed / 60, + ul_elapsed % 60); + gtk_label_set_text(dlg->elapsed_lb, tmp); - /* show "Time Left" only, - * if at least 5% and 3 seconds running (to get a useful estimation) */ - if (ul_percentage >= 5 && delta_time >= 3 * 1e6) { - ul_left = (gulong) ((delta_time / percentage - delta_time) / 1000 / 1000); + /* show "Time Left" only, + * if at least 5% and 3 seconds running (to get a useful estimation) */ + if (ul_percentage >= 5 && delta_time >= 3 * 1e6) { + ul_left = (gulong) ((delta_time / percentage - delta_time) / 1000 / 1000); - g_snprintf(tmp, sizeof(tmp), "%02lu:%02lu", ul_left / 60, - ul_left % 60); - gtk_label_set_text(dlg->time_left_lb, tmp); - } + g_snprintf(tmp, sizeof(tmp), "%02lu:%02lu", ul_left / 60, + ul_left % 60); + gtk_label_set_text(dlg->time_left_lb, tmp); + } - /* update progress bar */ - prog_bar = (GtkWidget *)g_object_get_data(G_OBJECT(dlg_w), PROG_BAR_KEY); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(prog_bar), percentage); + /* update progress bar */ + prog_bar = (GtkWidget *)g_object_get_data(G_OBJECT(dlg_w), PROG_BAR_KEY); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(prog_bar), percentage); - /* - * Flush out the update and process any input events. - */ - while (gtk_events_pending()) - gtk_main_iteration(); + /* + * Flush out the update and process any input events. + */ + while (gtk_events_pending()) + gtk_main_iteration(); } /* @@ -407,3 +407,16 @@ destroy_progress_dlg(progdlg_t *dlg) g_free(dlg->title); g_free(dlg); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c index 71a0d3777f..79cafd4b0a 100644 --- a/ui/gtk/proto_help.c +++ b/ui/gtk/proto_help.c @@ -685,3 +685,16 @@ static void ph_logging_handler(const gchar *domain _U_, GLogLevelFlags level, co } #endif /* PH_DEBUG_LOG */ #endif /* MAIN_MENU_USE_UIMANAGER */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c index c13d9c3575..08380c03e9 100644 --- a/ui/gtk/proto_hier_tree_model.c +++ b/ui/gtk/proto_hier_tree_model.c @@ -486,3 +486,15 @@ proto_hier_tree_model_new(void) return model; } +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c index 9f38132437..44d7a125b1 100644 --- a/ui/gtk/proto_tree_model.c +++ b/ui/gtk/proto_tree_model.c @@ -471,3 +471,16 @@ proto_tree_model_new(proto_tree *protocol_tree, int display_hidden_proto_items) return model; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 3909929c2c..848375aa7a 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.c @@ -57,7 +57,7 @@ typedef enum _radius_category { RADIUS_CAT_DISCONNECT, RADIUS_CAT_COA, RADIUS_CAT_OTHERS, - RADIUS_CAT_NUM_TIMESTATS + RADIUS_CAT_NUM_TIMESTATS } radius_category; /* Summary of response-time calculations*/ @@ -242,8 +242,8 @@ radiusstat_draw(void *prs) GtkTreeIter iter; /* clear list before printing */ - store = GTK_LIST_STORE(gtk_tree_view_get_model(rs->table)); - gtk_list_store_clear(store); + store = GTK_LIST_STORE(gtk_tree_view_get_model(rs->table)); + gtk_list_store_clear(store); for(i=0; i<RADIUS_CAT_NUM_TIMESTATS; i++) { /* nothing seen, nothing to do */ @@ -381,3 +381,16 @@ register_tap_listener_gtkradiusstat(void) register_param_stat(&radius_srt_dlg, "RADIUS", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c index aa5b1f514c..56cb90dc8c 100644 --- a/ui/gtk/range_utils.c +++ b/ui/gtk/range_utils.c @@ -719,3 +719,16 @@ GtkWidget *range_new(packet_range_t *range, gboolean saving) return range_grid; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index 43163d2a54..6aa476f05e 100644 --- a/ui/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -1666,3 +1666,16 @@ register_tap_listener_rlc_lte_stat(void) { register_param_stat(&rlc_lte_stat_dlg, "_RLC", REGISTER_STAT_GROUP_TELEPHONY_LTE); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c index 5b117bfea8..47b11bcfad 100644 --- a/ui/gtk/rpc_progs.c +++ b/ui/gtk/rpc_progs.c @@ -436,3 +436,16 @@ register_tap_listener_gtkrpcprogs(void) { register_stat_tap_ui(&rpcprogs_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index 0247cba7a9..6659390df7 100644 --- a/ui/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -535,3 +535,16 @@ register_tap_listener_gtkrpcstat(void) register_stat_tap_ui(&rpcstat_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 7b307d8a0e..6945d50c6f 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -777,8 +777,8 @@ rtp_packet_save_payload(tap_rtp_save_info_t *saveinfo, * of the RTP data */ data = rtpinfo->info_data + rtpinfo->info_payload_offset; nchars = fwrite(data, sizeof(unsigned char), - (rtpinfo->info_payload_len - rtpinfo->info_padding_count), - saveinfo->fp); + (rtpinfo->info_payload_len - rtpinfo->info_padding_count), + saveinfo->fp); if (nchars != (rtpinfo->info_payload_len - rtpinfo->info_padding_count)) { /* Write error or short write */ saveinfo->saved = FALSE; @@ -828,7 +828,7 @@ on_destroy(GtkWidget *win _U_, user_data_t *user_data) window_destroy(user_data->dlg.dialog_graph.window); /* disable the "switch_page" signal in the dlg, otherwise will be called when the windows - * is destroyed and cause an exception using GTK1*/ + * is destroyed and cause an exception using GTK1*/ g_signal_handler_disconnect(user_data->dlg.notebook, user_data->dlg.notebook_signal_id); g_free(user_data->f_tempname); @@ -1229,8 +1229,8 @@ dialog_graph_draw(user_data_t* user_data) left_x_border + 0.5, user_data->dlg.dialog_graph.surface_height-bottom_y_border + 1.5); cairo_line_to(cr, - user_data->dlg.dialog_graph.surface_width - right_x_border + 1.5, - user_data->dlg.dialog_graph.surface_height - bottom_y_border + 1.5); + user_data->dlg.dialog_graph.surface_width - right_x_border + 1.5, + user_data->dlg.dialog_graph.surface_height - bottom_y_border + 1.5); cairo_stroke(cr); cairo_destroy(cr); @@ -4072,3 +4072,16 @@ register_tap_listener_rtp_analysis(void) { register_stat_tap_ui(&rtp_analysis_ui, NULL); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 94003759d5..e8fb244621 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -1101,3 +1101,16 @@ sctp_analyse_start(GtkAction *action _U_, gpointer user_data _U_) } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c index 41456dd8bc..c7f22a00e1 100644 --- a/ui/gtk/sctp_byte_graph_dlg.c +++ b/ui/gtk/sctp_byte_graph_dlg.c @@ -1534,3 +1534,16 @@ void create_byte_graph(guint16 dir, struct sctp_analyse* userdata) } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index c2f0ac763a..e33f6af3e2 100644 --- a/ui/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -182,8 +182,8 @@ sctpstat_draw(void *phs) /* Now print Message and Reason Counter Table */ /* clear list before printing */ /* XXX use an iter for new/modified ? */ - store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table)); - gtk_list_store_clear(store); + store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table)); + gtk_list_store_clear(store); for(tmp = list ; tmp ; tmp=tmp->next) { src_addr = (char*)address_to_str(NULL, &tmp->src); @@ -322,3 +322,16 @@ register_tap_listener_sctpstat(void) register_param_stat(&sctp_stat_dlg, "Chunk Counter", REGISTER_STAT_GROUP_TELEPHONY_SCTP); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c index d9ddbf8057..7308ee01bf 100644 --- a/ui/gtk/sctp_chunk_stat_dlg.c +++ b/ui/gtk/sctp_chunk_stat_dlg.c @@ -815,3 +815,16 @@ sctp_chunk_stat_dlg_show(unsigned int direction, struct sctp_analyse* userdata) gtk_sctpstat_dlg(u_data, direction); sctp_chunk_stat_dlg_update(u_data,direction); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c index dd79b5d95e..e9c72137f9 100644 --- a/ui/gtk/sctp_error_dlg.c +++ b/ui/gtk/sctp_error_dlg.c @@ -149,16 +149,16 @@ GtkWidget *create_list(void) static void add_to_clist(sctp_error_info_t* errinfo) { - GtkListStore *list_store = NULL; - GtkTreeIter iter; + GtkListStore *list_store = NULL; + GtkTreeIter iter; - list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (clist))); /* Get store */ + list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (clist))); /* Get store */ - gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, - FRAME_COLUMN, errinfo->frame_number, - TEXT_COLUMN, errinfo->chunk_info, - INFO_COLUMN, errinfo->info_text, - -1); + gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, + FRAME_COLUMN, errinfo->frame_number, + TEXT_COLUMN, errinfo->chunk_info, + INFO_COLUMN, errinfo->info_text, + -1); } static void @@ -295,3 +295,16 @@ void sctp_error_dlg_show(sctp_assoc_info_t* assoc) simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No errors found."); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index 4ba1b6a36c..f702a68491 100644 --- a/ui/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.c @@ -1870,3 +1870,16 @@ rint (double x) return(i); } #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index 9a3740d827..f88abf5061 100644 --- a/ui/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.c @@ -695,3 +695,16 @@ GtkWidget *get_stat_dlg(void) return sctp_stat_dlg; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index c3eaf8ef91..0915707c4d 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -249,45 +249,45 @@ static const char *ui_desc_service_resp_t_filter_popup = * const gchar *tooltip; * GCallback callback; * } GtkActionEntry; - * const gchar *name; The name of the action. - * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. - * const gchar *label; The label for the action. This field should typically be marked for translation, - * see gtk_action_group_set_translation_domain(). - * If label is NULL, the label of the stock item with id stock_id is used. - * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). - * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * const gchar *name; The name of the action. + * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme. + * const gchar *label; The label for the action. This field should typically be marked for translation, * see gtk_action_group_set_translation_domain(). - * GCallback callback; The function to call when the action is activated. + * If label is NULL, the label of the stock item with id stock_id is used. + * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse(). + * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation, + * see gtk_action_group_set_translation_domain(). + * GCallback callback; The function to call when the action is activated. * */ static const GtkActionEntry service_resp_t__popup_entries[] = { - { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, - { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, - { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, - { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, - { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, - { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, - { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(apply_as_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, - { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, - { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(prep_as_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, - { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, - { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, - { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, - { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, - { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, - { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, - { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, - { "/Colorize Procedure/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(color_selected_cb) }, - { "/Colorize Procedure/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(color_not_selected_cb) }, + { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL }, + { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL }, + { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL }, + { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL }, + { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL }, + { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL }, + { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(apply_as_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) }, + { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) }, + { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " not Selected", G_CALLBACK(prep_as_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) }, + { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) }, + { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) }, + { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) }, + { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) }, + { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) }, + { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) }, + { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) }, + { "/Colorize Procedure/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(color_selected_cb) }, + { "/Colorize Procedure/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(color_not_selected_cb) }, }; static void @@ -309,12 +309,12 @@ srt_create_popup_menu(srt_stat_table *rst) 0); /* the position at which the group will be inserted */ gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_service_resp_t_filter_popup, -1, &error); if (error != NULL) - { - fprintf (stderr, "Warning: building service response time filter popup failed: %s\n", - error->message); - g_error_free (error); - error = NULL; - } + { + fprintf (stderr, "Warning: building service response time filter popup failed: %s\n", + error->message); + g_error_free (error); + error = NULL; + } rst->menu = gtk_ui_manager_get_widget(ui_manager, "/ServiceRespTFilterPopup"); g_signal_connect(rst->table, "button_press_event", G_CALLBACK(srt_show_popup_menu_cb), rst); @@ -389,7 +389,7 @@ srt_time_sort_func(GtkTreeModel *model, } /* - XXX Resizable columns are ugly when there's more than on table cf. SMB +XXX Resizable columns are ugly when there's more than on table cf. SMB */ void init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, const char *filter_string) @@ -614,3 +614,16 @@ free_srt_table_data(srt_stat_table *rst) rst->num_procs=0; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c index 90b9254563..cc43659b1a 100644 --- a/ui/gtk/simple_dialog.c +++ b/ui/gtk/simple_dialog.c @@ -364,40 +364,40 @@ simple_dialog_cancel_cb(GtkWidget *w, gpointer win) { void simple_dialog_close(gpointer dialog) { - window_destroy(GTK_WIDGET(dialog)); + window_destroy(GTK_WIDGET(dialog)); } void simple_dialog_set_cb(gpointer dialog, simple_dialog_cb_t callback_fct, gpointer data) { - g_object_set_data(G_OBJECT(GTK_WIDGET(dialog)), CALLBACK_FCT_KEY, callback_fct); - g_object_set_data(G_OBJECT(GTK_WIDGET(dialog)), CALLBACK_DATA_KEY, data); + g_object_set_data(G_OBJECT(GTK_WIDGET(dialog)), CALLBACK_FCT_KEY, callback_fct); + g_object_set_data(G_OBJECT(GTK_WIDGET(dialog)), CALLBACK_DATA_KEY, data); } void simple_dialog_check_set(gpointer dialog, const gchar *text) { - GtkWidget *ask_cb = (GtkWidget *)g_object_get_data(G_OBJECT(dialog), CHECK_BUTTON); + GtkWidget *ask_cb = (GtkWidget *)g_object_get_data(G_OBJECT(dialog), CHECK_BUTTON); - gtk_button_set_label(GTK_BUTTON(ask_cb), text); - gtk_widget_show(ask_cb); + gtk_button_set_label(GTK_BUTTON(ask_cb), text); + gtk_widget_show(ask_cb); } gboolean simple_dialog_check_get(gpointer dialog) { - GtkWidget *ask_cb = (GtkWidget *)g_object_get_data(G_OBJECT(GTK_WIDGET(dialog)), CHECK_BUTTON); + GtkWidget *ask_cb = (GtkWidget *)g_object_get_data(G_OBJECT(GTK_WIDGET(dialog)), CHECK_BUTTON); - return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_cb)); + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_cb)); } const char * simple_dialog_primary_start(void) { - return "<span weight=\"bold\" size=\"larger\">"; + return "<span weight=\"bold\" size=\"larger\">"; } const char * simple_dialog_primary_end(void) { - return "</span>"; + return "</span>"; } char * @@ -519,3 +519,16 @@ simple_error_message_box(const char *msg_format, ...) do_simple_message_box(ESD_TYPE_ERROR, NULL, NULL, msg_format, ap); va_end(ap); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c index acfd42b99b..7496be1d09 100644 --- a/ui/gtk/sip_stat.c +++ b/ui/gtk/sip_stat.c @@ -689,3 +689,16 @@ register_tap_listener_gtksipstat(void) { register_param_stat(&sip_stat_dlg, "_SIP", REGISTER_STAT_GROUP_TELEPHONY); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index 86ac292290..a774121eb8 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -212,3 +212,16 @@ register_tap_listener_gtksmb2stat(void) register_param_stat(&smb2_stat_dlg, "SMB2", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c index 4613d0ed95..9724119b64 100644 --- a/ui/gtk/smb_stat.c +++ b/ui/gtk/smb_stat.c @@ -245,3 +245,16 @@ register_tap_listener_gtksmbstat(void) register_param_stat(&smb_stat_dlg, "SMB", REGISTER_STAT_GROUP_RESPONSE_TIME); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index ba32057eb3..aa00b340cd 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -21,13 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - /* stats_tree modifications by Deon van der Westhuysen, November 2013 - * support for - * - sorting by column, - * - display a generic number of columns(driven by stats_tree.c - * - copy to clipboard - * - export to text, CSV or XML file - */ +/* stats_tree modifications by Deon van der Westhuysen, November 2013 + * support for + * - sorting by column, + * - display a generic number of columns(driven by stats_tree.c + * - copy to clipboard + * - export to text, CSV or XML file + */ #include "config.h" #include <string.h> @@ -63,18 +63,18 @@ void register_tap_listener_stats_tree_stat(void); struct _st_node_pres { - GtkTreeIter* iter; + GtkTreeIter *iter; }; struct _tree_cfg_pres { - tap_param_dlg* stat_dlg; + tap_param_dlg *stat_dlg; }; struct _tree_pres { - GString* text; - GtkWidget* win; - GtkTreeStore* store; - GtkWidget* tree; + GString* text; + GtkWidget *win; + GtkTreeStore *store; + GtkWidget* tree; }; /* Define fixed column indexes */ @@ -85,13 +85,13 @@ struct _tree_pres { static void draw_gtk_node(stat_node* node) { - GtkTreeIter* parent = NULL; - stat_node* child; - int num_columns= node->st->num_columns+N_RESERVED_COL; - gint *columns = (gint*) g_malloc(sizeof(gint)*num_columns); - GValue *values = (GValue*) g_malloc0(sizeof(GValue)*num_columns); - gchar **valstrs = stats_tree_get_values_from_node(node); - int count; + GtkTreeIter *parent = NULL; + stat_node *child; + int num_columns = node->st->num_columns+N_RESERVED_COL; + gint *columns = (gint*) g_malloc(sizeof(gint)*num_columns); + GValue *values = (GValue*) g_malloc0(sizeof(GValue)*num_columns); + gchar **valstrs = stats_tree_get_values_from_node(node); + int count; columns[0]= 0; g_value_init(values, G_TYPE_POINTER); @@ -141,11 +141,11 @@ draw_gtk_node(stat_node* node) static void draw_gtk_tree(void *psp) { - stats_tree *st = (stats_tree *)psp; - stat_node* child; - int count; - gint sort_column= GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID; - GtkSortType order= GTK_SORT_DESCENDING; + stats_tree *st = (stats_tree *)psp; + stat_node *child; + int count; + gint sort_column = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID; + GtkSortType order = GTK_SORT_DESCENDING; for (count = 0; count<st->num_columns; count++) { gtk_tree_view_column_set_title(gtk_tree_view_get_column(GTK_TREE_VIEW(st->pr->tree),count), @@ -182,9 +182,9 @@ static gboolean copy_tree_to_clipboard (GtkWidget *win _U_, stats_tree *st) { - gint sort_column= N_RESERVED_COL; /* default */ - GtkSortType order= GTK_SORT_DESCENDING; - GString *s; + gint sort_column = N_RESERVED_COL; /* default */ + GtkSortType order = GTK_SORT_DESCENDING; + GString *s; gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (st->pr->store), &sort_column, &order); s= stats_tree_format_as_str(st,ST_FORMAT_PLAIN,sort_column-N_RESERVED_COL,order==GTK_SORT_DESCENDING); @@ -256,16 +256,16 @@ gtk_save_as_statstree(GtkWidget *win, GString *file_name, int *file_type) static gboolean save_as_dialog(GtkWidget *win _U_, stats_tree *st) { - gint sort_column= 1; /* default */ - GtkSortType order= GTK_SORT_DESCENDING; - GString *str_tree; - GString *file_name = g_string_new(""); - int file_type; - gchar *file_name_lower; + gint sort_column = 1; /* default */ + GtkSortType order = GTK_SORT_DESCENDING; + GString *str_tree; + GString *file_name = g_string_new(""); + int file_type; + gchar *file_name_lower; const gchar *file_ext; - FILE *f; - gboolean success= FALSE; - int last_errno; + FILE *f; + gboolean success = FALSE; + int last_errno; #ifdef USE_WIN32_FILE_DIALOGS if (win32_save_as_statstree(GDK_WINDOW_HWND(gtk_widget_get_window(st->pr->win)), @@ -599,11 +599,24 @@ void gtk_stats_tree_cb(GtkAction *action, gpointer user_data _U_) if(cfg){ tap_param_dlg_cb(action, cfg->pr->stat_dlg); }else{ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "Failed to find the stat tree named %s", - abbr); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, + "Failed to find the stat tree named %s", + abbr); return; } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 6d008596c7..11e60244fe 100644 --- a/ui/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.c @@ -163,18 +163,18 @@ static void supported_destroy_cb(GtkWidget *w _U_, gpointer data _U_) static void insert_text(GtkWidget *w, const char *buffer, int nchars) { - GtkTextBuffer *buf= gtk_text_view_get_buffer(GTK_TEXT_VIEW(w)); - GtkTextIter iter; + GtkTextBuffer *buf= gtk_text_view_get_buffer(GTK_TEXT_VIEW(w)); + GtkTextIter iter; - gtk_text_buffer_get_end_iter(buf, &iter); + gtk_text_buffer_get_end_iter(buf, &iter); #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_override_font(w, user_font_get_regular()); + gtk_widget_override_font(w, user_font_get_regular()); #else - gtk_widget_modify_font(w, user_font_get_regular()); + gtk_widget_modify_font(w, user_font_get_regular()); #endif - if (!g_utf8_validate(buffer, -1, NULL)) - printf("Invalid utf8 encoding: %s\n", buffer); /* ToDo: Don't use printf ?? */ - gtk_text_buffer_insert(buf, &iter, buffer, nchars); + if (!g_utf8_validate(buffer, -1, NULL)) + printf("Invalid utf8 encoding: %s\n", buffer); /* ToDo: Don't use printf ?? */ + gtk_text_buffer_insert(buf, &iter, buffer, nchars); } @@ -210,17 +210,17 @@ static void set_supported_text(GtkWidget *w, supported_type_t type) count = 0; for (i = proto_get_first_protocol(&cookie); i != -1; i = proto_get_next_protocol(&cookie)) { - count++; - protocol = find_protocol_by_id(i); - name = proto_get_protocol_name(i); - short_name = proto_get_protocol_short_name(protocol); - filter_name = proto_get_protocol_filter_name(i); - if ((len = (int) strlen(name)) > namel) - namel = len; - if ((len = (int) strlen(short_name)) > short_namel) - short_namel = len; - if ((len = (int) strlen(filter_name)) > filter_namel) - filter_namel = len; + count++; + protocol = find_protocol_by_id(i); + name = proto_get_protocol_name(i); + short_name = proto_get_protocol_short_name(protocol); + filter_name = proto_get_protocol_filter_name(i); + if ((len = (int) strlen(name)) > namel) + namel = len; + if ((len = (int) strlen(short_name)) > short_namel) + short_namel = len; + if ((len = (int) strlen(filter_name)) > filter_namel) + filter_namel = len; } len = g_snprintf(buffer, BUFF_LEN, proto_supported, count); @@ -229,17 +229,17 @@ static void set_supported_text(GtkWidget *w, supported_type_t type) /* ok, display the correctly aligned strings */ for (i = proto_get_first_protocol(&cookie); i != -1; i = proto_get_next_protocol(&cookie)) { - protocol = find_protocol_by_id(i); - name = proto_get_protocol_name(i); - short_name = proto_get_protocol_short_name(protocol); - filter_name = proto_get_protocol_filter_name(i); - - /* the name used for sorting in the left column */ - len = g_snprintf(buffer, BUFF_LEN, "%*s %*s %*s\n", - -short_namel, short_name, - -namel, name, - -filter_namel, filter_name); - insert_text(w, buffer, len); + protocol = find_protocol_by_id(i); + name = proto_get_protocol_name(i); + short_name = proto_get_protocol_short_name(protocol); + filter_name = proto_get_protocol_filter_name(i); + + /* the name used for sorting in the left column */ + len = g_snprintf(buffer, BUFF_LEN, "%*s %*s %*s\n", + -short_namel, short_name, + -namel, name, + -filter_namel, filter_name); + insert_text(w, buffer, len); } break; @@ -252,21 +252,21 @@ static void set_supported_text(GtkWidget *w, supported_type_t type) for (i = proto_get_first_protocol(&cookie); i != -1; i = proto_get_next_protocol(&cookie)) { - for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; - hfinfo = proto_get_next_protocol_field(i, &cookie2)) { - - if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ - continue; - - if ((len = (int) strlen(hfinfo->abbrev)) > maxlen) - maxlen = len; - if ((len = (int) strlen(hfinfo->name)) > maxlen2) - maxlen2 = len; - if (hfinfo->blurb != NULL) { - if ((len = (int) strlen(hfinfo->blurb)) > maxlen4) - maxlen4 = len; - } - } + for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; + hfinfo = proto_get_next_protocol_field(i, &cookie2)) { + + if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ + continue; + + if ((len = (int) strlen(hfinfo->abbrev)) > maxlen) + maxlen = len; + if ((len = (int) strlen(hfinfo->name)) > maxlen2) + maxlen2 = len; + if (hfinfo->blurb != NULL) { + if ((len = (int) strlen(hfinfo->blurb)) > maxlen4) + maxlen4 = len; + } + } } insert_text(w, dfilter_supported, (int) strlen(dfilter_supported)); @@ -274,46 +274,46 @@ static void set_supported_text(GtkWidget *w, supported_type_t type) fcount = 0; for (i = proto_get_first_protocol(&cookie); i != -1; i = proto_get_next_protocol(&cookie)) { - protocol = find_protocol_by_id(i); - name = proto_get_protocol_name(i); - short_name = proto_get_protocol_short_name(protocol); - filter_name = proto_get_protocol_filter_name(i); - - count = 0; - for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; - hfinfo = proto_get_next_protocol_field(i, &cookie2)) { - - if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ - continue; - count++; - } - fcount += count; - - len = g_snprintf(buffer, BUFF_LEN, "\n%s - %s (%s) [%d fields]:\n", - short_name, name, filter_name, count); - insert_text(w, buffer, len); - - for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; - hfinfo = proto_get_next_protocol_field(i, &cookie2)) { - - if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ - continue; - - type_name = ftype_pretty_name(hfinfo->type); - if (hfinfo->blurb != NULL && hfinfo->blurb[0] != '\0') { - len = g_snprintf(buffer, BUFF_LEN, "%*s %*s %*s (%s)\n", - -maxlen, hfinfo->abbrev, - -maxlen2, hfinfo->name, - -maxlen4, hfinfo->blurb, - type_name); - } else { - len = g_snprintf(buffer, BUFF_LEN, "%*s %*s (%s)\n", - -maxlen, hfinfo->abbrev, - -maxlen2, hfinfo->name, - type_name); - } - insert_text(w, buffer, len); - } + protocol = find_protocol_by_id(i); + name = proto_get_protocol_name(i); + short_name = proto_get_protocol_short_name(protocol); + filter_name = proto_get_protocol_filter_name(i); + + count = 0; + for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; + hfinfo = proto_get_next_protocol_field(i, &cookie2)) { + + if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ + continue; + count++; + } + fcount += count; + + len = g_snprintf(buffer, BUFF_LEN, "\n%s - %s (%s) [%d fields]:\n", + short_name, name, filter_name, count); + insert_text(w, buffer, len); + + for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; + hfinfo = proto_get_next_protocol_field(i, &cookie2)) { + + if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ + continue; + + type_name = ftype_pretty_name(hfinfo->type); + if (hfinfo->blurb != NULL && hfinfo->blurb[0] != '\0') { + len = g_snprintf(buffer, BUFF_LEN, "%*s %*s %*s (%s)\n", + -maxlen, hfinfo->abbrev, + -maxlen2, hfinfo->name, + -maxlen4, hfinfo->blurb, + type_name); + } else { + len = g_snprintf(buffer, BUFF_LEN, "%*s %*s (%s)\n", + -maxlen, hfinfo->abbrev, + -maxlen2, hfinfo->name, + type_name); + } + insert_text(w, buffer, len); + } } len = g_snprintf(buffer, BUFF_LEN, "\n-- Total %d fields\n", fcount); insert_text(w, buffer, len); @@ -344,3 +344,16 @@ void supported_redraw(void) set_supported_text(dfilter_text, DFILTER_SUPPORTED); } } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index af06e3db31..f9174d4fee 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -177,7 +177,7 @@ tap_param_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data) break; case PARAM_STRING: - case PARAM_UUID: /* XXX - do as multiple fixed-length boxes */ + case PARAM_UUID: /* XXX - do as multiple fixed-length boxes */ case PARAM_FILTER: g_string_append(params, gtk_entry_get_text(GTK_ENTRY(dlg_data->param_items[i]))); @@ -394,3 +394,16 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data) gtk_widget_show_all(current_dlg->dlg); window_present(current_dlg->dlg); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index c67fdfba22..3ed1f0e0c8 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -4502,3 +4502,16 @@ static int rint(double x) return(i); } #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index 90dc8f71b8..1e46c04001 100644 --- a/ui/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.c @@ -70,29 +70,29 @@ static GtkWidget *time_shift_frame_w; void time_shift_cb(GtkWidget *w _U_, gpointer d _U_) { - GtkWidget *main_vb, *label, - *types_vb, *indent, + GtkWidget *main_vb, *label, + *types_vb, *indent, - *timeshift_offset_hb, - *timeshift_offset_text_box, + *timeshift_offset_hb, + *timeshift_offset_text_box, - *settime_time_hb, - *settime_packetnumber_text_box, - *settime_time_text_box, + *settime_time_hb, + *settime_packetnumber_text_box, + *settime_time_text_box, - *adjtime_offset_hb, - *adjtime_packetnumber1_text_box, - *adjtime_packetnumber2_text_box, - *adjtime_time1_text_box, - *adjtime_time2_text_box, + *adjtime_offset_hb, + *adjtime_packetnumber1_text_box, + *adjtime_packetnumber2_text_box, + *adjtime_time1_text_box, + *adjtime_time2_text_box, - *undo_offset_hb, - *undo_type_hb, + *undo_offset_hb, + *undo_type_hb, - *timeshift_rb, *settime_rb, - *adjtime_rb, *undo_rb, + *timeshift_rb, *settime_rb, + *adjtime_rb, *undo_rb, - *bbox, *apply_bt, *close_bt, *help_bt; + *bbox, *apply_bt, *close_bt, *help_bt; GString * frame_str = g_string_new(""); gint rb_size = 0, rb_spacing = 0, indent_width = 0; @@ -125,7 +125,7 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_set_tooltip_text(timeshift_rb, "Shift the time on the frames."); gtk_widget_style_get(timeshift_rb, "indicator-size", &rb_size, - "indicator-spacing", &rb_spacing, NULL); + "indicator-spacing", &rb_spacing, NULL); indent_width += rb_size + rb_spacing; /* Time Shift entry row */ timeshift_offset_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, DLG_BUTTON_SPACING, FALSE); @@ -469,3 +469,16 @@ time_shift_frame_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) /* Note that we no longer have a "Time Shift" dialog box. */ time_shift_frame_w = NULL; } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index 2fbe72e9c9..422e25dfa7 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -1174,3 +1174,16 @@ static GtkWidget *uat_window(void *u) { void uat_window_cb(GtkWidget *u _U_, void *uat) { uat_window(uat); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index 7aa7b76220..c8c4940cc2 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -44,30 +44,30 @@ * * What Qt's "generic UNIX" openURL does is: * - * if it's a mailto: URL, use the "document lanuncher" if - * known, otherwise, use the results of detectWebBrowser - * as the "document launcher", and use that; + * if it's a mailto: URL, use the "document lanuncher" if + * known, otherwise, use the results of detectWebBrowser + * as the "document launcher", and use that; * - * otherwise, use the "Web browser" if known, otherwise, use - * the results of detectWebBrowser as the "document launcher", - * and use that. + * otherwise, use the "Web browser" if known, otherwise, use + * the results of detectWebBrowser as the "document launcher", + * and use that. * * detectWebBrowser: * - * looks for xdg-open and, if it finds it, uses that; + * looks for xdg-open and, if it finds it, uses that; * - * otherwise, if the DEFAULT_BROWSER or BROWSER environment - * variable is set, use the first of those that's set (in - * that order) and, if that's an executable, uses that; + * otherwise, if the DEFAULT_BROWSER or BROWSER environment + * variable is set, use the first of those that's set (in + * that order) and, if that's an executable, uses that; * - * otherwise, if the desktop environment is detected to be - * KDE, uses kfmclient; + * otherwise, if the desktop environment is detected to be + * KDE, uses kfmclient; * - * otherwise, if the desktop environment is detected to - * be GNOME, uses gnome-open; + * otherwise, if the desktop environment is detected to + * be GNOME, uses gnome-open; * - * otherwise, tries, in order, google-chrome, firefox, - * mozilla, and opera. + * otherwise, tries, in order, google-chrome, firefox, + * mozilla, and opera. * * (Its Windows openURL uses ShellExecute() on non-mailto URLs (it * does more exotic stuff for mailto: URLs). @@ -83,21 +83,21 @@ * * Perhaps the right strategy is to: * - * Check whether we're in a GNOME/KDE/XFCE session and, if - * we are, try xdg-open, as it works around, among other things, - * some kfmclient bugs, and run it synchronously (that will fail - * if we detect a GNOME/KDE/XFCE session but the launcher is - * missing, but so it goes). If we don't have xdg-open, try - * the appropriate launcher for the environment, but ignore - * the return code from kfmclient, as it might be bogus (that's - * the bug xdg-open works around). + * Check whether we're in a GNOME/KDE/XFCE session and, if + * we are, try xdg-open, as it works around, among other things, + * some kfmclient bugs, and run it synchronously (that will fail + * if we detect a GNOME/KDE/XFCE session but the launcher is + * missing, but so it goes). If we don't have xdg-open, try + * the appropriate launcher for the environment, but ignore + * the return code from kfmclient, as it might be bogus (that's + * the bug xdg-open works around). * - * Otherwise, try the "broken/unpredictable browser launchers", - * but run them in the background and leave them running, and - * ignore the exit code, and then try x-www-browser, and then - * try directly launching a user-specified browser. (Beast tries - * a bunch of browsers, with the user not being allowed to - * specify which one they want.) + * Otherwise, try the "broken/unpredictable browser launchers", + * but run them in the background and leave them running, and + * ignore the exit code, and then try x-www-browser, and then + * try directly launching a user-specified browser. (Beast tries + * a bunch of browsers, with the user not being allowed to + * specify which one they want.) * * On the other hand, see bug 2699, in which xdg-open is itself buggy. */ @@ -494,14 +494,27 @@ strreplace (const gchar *string, void browser_open_data_file(const gchar *filename) { - gchar *uri; + gchar *uri; - /* XXX - check, if the file is really existing, otherwise display a simple_dialog about the problem */ + /* XXX - check, if the file is really existing, otherwise display a simple_dialog about the problem */ - uri = data_file_url(filename); + uri = data_file_url(filename); - /* show the uri */ - browser_open_url (uri); + /* show the uri */ + browser_open_url (uri); - g_free(uri); + g_free(uri); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index e364a522a4..f57e26a39c 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -1763,12 +1763,12 @@ wlanstat_dlg_create (void) hs->use_dfilter = FALSE; hs->show_only_existing = FALSE; - display_name = cf_get_display_name(&cfile); - g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s", - display_name); - g_free(display_name); - wlanstat_dlg_w = window_new_with_geom (GTK_WINDOW_TOPLEVEL, title, "WLAN Statistics", GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_default_size (GTK_WINDOW(wlanstat_dlg_w), 750, 400); + display_name = cf_get_display_name(&cfile); + g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s", + display_name); + g_free(display_name); + wlanstat_dlg_w = window_new_with_geom (GTK_WINDOW_TOPLEVEL, title, "WLAN Statistics", GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_default_size (GTK_WINDOW(wlanstat_dlg_w), 750, 400); vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); gtk_container_add(GTK_CONTAINER(wlanstat_dlg_w), vbox); @@ -1980,3 +1980,16 @@ register_tap_listener_wlanstat (void) SET_ADDRESS(&broadcast, AT_ETHER, 6, src); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c index 910db66411..a7d05d7329 100644 --- a/ui/gtk/wsp_stat.c +++ b/ui/gtk/wsp_stat.c @@ -414,3 +414,16 @@ register_tap_listener_gtkwspstat(void) register_param_stat(&wsp_stat_dlg, "_WAP-WSP", REGISTER_STAT_GROUP_TELEPHONY); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ |