osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity

Rewrote to not use gtk_combo_box_get_active_text().

Browse source 
svn path=/trunk/; revision=25412
This commit is contained in:
Stig Bjørlykke 2008-06-02 21:35:22 +00:00
parent 561f66c1b8
commit d8b975c6cb
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gtk/prefs_capture.c
View file

@ -458,7 +458,7 @@ ifopts_edit_destroy_cb(GtkWidget *win, gpointer data _U_)
} }
} }
static int static gint
ifopts_description_to_val (const char *if_name, const char *descr) ifopts_description_to_val (const char *if_name, const char *descr)
{ {
data_link_info_t *data_link_info; data_link_info_t *data_link_info;
@ -570,7 +570,9 @@ static void
ifopts_edit_linktype_changed_cb(GtkComboBox *cb, gpointer udata) ifopts_edit_linktype_changed_cb(GtkComboBox *cb, gpointer udata)
{ {
gchar *ifnm, *text; gchar *ifnm, *text;
int linktype; gint linktype;
GtkTreeModel *model;
GtkTreeIter iter;
if (ifrow == IFOPTS_IF_NOSEL) if (ifrow == IFOPTS_IF_NOSEL)
return; return;
@ -581,12 +583,13 @@ ifopts_edit_linktype_changed_cb(GtkComboBox *cb, gpointer udata)
gtk_clist_get_text(GTK_CLIST(udata), ifrow, 0, &ifnm); gtk_clist_get_text(GTK_CLIST(udata), ifrow, 0, &ifnm);
/* get current description text and set value in current CList */ /* get current description text and set value in current CList */
text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cb)); if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(cb), &iter)) {
model = gtk_combo_box_get_model(GTK_COMBO_BOX(cb));
gtk_tree_model_get(model, &iter, 0, &text, -1);
gtk_clist_set_text(GTK_CLIST(udata), ifrow, 2, text); gtk_clist_set_text(GTK_CLIST(udata), ifrow, 2, text);
linktype = ifopts_description_to_val(ifnm, text); linktype = ifopts_description_to_val(ifnm, text);
gtk_clist_set_row_data(GTK_CLIST(udata), ifrow, GINT_TO_POINTER(linktype)); gtk_clist_set_row_data(GTK_CLIST(udata), ifrow, GINT_TO_POINTER(linktype));
}
g_free(text);
} }
/* /*