osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

GTK_CHECK_VERSION cleanup. 

svn path=/trunk/; revision=37972
This commit is contained in:
Anders Broman 2011-07-11 18:54:49 +00:00
parent 5ad2293f40
commit 347c71d9a8
5 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/about_dlg.c
View File

@ -285,10 +285,8 @@ about_wireshark_page_new(void)
main_vb = gtk_vbox_new(FALSE, 6);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12);
#if GTK_CHECK_VERSION(2,9,0)
g_object_set(gtk_widget_get_settings(main_vb),
"gtk-label-select-on-focus", FALSE, NULL);
#endif
about_wireshark(top_level, main_vb);

2
gtk/airpcap_dlg.c
View File

@ -2204,10 +2204,8 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
sortable = GTK_TREE_SORTABLE(key_list_store);
#if GTK_CHECK_VERSION(2,6,0)
/* Speed up the list display */
gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(key_list), TRUE);
#endif
/* Setup the sortable columns */
gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(key_list), FALSE);

20
gtk/airpcap_gui_utils.c
View File

@ -254,12 +254,7 @@ airpcap_add_key_to_list(GtkListStore *key_list_store, gchar* type, gchar* key, g
{
GtkTreeIter iter;
#if GTK_CHECK_VERSION(2,6,0)
gtk_list_store_insert_with_values(key_list_store , &iter, G_MAXINT,
#else
gtk_list_store_append(key_list_store, &iter);
gtk_list_store_set(key_list_store, &iter,
#endif
KL_COL_TYPE, type,
KL_COL_KEY, key,
KL_COL_SSID, ssid,
@ -296,12 +291,7 @@ airpcap_fill_key_list(GtkListStore *key_list_store)
if(curr_key->type == AIRPDCAP_KEY_TYPE_WEP)
{
#if GTK_CHECK_VERSION(2,6,0)
gtk_list_store_insert_with_values(key_list_store , &iter, G_MAXINT,
#else
gtk_list_store_append(key_list_store, &iter);
gtk_list_store_set(key_list_store, &iter,
#endif
KL_COL_TYPE, AIRPCAP_WEP_KEY_STRING,
KL_COL_KEY, curr_key->key->str,
KL_COL_SSID, "",
@ -314,12 +304,7 @@ airpcap_fill_key_list(GtkListStore *key_list_store)
else
s = "";
#if GTK_CHECK_VERSION(2,6,0)
gtk_list_store_insert_with_values(key_list_store , &iter, G_MAXINT,
#else
gtk_list_store_append(key_list_store, &iter);
gtk_list_store_set(key_list_store, &iter,
#endif
KL_COL_TYPE, AIRPCAP_WPA_PWD_KEY_STRING,
KL_COL_KEY, curr_key->key->str,
KL_COL_SSID, s,
@ -328,12 +313,7 @@ airpcap_fill_key_list(GtkListStore *key_list_store)
}
else if(curr_key->type == AIRPDCAP_KEY_TYPE_WPA_PMK)
{
#if GTK_CHECK_VERSION(2,6,0)
gtk_list_store_insert_with_values(key_list_store , &iter, G_MAXINT,
#else
gtk_list_store_append(key_list_store, &iter);
gtk_list_store_set(key_list_store, &iter,
#endif
KL_COL_TYPE, AIRPCAP_WPA_BIN_KEY_STRING,
KL_COL_KEY, curr_key->key->str,
KL_COL_SSID, "",

12
gtk/ansi_a_stat.c
View File

@ -140,12 +140,7 @@ ansi_a_stat_draw(
* :
* 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 , &iter, G_MAXINT,
#else
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
#endif
IEI_COLUMN, ansi_a_bsmap_strings[i].value,
MSG_NAME_COLUMN, (char *)ansi_a_bsmap_strings[i].strptr,
COUNT_COLUMN, stat_p->bsmap_message_type[ansi_a_bsmap_strings[i].value],
@ -166,12 +161,7 @@ ansi_a_stat_draw(
* :
* 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 , &iter, G_MAXINT,
#else
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
#endif
IEI_COLUMN, ansi_a_dtap_strings[i].value,
MSG_NAME_COLUMN, (char *)ansi_a_dtap_strings[i].strptr,
COUNT_COLUMN, stat_p->dtap_message_type[ansi_a_dtap_strings[i].value],
@ -216,10 +206,8 @@ GtkWidget* create_list(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, IEI_COLUMN, GTK_SORT_ASCENDING);

7
gtk/ansi_map_stat.c
View File

@ -103,10 +103,8 @@ GtkWidget* create_list(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, OP_CODE_COLUMN, GTK_SORT_ASCENDING);
@ -260,12 +258,7 @@ ansi_map_stat_draw(
* :
* 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 , &iter, G_MAXINT,
#else
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
#endif
OP_CODE_COLUMN, ansi_map_opr_code_strings[i].value,
OP_CODE_NAME_COLUMN, ansi_map_opr_code_strings[i].strptr,
COUNT_COLUMN, (guint)stat_p->message_type[ansi_map_opr_code_strings[i].value],