diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-11-18 13:13:35 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-11-18 23:37:35 +0000 |
| commit | cfa0e5fd53870f297dbec2f0a9aef896ba11f7c5 (patch) | |
| tree | e457042154a6db0a30043091cd67a0868741d453 /ui/gtk/graph_analysis.c | |
| parent | dc5b8f1093c00e759c842257b1706eab4c08f629 (diff) | |
voip_calls: Regression fixes.
Fix struct initialization logic. Clear a GQueue instead of deleting it.
Don't crash if we have no sequence diagram items. Make sure we show all
flows and not just invites. Zero allocated memory in a couple of places.
Change-Id: Ia5bb3ba57cf625de4b554b354e098aa0361dff28
Reviewed-on: https://code.wireshark.org/review/5390
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/gtk/graph_analysis.c')
| -rw-r--r-- | ui/gtk/graph_analysis.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index d15277829a..1fc739e973 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -242,7 +242,7 @@ gtk_save_graph_as_plain_text_file(graph_analysis_data_t *user_data) save_to_file_w = file_selection_new("Wireshark: Save graph to plain text file", GTK_WINDOW(user_data->dlg.window), FILE_SELECTION_SAVE); - gtk_dialog_set_default_response(GTK_DIALOG(save_to_file_w), + gtk_dialog_set_default_response(GTK_DIALOG(save_to_file_w), GTK_RESPONSE_ACCEPT); pathname = file_selection_run(save_to_file_w); @@ -365,12 +365,16 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data) GtkAllocation draw_area_time_alloc, draw_area_alloc, draw_area_comments_alloc; - if(!user_data->dlg.needs_redraw) { + if (!user_data->dlg.needs_redraw) { return; } user_data->dlg.needs_redraw = FALSE; + if (g_queue_get_length(user_data->graph_info->items) < 1) { + return; + } + gtk_widget_get_allocation(user_data->dlg.draw_area_time, &draw_area_time_alloc); gtk_widget_get_allocation(user_data->dlg.draw_area, &draw_area_alloc); gtk_widget_get_allocation(user_data->dlg.draw_area_comments, &draw_area_comments_alloc); @@ -1742,7 +1746,7 @@ graph_analysis_data_t *graph_analysis_init(seq_analysis_info_t *sainfo) { graph_analysis_data_t *user_data; /* init */ - user_data = g_new(graph_analysis_data_t,1); + user_data = g_new0(graph_analysis_data_t,1); user_data->graph_info = sainfo; /* init user_data */ @@ -1816,3 +1820,17 @@ void graph_analysis_redraw(graph_analysis_data_t *user_data) window_present(user_data->dlg.window); return; } + +/* + * Editor modelines - https://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: + */ + |