diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-08-27 20:32:39 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-08-27 20:32:39 +0000 |
| commit | 0ead8d9b0695084e10eae95394315a14133e1bd6 (patch) | |
| tree | 9f504bddff869838f3cd165ac1e4dd28aecbadb6 /ui/gtk/tcp_graph.c | |
| parent | abfc95ba4000dabc20daaf5a0b9cccb1a3b7fc30 (diff) | |
| download | wireshark-0ead8d9b0695084e10eae95394315a14133e1bd6.tar.gz | |
Try to fix error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
svn path=/trunk/; revision=51545
Diffstat (limited to 'ui/gtk/tcp_graph.c')
| -rw-r--r-- | ui/gtk/tcp_graph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 0897e91366..4e98935754 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -602,7 +602,7 @@ void tcp_graph_cb(GtkAction *action, gpointer user_data _U_) struct segment current; struct gtk_graph *g; const gchar *name; - guint graph_type; + tcp_graph_type graph_type; name = gtk_action_get_name(action); if (strcmp(name, "/Statistics/TCPStreamGraphMenu/Time-Sequence-Graph-Stevens") == 0) { @@ -1597,10 +1597,10 @@ static GtkWidget *control_panel_create_graph_type_group(struct gtk_graph *g) static void callback_graph_type(GtkWidget *toggle, gpointer data) { - int old_type, new_type; + tcp_graph_type old_type, new_type; struct gtk_graph *g = (struct gtk_graph * )data; - new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(toggle), "new-graph-type")); + new_type = (tcp_graph_type)GPOINTER_TO_INT(g_object_get_data(G_OBJECT(toggle), "new-graph-type")); if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle))) return; |