More -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0...
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 8 Feb 2011 01:01:50 +0000 (01:01 +0000)
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 8 Feb 2011 01:01:50 +0000 (01:01 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35872 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/prefs_dlg.c
gtk/prefs_nameres.c
gtk/prefs_protocols.c

index ed7274e47244c5147598ab6672c4b2202da1163e..b278b997c31079aac44ddc2082bb6ab86711fb64 100644 (file)
@@ -780,12 +780,12 @@ fetch_preference_radio_buttons_val(GtkWidget *button,
   for (rb_entry = rb_group; rb_entry != NULL;
        rb_entry = g_slist_next(rb_entry)) {
     button = rb_entry->data;
-    if (GTK_TOGGLE_BUTTON(button)->active)
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
       break;
   }
 
   /* OK, now return the value corresponding to that button's label. */
-  return label_to_enum_val(GTK_BIN(button)->child, enumvals);
+  return label_to_enum_val(gtk_bin_get_child(GTK_BIN(button)), enumvals);
 }
 
 GtkWidget *
@@ -1017,7 +1017,7 @@ pref_fetch(pref_t *pref, gpointer user_data)
     break;
 
   case PREF_BOOL:
-    bval = GTK_TOGGLE_BUTTON(pref->control)->active;
+    bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pref->control));
     if (*pref->varp.boolp != bval) {
       *pref_changed_p = TRUE;
       *pref->varp.boolp = bval;
index c4b14759c0cc83a814506de46d01a269185edac9..a7e60fdac96a17bf5bd99d69640e4482dcb31188 100644 (file)
@@ -265,11 +265,11 @@ nameres_prefs_fetch(GtkWidget *w)
 #endif /* HAVE_C_ARES || HAVE_GNU_ADNS */
 
        prefs.name_resolve = RESOLV_NONE;
-       prefs.name_resolve |= (GTK_TOGGLE_BUTTON (m_resolv_cb)->active ? RESOLV_MAC : RESOLV_NONE);
-       prefs.name_resolve |= (GTK_TOGGLE_BUTTON (n_resolv_cb)->active ? RESOLV_NETWORK : RESOLV_NONE);
-       prefs.name_resolve |= (GTK_TOGGLE_BUTTON (t_resolv_cb)->active ? RESOLV_TRANSPORT : RESOLV_NONE);
+       prefs.name_resolve |= (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (m_resolv_cb)) ? RESOLV_MAC : RESOLV_NONE);
+       prefs.name_resolve |= (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (n_resolv_cb)) ? RESOLV_NETWORK : RESOLV_NONE);
+       prefs.name_resolve |= (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (t_resolv_cb)) ? RESOLV_TRANSPORT : RESOLV_NONE);
 #if defined(HAVE_C_ARES) || defined(HAVE_GNU_ADNS)
-       prefs.name_resolve |= (GTK_TOGGLE_BUTTON (c_resolv_cb)->active ? RESOLV_CONCURRENT : RESOLV_NONE);
+       prefs.name_resolve |= (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (c_resolv_cb)) ? RESOLV_CONCURRENT : RESOLV_NONE);
 
        prefs.name_resolve_concurrency = strtol (gtk_entry_get_text(
                GTK_ENTRY(resolv_concurrency_te)), NULL, 10);
index 348e7b6e2a315acd753eee14322e0adf4d7b543c..0b4225c0291cf755b05df0ecd9343c5a7b6cbf2e 100644 (file)
@@ -75,7 +75,7 @@ protocols_prefs_fetch(GtkWidget *w _U_)
         GtkWidget *display_hidden_cb;
 
         display_hidden_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), PROTOCOLS_SHOW_HIDDEN_KEY);
-        prefs.display_hidden_proto_items = (GTK_TOGGLE_BUTTON (display_hidden_cb)->active ? TRUE : FALSE);
+        prefs.display_hidden_proto_items = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (display_hidden_cb)) ? TRUE : FALSE);
 }
 
 void