Fix alignment issue in GTK2 flowgraph "packet choice" window.

(Issue reported by Alexis Lagoutte).

##Backport 1.10

svn path=/trunk/; revision=54148

1 files changed, 24 insertions, 6 deletions

diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
index 70d57fe458..516d877201 100644
--- a/ui/gtk/flow_graph.c
+++ b/ui/gtk/flow_graph.c
@@ -234,7 +234,8 @@ flow_graph_dlg_create(void)
 	select_all_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_All packets");
 	gtk_widget_set_tooltip_text (select_all_rb, ("Process all packets"));
 	g_signal_connect(select_all_rb, "toggled", G_CALLBACK(toggle_select_all), NULL);
-	ws_gtk_grid_attach(GTK_GRID(range_grid), select_all_rb, 0, 0, 1, 1);
+	ws_gtk_grid_attach_extended(GTK_GRID(range_grid), select_all_rb, 0, 0, 1, 1,
+				    (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
 	if (graph_analysis->all_packets) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_all_rb),TRUE);
 	}
@@ -245,7 +246,8 @@ flow_graph_dlg_create(void)
 									     "_Displayed packets");
 	gtk_widget_set_tooltip_text (select_displayed_rb, ("Process displayed packets"));
 	g_signal_connect(select_displayed_rb, "toggled", G_CALLBACK(toggle_select_displayed), NULL);
-	ws_gtk_grid_attach(GTK_GRID(range_grid), select_displayed_rb, 0, 1, 1, 1);
+	ws_gtk_grid_attach_extended(GTK_GRID(range_grid), select_displayed_rb, 0, 1, 1, 1,
+				    (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
 	if (!graph_analysis->all_packets) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_displayed_rb),TRUE);
 	}
@@ -266,7 +268,8 @@ flow_graph_dlg_create(void)
 	select_general_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_General flow");
 	gtk_widget_set_tooltip_text (select_general_rb,	("Show all packets, with general information"));
 	g_signal_connect(select_general_rb, "toggled", G_CALLBACK(toggle_select_general), NULL);
-	ws_gtk_grid_attach(GTK_GRID(flow_type_grid), select_general_rb, 0, 0, 1, 1);
+	ws_gtk_grid_attach_extended(GTK_GRID(flow_type_grid), select_general_rb, 0, 0, 1, 1,
+				    (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
 	if (graph_analysis->type == SEQ_ANALYSIS_ANY) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_general_rb),TRUE);
 	}
@@ -277,7 +280,8 @@ flow_graph_dlg_create(void)
 								       "_TCP flow");
 	gtk_widget_set_tooltip_text (select_tcp_rb, ("Show only TCP packets, with TCP specific information"));
 	g_signal_connect(select_tcp_rb, "toggled", G_CALLBACK(toggle_select_tcp), NULL);
-	ws_gtk_grid_attach(GTK_GRID(flow_type_grid), select_tcp_rb, 0, 1, 1, 1);
+	ws_gtk_grid_attach_extended(GTK_GRID(flow_type_grid), select_tcp_rb, 0, 1, 1, 1,
+				    (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
 	if (graph_analysis->type == SEQ_ANALYSIS_TCP) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(select_tcp_rb),TRUE);
 	}
@@ -299,7 +303,8 @@ flow_graph_dlg_create(void)
 	gtk_widget_set_tooltip_text (src_dst_rb,
 		("Nodes in the diagram are identified with source and destination addresses"));
 	g_signal_connect(src_dst_rb, "toggled", G_CALLBACK(toggle_select_srcdst), NULL);
-	ws_gtk_grid_attach(GTK_GRID(node_addr_grid), src_dst_rb, 0, 0, 1, 1);
+	ws_gtk_grid_attach_extended(GTK_GRID(node_addr_grid), src_dst_rb, 0, 0, 1, 1,
+				    (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
 	if (graph_analysis->any_addr) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(src_dst_rb),TRUE);
 	}
@@ -311,7 +316,8 @@ flow_graph_dlg_create(void)
 	gtk_widget_set_tooltip_text (net_src_dst_rb,
 		("Nodes in the diagram are identified with network source and destination addresses"));
 	g_signal_connect(net_src_dst_rb, "toggled", G_CALLBACK(toggle_select_netsrcdst), NULL);
-	ws_gtk_grid_attach(GTK_GRID(node_addr_grid), net_src_dst_rb, 0, 1, 1, 1);
+	ws_gtk_grid_attach_extended(GTK_GRID(node_addr_grid), net_src_dst_rb, 0, 1, 1, 1,
+				    (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
 	if (!graph_analysis->any_addr) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(net_src_dst_rb),TRUE);
 	}
@@ -393,3 +399,15 @@ register_tap_listener_flow_graph(void)
 	register_stat_cmd_arg("flow_graph",flow_graph_init_tap,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:
+ */