diff options
| -rw-r--r-- | gtk/rtp_analysis.c | 23 | ||||
| -rw-r--r-- | gtk/rtp_stream_dlg.c | 8 | ||||
| -rw-r--r-- | gtk/sctp_assoc_analyse.c | 14 | ||||
| -rw-r--r-- | gtk/sctp_chunk_stat_dlg.c | 27 | ||||
| -rw-r--r-- | gtk/sctp_error_dlg.c | 112 | ||||
| -rw-r--r-- | gtk/sctp_stat_dlg.c | 255 | ||||
| -rw-r--r-- | gtk/simple_dialog.c | 2 | ||||
| -rw-r--r-- | gtk/voip_calls_dlg.c | 6 | ||||
| -rw-r--r-- | gtk/wlan_stat_dlg.c | 8 |
9 files changed, 188 insertions, 267 deletions
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index dbcccb3b1f..5d6a74148c 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1333,9 +1333,7 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_) { user_data_t *user_data; int i; -#if GTK_CHECK_VERSION(2,6,0) GtkWidget *bt_save; -#endif user_data=(user_data_t *)g_object_get_data(G_OBJECT(widget), "user_data_t"); @@ -1355,11 +1353,9 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_) user_data->dlg.dialog_graph.pixmap_width=widget->allocation.width; user_data->dlg.dialog_graph.pixmap_height=widget->allocation.height; -#if GTK_CHECK_VERSION(2,6,0) bt_save = g_object_get_data(G_OBJECT(user_data->dlg.dialog_graph.window), "bt_save"); g_object_set_data(G_OBJECT(bt_save), "pixmap", user_data->dlg.dialog_graph.pixmap); gtk_widget_set_sensitive(bt_save, TRUE); -#endif gdk_draw_rectangle(user_data->dlg.dialog_graph.pixmap, widget->style->white_gc, @@ -1695,10 +1691,8 @@ static void dialog_graph_init_window(user_data_t* user_data) GtkWidget *vbox; GtkWidget *hbox; GtkWidget *bt_close; -#if GTK_CHECK_VERSION(2,6,0) GtkWidget *bt_save; GtkTooltips *tooltips = gtk_tooltips_new(); -#endif /* create the main window */ user_data->dlg.dialog_graph.window=dlg_window_new("I/O Graphs"); /* transient_for top_level */ @@ -1720,24 +1714,18 @@ static void dialog_graph_init_window(user_data_t* user_data) dialog_graph_set_title(user_data); -#if GTK_CHECK_VERSION(2,6,0) hbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE, NULL); -#else - hbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); -#endif gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); bt_close = g_object_get_data(G_OBJECT(hbox), GTK_STOCK_CLOSE); window_set_cancel_button(user_data->dlg.dialog_graph.window, bt_close, window_cancel_button_cb); -#if GTK_CHECK_VERSION(2,6,0) bt_save = g_object_get_data(G_OBJECT(hbox), GTK_STOCK_SAVE); gtk_widget_set_sensitive(bt_save, FALSE); gtk_tooltips_set_tip(tooltips, bt_save, "Save the displayed graph to a file", NULL); g_signal_connect(bt_save, "clicked", G_CALLBACK(pixmap_save_cb), NULL); g_object_set_data(G_OBJECT(user_data->dlg.dialog_graph.window), "bt_save", bt_save); -#endif g_signal_connect(user_data->dlg.dialog_graph.window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); @@ -2114,9 +2102,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); -#if GTK_CHECK_VERSION(2,8,0) gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(user_data->dlg.save_csv_as_w), TRUE); -#endif gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.save_csv_as_w),GTK_WINDOW(user_data->dlg.window)); /* Container for each row of widgets */ @@ -2729,9 +2715,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); -#if GTK_CHECK_VERSION(2,8,0) gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(user_data->dlg.save_voice_as_w), TRUE); -#endif gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.save_voice_as_w),GTK_WINDOW(user_data->dlg.window)); /* Container for each row of widgets */ @@ -2990,12 +2974,7 @@ static void add_to_list(GtkWidget *list, user_data_t * user_data, guint32 number * : * should generally be preferred when inserting rows in a sorted list store. */ -#if GTK_CHECK_VERSION(2,6,0) gtk_list_store_insert_with_values( list_store , &user_data->dlg.iter, G_MAXINT, -#else - gtk_list_store_append (list_store, &user_data->dlg.iter); - gtk_list_store_set (list_store, &user_data->dlg.iter, -#endif PACKET_COLUMN, number, SEQUENCE_COLUMN, seq_num, TIMESTAMP_COLUMN, timestamp, @@ -3083,10 +3062,8 @@ GtkWidget* create_list(user_data_t* user_data) list_view = GTK_TREE_VIEW(list); sortable = GTK_TREE_SORTABLE(list_store); -#if GTK_CHECK_VERSION(2,6,0) /* Speed up the list display */ gtk_tree_view_set_fixed_height_mode(list_view, TRUE); -#endif /* Setup the sortable columns */ gtk_tree_sortable_set_sort_column_id(sortable, PACKET_COLUMN, GTK_SORT_ASCENDING); diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index e9afbefec4..6734bacd1f 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -330,9 +330,7 @@ rtpstream_on_save(GtkButton *button _U_, gpointer data _U_) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); -#if GTK_CHECK_VERSION(2,8,0) gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(rtpstream_save_dlg), TRUE); -#endif g_signal_connect(rtpstream_save_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); g_signal_connect(rtpstream_save_dlg, "destroy", G_CALLBACK(save_stream_destroy_cb), NULL); @@ -488,7 +486,7 @@ rtpstream_on_copy_as_csv(GtkWindow *win _U_, gpointer data _U_) g_string_append(CSV_str,"\n"); } } - + /* Now that we have the CSV data, copy it into the default clipboard */ cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); gtk_clipboard_set_text(cb, CSV_str->str, (gint)CSV_str->len); @@ -562,7 +560,7 @@ rtpstream_view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model, rtp_stream_info_t* selected_stream; gboolean result = TRUE; gchar label_text[80]; - + /* Logic * nb_selected path_currently_selected forward reverse action result * 0 must be false any any assign forward true @@ -782,10 +780,8 @@ create_list_view(void) list_view = GTK_TREE_VIEW(list); sortable = GTK_TREE_SORTABLE(list_store); -#if GTK_CHECK_VERSION(2,6,0) /* Speed up the list display */ gtk_tree_view_set_fixed_height_mode(list_view, TRUE); -#endif /* Setup the sortable columns */ gtk_tree_sortable_set_sort_column_id(sortable, RTP_COL_SRC_ADDR, GTK_SORT_ASCENDING); diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index a7a3a71119..2db7163f13 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -251,14 +251,8 @@ update_analyse_dlg(struct sctp_analyse* u_data) } list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (u_data->analyse_nb->page2->clist))); /* Get store */ -#if GTK_CHECK_VERSION(2,6,0) gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, 0, field[0], -1); -#else - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, - 0, field[0], -1); -#endif list = g_list_next(list); } } @@ -315,14 +309,8 @@ update_analyse_dlg(struct sctp_analyse* u_data) } list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (u_data->analyse_nb->page3->clist))); /* Get store */ -#if GTK_CHECK_VERSION(2,6,0) gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, 0, field[0], -1); -#else - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, - 0, field[0], -1); -#endif list = g_list_next(list); } } @@ -489,10 +477,8 @@ GtkWidget *create_list(void) list_view = GTK_TREE_VIEW(list); -#if GTK_CHECK_VERSION(2,6,0) /* Speed up the list display */ gtk_tree_view_set_fixed_height_mode(list_view, TRUE); -#endif /* The view now holds a reference. We can get rid of our own reference */ g_object_unref (G_OBJECT (list_store)); diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index fed720b6ea..73f1493dc0 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -138,13 +138,11 @@ GtkWidget* create_list(void) /* Create a view */ list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store)); - list_view = GTK_TREE_VIEW(list); - sortable = GTK_TREE_SORTABLE(list_store); + list_view = GTK_TREE_VIEW(list); + sortable = GTK_TREE_SORTABLE(list_store); -#if GTK_CHECK_VERSION(2,6,0) - /* Speed up the list display */ - gtk_tree_view_set_fixed_height_mode(list_view, TRUE); -#endif + /* Speed up the list display */ + gtk_tree_view_set_fixed_height_mode(list_view, TRUE); /* Setup the sortable columns */ gtk_tree_sortable_set_sort_column_id(sortable, IP_ADDR_COLUMN, GTK_SORT_ASCENDING); @@ -163,12 +161,12 @@ GtkWidget* create_list(void) "text", IP_ADDR_COLUMN, NULL); - gtk_tree_view_column_set_sort_column_id(column, IP_ADDR_COLUMN); + gtk_tree_view_column_set_sort_column_id(column, IP_ADDR_COLUMN); gtk_tree_view_column_set_resizable(column, TRUE); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_min_width(column, 135); - /* Add the column to the view. */ + /* Add the column to the view. */ gtk_tree_view_append_column (list_view, column); /* 2:nd column... */ @@ -418,11 +416,11 @@ GtkWidget* create_list(void) gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE); gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(list_view), TRUE); - /* Setup the selection handler */ - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + /* Setup the selection handler */ + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); - return list; + return list; } @@ -501,12 +499,7 @@ add_to_clist(sctp_addr_chunk* sac) g_snprintf(field[0], MAX_ADDRESS_LEN, "%s", ip6_to_str((const struct e_in6_addr *)(sac->addr->data))); } -#if GTK_CHECK_VERSION(2,6,0) gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, -#else - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, -#endif IP_ADDR_COLUMN, field[0], DATA_COLUMN, sac->addr_count[SCTP_DATA_CHUNK_ID], INIT_COLUMN, sac->addr_count[SCTP_INIT_CHUNK_ID], diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c index 63910d69e6..db2a254dcc 100644 --- a/gtk/sctp_error_dlg.c +++ b/gtk/sctp_error_dlg.c @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de> * * $Id$ @@ -21,7 +21,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #ifdef HAVE_CONFIG_H # include <config.h> #endif @@ -65,7 +65,7 @@ sctp_error_on_select_row(GtkTreeSelection *sel, gpointer user_data _U_) GtkTreeModel *model; GtkTreeIter iter; if (gtk_tree_selection_get_selected (sel, &model, &iter)) { - gtk_tree_model_get(model, &iter, + gtk_tree_model_get(model, &iter, FRAME_COLUMN, &(selected_packet->frame_number), TEXT_COLUMN, &(selected_packet->chunk_info), INFO_COLUMN, &(selected_packet->info_text), @@ -82,71 +82,69 @@ GtkWidget *create_list(void) GtkCellRenderer *renderer; GtkTreeView *list_view; GtkTreeSelection *selection; - + list_store = gtk_list_store_new(N_COLUMN, G_TYPE_UINT, /* Frame number*/ G_TYPE_STRING, /* Chunk type*/ G_TYPE_STRING );/* Info */ - - /* Create a view */ - list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store)); + + /* Create a view */ + list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store)); list_view = GTK_TREE_VIEW(list); -#if GTK_CHECK_VERSION(2,6,0) /* Speed up the list display */ gtk_tree_view_set_fixed_height_mode(list_view, TRUE); -#endif - gtk_tree_view_set_headers_clickable(list_view, TRUE); + gtk_tree_view_set_headers_clickable(list_view, TRUE); - /* The view now holds a reference. We can get rid of our own reference */ - g_object_unref (G_OBJECT (list_store)); + /* The view now holds a reference. We can get rid of our own reference */ + g_object_unref (G_OBJECT (list_store)); - /* - * Create the first column packet, associating the "text" attribute of the - * cell_renderer to the first column of the model - */ - /* 1:st column */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Framenumber", renderer, - "text", FRAME_COLUMN, - NULL); + /* + * Create the first column packet, associating the "text" attribute of the + * cell_renderer to the first column of the model + */ + /* 1:st column */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Framenumber", renderer, + "text", FRAME_COLUMN, + NULL); gtk_tree_view_column_set_sort_column_id(column, FRAME_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 80); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 80); /* Add the column to the view. */ - gtk_tree_view_append_column (list_view, column); - - /* 2:nd column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Chunk Types", renderer, - "text", TEXT_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, INFO_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 200); - gtk_tree_view_append_column (list_view, column); - - /* 3:d column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Info", renderer, - "text", INFO_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, TEXT_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 200); - gtk_tree_view_append_column (list_view, column); - - - /* Now enable the sorting of each column */ - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE); - gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(list_view), TRUE); + gtk_tree_view_append_column (list_view, column); + + /* 2:nd column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Chunk Types", renderer, + "text", TEXT_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, INFO_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 200); + gtk_tree_view_append_column (list_view, column); + + /* 3:d column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Info", renderer, + "text", INFO_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, TEXT_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 200); + gtk_tree_view_append_column (list_view, column); + + + /* Now enable the sorting of each column */ + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE); + gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(list_view), TRUE); /* Setup the selection handler */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); @@ -163,16 +161,11 @@ static void add_to_clist(sctp_error_info_t* errinfo) list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (clist))); /* Get store */ -#if GTK_CHECK_VERSION(2,6,0) gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, -#else - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, -#endif FRAME_COLUMN, errinfo->frame_number, TEXT_COLUMN, errinfo->chunk_info, INFO_COLUMN, errinfo->info_text, - -1); + -1); } static void @@ -185,7 +178,7 @@ static void sctp_error_dlg_update(GList *list) { GList *ilist=NULL; - if (sctp_error_dlg != NULL) + if (sctp_error_dlg != NULL) { gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(clist)))); ilist=list; @@ -309,4 +302,3 @@ void sctp_error_dlg_show(sctp_assoc_info_t* assoc) simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No errors found!"); } - diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index 948dcf650d..90b96064b6 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de> * * $Id$ @@ -21,7 +21,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #ifdef HAVE_CONFIG_H # include <config.h> #endif @@ -76,15 +76,15 @@ sctp_stat_on_select_row(GtkTreeSelection *sel, gpointer user_data _U_) gboolean stream_found=FALSE; guint32 port2, port1; guint32 checksum, data_chunks, data_bytes, packets, vtag1, vtag2; - + if (gtk_tree_selection_get_selected (sel, &model, &iter)) { - gtk_tree_model_get(model, &iter, + gtk_tree_model_get(model, &iter, PORT1_COLUMN, &port1, PORT2_COLUMN, &port2, PACKETS_COLUMN, &packets, CHECKSUM_ERRORS_COLUMN, &checksum, DATA_CHUNKS_COLUMN, &data_chunks, - DATA_BYTES_COLUMN, &data_bytes, + DATA_BYTES_COLUMN, &data_bytes, VTAG1_COLUMN, &vtag1, VTAG2_COLUMN, &vtag2, -1); @@ -98,8 +98,8 @@ sctp_stat_on_select_row(GtkTreeSelection *sel, gpointer user_data _U_) while (list) { assoc = (sctp_assoc_info_t*)(list->data); - if (assoc->port1==port1 && assoc->port2==port2 - && assoc->n_packets==packets && assoc->n_data_chunks==data_chunks && assoc->n_data_bytes==data_bytes + if (assoc->port1==port1 && assoc->port2==port2 + && assoc->n_packets==packets && assoc->n_data_chunks==data_chunks && assoc->n_data_bytes==data_bytes && assoc->verification_tag1==vtag1 && assoc->verification_tag2==vtag2) { selected_stream=assoc; @@ -137,132 +137,130 @@ GtkWidget *create_list(void) G_TYPE_UINT, /* number of data bytes */ G_TYPE_UINT, /* vtag1 */ G_TYPE_UINT); /* vtag2 */ - - /* Create a view */ - list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store)); + + /* Create a view */ + list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store)); list_view = GTK_TREE_VIEW(list); -#if GTK_CHECK_VERSION(2,6,0) /* Speed up the list display */ gtk_tree_view_set_fixed_height_mode(list_view, TRUE); -#endif - gtk_tree_view_set_headers_clickable(list_view, TRUE); + gtk_tree_view_set_headers_clickable(list_view, TRUE); - /* The view now holds a reference. We can get rid of our own reference */ - g_object_unref (G_OBJECT (list_store)); + /* The view now holds a reference. We can get rid of our own reference */ + g_object_unref (G_OBJECT (list_store)); - /* - * Create the first column packet, associating the "text" attribute of the - * cell_renderer to the first column of the model - */ - /* 1:st column */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Port 1", renderer, - "text", PORT1_COLUMN, + /* + * Create the first column packet, associating the "text" attribute of the + * cell_renderer to the first column of the model + */ + /* 1:st column */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Port 1", renderer, + "text", PORT1_COLUMN, NULL); gtk_tree_view_column_set_sort_column_id(column, PORT1_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 80); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 80); /* Add the column to the view. */ - gtk_tree_view_append_column (list_view, column); - - /* 2:nd column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Port 2", renderer, - "text", PORT2_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, PORT2_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 80); - gtk_tree_view_append_column (list_view, column); - - /* 3:d column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("No of Packets", renderer, - "text", PACKETS_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, PACKETS_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 120); - gtk_tree_view_append_column (list_view, column); - - /* 4:th column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Checksum", renderer, - "text", CHECKSUM_TYPE_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, CHECKSUM_TYPE_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 120); - gtk_tree_view_append_column (list_view, column); - - /* 5:th column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("No of Errors", renderer, - "text", CHECKSUM_ERRORS_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, CHECKSUM_ERRORS_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 120); - gtk_tree_view_append_column (list_view, column); - - /* 6:th column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Data Chunks", renderer, - "text", DATA_CHUNKS_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, DATA_CHUNKS_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 120); - gtk_tree_view_append_column (list_view, column); - - /* 7:th column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Data Bytes", renderer, - "text", DATA_BYTES_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, DATA_BYTES_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 120); - gtk_tree_view_append_column (list_view, column); - - /* 8:th column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("VTag 1", renderer, - "text", VTAG1_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, VTAG1_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 120); - gtk_tree_view_append_column (list_view, column); - - - /* 9:th column... */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("VTag 2", renderer, - "text", VTAG2_COLUMN, - NULL); - gtk_tree_view_column_set_sort_column_id(column, VTAG2_COLUMN); - gtk_tree_view_column_set_resizable(column, TRUE); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width(column, 120); - gtk_tree_view_append_column (list_view, column); - - /* Now enable the sorting of each column */ - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE); - gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(list_view), TRUE); + gtk_tree_view_append_column (list_view, column); + + /* 2:nd column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Port 2", renderer, + "text", PORT2_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, PORT2_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 80); + gtk_tree_view_append_column (list_view, column); + + /* 3:d column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("No of Packets", renderer, + "text", PACKETS_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, PACKETS_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 120); + gtk_tree_view_append_column (list_view, column); + + /* 4:th column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Checksum", renderer, + "text", CHECKSUM_TYPE_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, CHECKSUM_TYPE_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 120); + gtk_tree_view_append_column (list_view, column); + + /* 5:th column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("No of Errors", renderer, + "text", CHECKSUM_ERRORS_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, CHECKSUM_ERRORS_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 120); + gtk_tree_view_append_column (list_view, column); + + /* 6:th column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Data Chunks", renderer, + "text", DATA_CHUNKS_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, DATA_CHUNKS_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 120); + gtk_tree_view_append_column (list_view, column); + + /* 7:th column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Data Bytes", renderer, + "text", DATA_BYTES_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, DATA_BYTES_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 120); + gtk_tree_view_append_column (list_view, column); + + /* 8:th column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("VTag 1", renderer, + "text", VTAG1_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, VTAG1_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 120); + gtk_tree_view_append_column (list_view, column); + + + /* 9:th column... */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("VTag 2", renderer, + "text", VTAG2_COLUMN, + NULL); + gtk_tree_view_column_set_sort_column_id(column, VTAG2_COLUMN); + gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width(column, 120); + gtk_tree_view_append_column (list_view, column); + + /* Now enable the sorting of each column */ + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE); + gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(list_view), TRUE); /* Setup the selection handler */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); @@ -320,18 +318,13 @@ remove_analyse_child(struct sctp_analyse *child) static void add_to_clist(sctp_assoc_info_t* assinfo) -{ +{ GtkListStore *list_store = NULL; GtkTreeIter iter; list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (clist))); /* Get store */ -#if GTK_CHECK_VERSION(2,6,0) gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, -#else - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, -#endif PORT1_COLUMN, (guint32)assinfo->port1, PORT2_COLUMN, (guint32)assinfo->port2, PACKETS_COLUMN, assinfo->n_packets, @@ -341,7 +334,7 @@ static void add_to_clist(sctp_assoc_info_t* assinfo) DATA_BYTES_COLUMN, assinfo->n_data_bytes, VTAG1_COLUMN, assinfo->verification_tag1, VTAG2_COLUMN, assinfo->verification_tag2, - -1); + -1); } static void @@ -396,7 +389,7 @@ sctp_stat_on_apply_filter (GtkButton *button _U_, gpointer user_data _U_) if (filter_string != NULL) { port1 = selected_stream->port1; - port2 = selected_stream->port2; + port2 = selected_stream->port2; data_chunks = selected_stream->n_data_chunks; data_bytes = selected_stream->n_data_bytes; packets = selected_stream->n_packets; @@ -408,8 +401,8 @@ sctp_stat_on_apply_filter (GtkButton *button _U_, gpointer user_data _U_) while (list) { assoc = (sctp_assoc_info_t*)(list->data); - if (assoc->port1==port1 && assoc->port2==port2 - && assoc->n_packets==packets && assoc->n_data_chunks==data_chunks && assoc->n_data_bytes==data_bytes + if (assoc->port1==port1 && assoc->port2==port2 + && assoc->n_packets==packets && assoc->n_data_chunks==data_chunks && assoc->n_data_bytes==data_bytes && assoc->verification_tag1==vtag1 && assoc->verification_tag2==vtag2) { selected_stream=assoc; @@ -522,7 +515,7 @@ sctp_stat_on_filter (GtkButton *button _U_, gpointer user_data _U_) filter_string = gstring->str; g_string_free(gstring,FALSE); } - + if (filter_string != NULL) { gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), filter_string); } else { diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 11a4f7dc99..5264be8989 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -155,10 +155,8 @@ display_simple_dialog(gint type, gint btn_mask, char *message) gtk_label_set_markup(GTK_LABEL(msg_label), message); gtk_label_set_selectable(GTK_LABEL(msg_label), TRUE); -#if GTK_CHECK_VERSION(2,9,0) g_object_set(gtk_widget_get_settings(msg_label), "gtk-label-select-on-focus", FALSE, NULL); -#endif gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_FILL); gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5f, 0.0f); diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 443e235907..51cd479f95 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -504,10 +504,8 @@ create_list_view(void) list_view = GTK_TREE_VIEW(list); sortable = GTK_TREE_SORTABLE(list_store); -#if GTK_CHECK_VERSION(2,6,0) /* Speed up the list display */ gtk_tree_view_set_fixed_height_mode(list_view, TRUE); -#endif /* Setup the sortable columns */ gtk_tree_sortable_set_sort_column_id(sortable, CALL_COL_START_TIME, GTK_SORT_ASCENDING); @@ -710,11 +708,7 @@ voip_calls_dlg_create(void) gtk_tooltips_set_tip(tooltips, bt_player, "Launch the RTP player to listen the selected calls.", NULL); #endif /* HAVE_LIBPORTAUDIO */ -#if GTK_CHECK_VERSION(2,10,0) bt_select_all = gtk_button_new_from_stock(GTK_STOCK_SELECT_ALL); -#else - bt_select_all = gtk_button_new_with_label("Select All"); -#endif gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_select_all); GTK_WIDGET_SET_FLAGS(bt_select_all, GTK_CAN_DEFAULT); gtk_tooltips_set_tip(tooltips, bt_select_all, "Select all the calls", NULL); diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index 205bb781ec..55e15fc831 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -1793,7 +1793,6 @@ wlanstat_dlg_create (void) gtk_tree_view_set_headers_clickable(tree_view, TRUE); for (i = 0; i <= PROTECTION_COLUMN; i++) { -#if GTK_CHECK_VERSION(2,6,0) if (i == PERCENT_COLUMN) { renderer = gtk_cell_renderer_progress_new(); column = gtk_tree_view_column_new_with_attributes(titles[i], renderer, @@ -1803,9 +1802,6 @@ wlanstat_dlg_create (void) gtk_tree_view_column_set_expand(column, TRUE); gtk_tree_view_column_set_sort_column_id(column, PERCENT_VALUE_COLUMN); } else { -#else - { -#endif renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(titles[i], renderer, "text", i, @@ -1856,7 +1852,6 @@ wlanstat_dlg_create (void) gtk_tree_view_set_headers_clickable(tree_view, TRUE); for (i = 0; i <= COMMENT_COLUMN; i++) { -#if GTK_CHECK_VERSION(2,6,0) if (i == PERCENT_2_COLUMN) { renderer = gtk_cell_renderer_progress_new(); column = gtk_tree_view_column_new_with_attributes(detail_titles[i], renderer, @@ -1866,9 +1861,6 @@ wlanstat_dlg_create (void) gtk_tree_view_column_set_expand(column, TRUE); gtk_tree_view_column_set_sort_column_id(column, PERCENT_VALUE_2_COLUMN); } else { -#else - { -#endif renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(detail_titles[i], renderer, "text", i, |