diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-05-03 05:03:51 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-05-03 05:03:51 +0000 |
| commit | 9387dab7fed306a8be701334f0ef64073d399840 (patch) | |
| tree | fd149f847cde48fea6c67dcd6fdb2b02002984d7 /gtk | |
| parent | 66d48120c2628681c9819a3ccd7b16239b9c322f (diff) | |
Try to fix the solaris build bot.
svn path=/trunk/; revision=32640
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/manual_addr_resolv.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gtk/manual_addr_resolv.c b/gtk/manual_addr_resolv.c index 369c3d6d4c..d641f61933 100644 --- a/gtk/manual_addr_resolv.c +++ b/gtk/manual_addr_resolv.c @@ -57,11 +57,21 @@ man_addr_resolv_ok (GtkWidget *w _U_, gpointer data _U_) GtkWidget *addr_cb, *name_te, *resolv_cb; const gchar *addr, *name; gboolean active, redissect = FALSE; - +#if GTK_CHECK_VERSION(2,6,0) +#else + GtkTreeIter iter; + GtkTreeModel *model; +#endif addr_cb = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "address"); name_te = g_object_get_data (G_OBJECT(man_addr_resolv_dlg), "name"); + #if GTK_CHECK_VERSION(2,6,0) addr = gtk_combo_box_get_active_text (GTK_COMBO_BOX(addr_cb)); + #else + gtk_combo_box_get_active_iter(GTK_COMBO_BOX(addr_cb), &iter); + model = gtk_combo_box_get_model(GTK_COMBO_BOX(addr_cb)); + gtk_tree_model_get(model, &iter, 0, &addr, -1); + #endif name = gtk_entry_get_text (GTK_ENTRY (name_te)); if (strlen (addr) && strlen (name)) { |