Get rid of direct access to struct GtkToggleButton

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38113 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index c41f4a80246dc46784ed375e8f71cecc8eccc4c6..7e98758663df65ea44235e8fae7ef5bd9ebf2234 100644 (file)
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -1885,7 +1885,7 @@ static gboolean save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *u
        both = (GtkWidget*)g_object_get_data(G_OBJECT(fc), "both_rb");
        user_data = (user_data_t*)g_object_get_data(G_OBJECT(fc), "user_data");
 
-       if (GTK_TOGGLE_BUTTON(forw)->active || GTK_TOGGLE_BUTTON(both)->active) {
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(forw)) || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
                fp = ws_fopen(g_dest, "w");
                if (fp == NULL) {
                        open_failure_alert_box(g_dest, errno, TRUE);
@@ -1893,7 +1893,7 @@ static gboolean save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *u
                        return TRUE; /* we're done */
                }
 
-               if (GTK_TOGGLE_BUTTON(both)->active) {
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
                        fprintf(fp, "Forward\n");
                        if (ferror(fp)) {
                                write_failure_alert_box(g_dest, errno);
@@ -1959,9 +1959,9 @@ static gboolean save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *u
                }
        }
 
-       if (GTK_TOGGLE_BUTTON(rev)->active || GTK_TOGGLE_BUTTON(both)->active) {
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev)) || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
 
-               if (GTK_TOGGLE_BUTTON(both)->active) {
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
                        fp = ws_fopen(g_dest, "a");
                        if (fp == NULL) {
                                open_failure_alert_box(g_dest, errno, TRUE);
@@ -2545,7 +2545,7 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
        */
 
        /* we can not save in both directions */
-       if ((user_data->forward.saveinfo.saved == FALSE) && (user_data->reversed.saveinfo.saved == FALSE) && (GTK_TOGGLE_BUTTON (both)->active)) {
+       if ((user_data->forward.saveinfo.saved == FALSE) && (user_data->reversed.saveinfo.saved == FALSE) && (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both)))) {
                /* there are many combinations here, we just exit when first matches */
                if ((user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC) ||
                        (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC))
@@ -2566,8 +2566,8 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                return TRUE; /* we're done */
        }
        /* we can not save forward direction */
-       else if ((user_data->forward.saveinfo.saved == FALSE) && ((GTK_TOGGLE_BUTTON (forw)->active) ||
-               (GTK_TOGGLE_BUTTON (both)->active))) {
+       else if ((user_data->forward.saveinfo.saved == FALSE) && ((gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (forw))) ||
+               (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                        "Can't save forward direction in a file: Unsupported codec!");
@@ -2584,8 +2584,8 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                return TRUE; /* we're done */
        }
        /* we can not save reversed direction */
-       else if ((user_data->reversed.saveinfo.saved == FALSE) && ((GTK_TOGGLE_BUTTON (rev)->active) ||
-               (GTK_TOGGLE_BUTTON (both)->active))) {
+       else if ((user_data->reversed.saveinfo.saved == FALSE) && ((gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rev))) ||
+               (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                        "Can't save reversed direction in a file: Unsupported codec!");
@@ -2606,24 +2606,24 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
        }
 
 #if 0
-       if (GTK_TOGGLE_BUTTON (wav)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (wav)))
                format = SAVE_WAV_FORMAT;
        else
 #endif
-       if (GTK_TOGGLE_BUTTON (au)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (au)))
                format = SAVE_AU_FORMAT;
 #if 0
-       else if (GTK_TOGGLE_BUTTON (sw)->active)
+       else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (sw)))
                format = SAVE_SW_FORMAT;
 #endif
-       else if (GTK_TOGGLE_BUTTON (raw)->active)
+       else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (raw)))
                format = SAVE_RAW_FORMAT;
        else
                format = SAVE_NONE_FORMAT;
 
-       if (GTK_TOGGLE_BUTTON (rev)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rev)))
                channels = SAVE_REVERSE_DIRECTION_MASK;
-       else if (GTK_TOGGLE_BUTTON (both)->active)
+       else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both)))
                channels = SAVE_BOTH_DIRECTION_MASK;
        else
                channels = SAVE_FORWARD_DIRECTION_MASK;

diff --git a/gtk/menus.c b/gtk/menus.c
index 6cbb53e8500b02b368e0a891aac6a64af11104af..7a139e4c5e2cc974cbca48341b10e37cb59dab1e 100644 (file)
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -838,7 +838,7 @@ view_menu_auto_scroll_live_cb(GtkAction *action _U_, gpointer user_data _U_)
        if (!widget){
                g_warning("view_menu_auto_scroll_live_cb: No widget found");
        }else{
-               menu_auto_scroll_live_changed(GTK_CHECK_MENU_ITEM(gtk_check_menu_item_get_active(widget)));
+               menu_auto_scroll_live_changed(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
        }
 }
 #endif

diff --git a/gtk/prefs_nameres.c b/gtk/prefs_nameres.c
index 04c2ac44cf8c74498a18d99be4c297ae3fa45c2c..003444897d1e65d18f9af97ded97a21d52e52e63 100644 (file)
--- a/gtk/prefs_nameres.c
+++ b/gtk/prefs_nameres.c
@@ -275,9 +275,9 @@ nameres_prefs_fetch(GtkWidget *w)
 #ifdef HAVE_LIBSMI
        load_smi_modules_orig = prefs.load_smi_modules;
        load_smi_modules_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), LOAD_SMI_MODULES_KEY);
-       prefs.load_smi_modules = GTK_TOGGLE_BUTTON (load_smi_modules_cb)->active;
+       prefs.load_smi_modules = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (load_smi_modules_cb));
        suppress_smi_errors_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), SUPPRESS_SMI_ERRORS_KEY);
-       prefs.suppress_smi_errors = GTK_TOGGLE_BUTTON (suppress_smi_errors_cb)->active;
+       prefs.suppress_smi_errors = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (suppress_smi_errors_cb));
 
        /* Perform actions needed when enabling/disabling OID resolution */
        if (load_smi_modules_orig && !prefs.load_smi_modules) {

diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index f9e644dd8010636ad61a8446e136cf659b03d9b4..821f8da9dccde6e9157d31fa213f8d1978bf6f7a 100644 (file)
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1921,7 +1921,7 @@ static gboolean save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *u
        both = (GtkWidget*)g_object_get_data(G_OBJECT(fc), "both_rb");
        user_data = (user_data_t*)g_object_get_data(G_OBJECT(fc), "user_data");
 
-       if (GTK_TOGGLE_BUTTON(forw)->active || GTK_TOGGLE_BUTTON(both)->active) {
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(forw)) || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
                fp = ws_fopen(g_dest, "w");
                if (fp == NULL) {
                        open_failure_alert_box(g_dest, errno, TRUE);
@@ -1929,7 +1929,7 @@ static gboolean save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *u
                        return TRUE; /* we're done */
                }
 
-               if (GTK_TOGGLE_BUTTON(both)->active) {
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
                        fprintf(fp, "Forward\n");
                        if (ferror(fp)) {
                                write_failure_alert_box(g_dest, errno);
@@ -2003,9 +2003,9 @@ static gboolean save_csv_as_ok_cb(GtkWidget *w _U_, gpointer fc /*user_data_t *u
                }
        }
 
-       if (GTK_TOGGLE_BUTTON(rev)->active || GTK_TOGGLE_BUTTON(both)->active) {
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rev)) || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
 
-               if (GTK_TOGGLE_BUTTON(both)->active) {
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(both))) {
                        fp = ws_fopen(g_dest, "a");
                        if (fp == NULL) {
                                open_failure_alert_box(g_dest, errno, TRUE);
@@ -2556,7 +2556,7 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
        */
 
        /* we can not save in both directions */
-       if ((user_data->forward.saveinfo.saved == FALSE) && (user_data->reversed.saveinfo.saved == FALSE) && (GTK_TOGGLE_BUTTON (both)->active)) {
+       if ((user_data->forward.saveinfo.saved == FALSE) && (user_data->reversed.saveinfo.saved == FALSE) && (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both)))) {
                /* there are many combinations here, we just exit when first matches */
                if ((user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC) ||
                        (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC))
@@ -2581,8 +2581,8 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                return TRUE; /* we're done */
        }
        /* we can not save forward direction */
-       else if ((user_data->forward.saveinfo.saved == FALSE) && ((GTK_TOGGLE_BUTTON (forw)->active) ||
-               (GTK_TOGGLE_BUTTON (both)->active))) {
+       else if ((user_data->forward.saveinfo.saved == FALSE) && ((gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (forw))) ||
+               (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->forward.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                        "Can't save forward direction in a file: Unsupported codec!");
@@ -2602,8 +2602,8 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
                return TRUE; /* we're done */
        }
        /* we can not save reversed direction */
-       else if ((user_data->reversed.saveinfo.saved == FALSE) && ((GTK_TOGGLE_BUTTON (rev)->active) ||
-               (GTK_TOGGLE_BUTTON (both)->active))) {
+       else if ((user_data->reversed.saveinfo.saved == FALSE) && ((gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rev))) ||
+               (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both))))) {
                if (user_data->reversed.saveinfo.error_type == TAP_RTP_WRONG_CODEC)
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                        "Can't save reversed direction in a file: Unsupported codec!");
@@ -2627,24 +2627,24 @@ static gboolean save_voice_as_ok_cb(GtkWidget *w _U_, gpointer fc)
        }
 
 #if 0
-       if (GTK_TOGGLE_BUTTON (wav)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (wav)))
                format = SAVE_WAV_FORMAT;
        else
 #endif
-       if (GTK_TOGGLE_BUTTON (au)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (au)))
                format = SAVE_AU_FORMAT;
 #if 0
-       else if (GTK_TOGGLE_BUTTON (sw)->active)
+       else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (sw)))
                format = SAVE_SW_FORMAT;
 #endif
-       else if (GTK_TOGGLE_BUTTON (raw)->active)
+       else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (raw)))
                format = SAVE_RAW_FORMAT;
        else
                format = SAVE_NONE_FORMAT;
 
-       if (GTK_TOGGLE_BUTTON (rev)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rev)))
                channels = SAVE_REVERSE_DIRECTION_MASK;
-       else if (GTK_TOGGLE_BUTTON (both)->active)
+       else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (both)))
                channels = SAVE_BOTH_DIRECTION_MASK;
        else
                channels = SAVE_FORWARD_DIRECTION_MASK;

diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index 09ebbb4b28f2267feed69a9fc1f2b0d9ea7811bd..8044c0af4d3587396303bae1565a3af93fd62822 100644 (file)
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -315,7 +315,7 @@ bt_state(gboolean decode, gboolean play, gboolean pause, gboolean stop)
 
        gtk_widget_set_sensitive(bt_decode, decode);
        gtk_widget_set_sensitive(cb_use_rtp_timestamp, decode);
-       if (GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp)->active) {
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp))) {
                gtk_widget_set_sensitive(jitter_spinner, FALSE);
        } else {
                gtk_widget_set_sensitive(jitter_spinner, decode);
@@ -746,7 +746,7 @@ decode_rtp_stream(rtp_stream_info_t *rsi, gpointer ptr _U_)
 
                rtp_time = (double)(rp->info->info_timestamp-start_timestamp)/SAMPLE_RATE - start_rtp_time;
 
-               if (GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp)->active) {
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp))) {
                        arrive_time = rtp_time;
                } else {
                        arrive_time = (double)rp->arrive_offset/1000 - start_time;
@@ -1411,7 +1411,7 @@ static void channel_draw(rtp_channel_info_t* rci)
                                        (int) (i - offset),
                                        rci->draw_area->allocation.height-HEIGHT_TIME_LABEL+4);
 
-                               if(GTK_TOGGLE_BUTTON(cb_view_as_time_of_day)->active) {
+                               if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_view_as_time_of_day))) {
                                        seconds = rci->start_time_abs.secs + i * MULT / SAMPLE_RATE;
                                        timestamp = localtime(&seconds);
                                        g_snprintf(label_string, MAX_TIME_LABEL, "%02d:%02d:%02d", timestamp->tm_hour, timestamp->tm_min, timestamp->tm_sec);
@@ -1633,7 +1633,7 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _
 
 
        label = g_string_new("");
-       if (GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp)->active) {
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp))) {
                g_string_printf(label, "From %s:%d to %s:%d   Duration:%.2f   Out of Seq: %d(%.1f%%)   Wrong Timestamp: %d(%.1f%%)",
                get_addr_name(&(rci->first_stream->src_addr)), rci->first_stream->src_port,
                get_addr_name(&(rci->first_stream->dest_addr)), rci->first_stream->dest_port,

diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 39a2618c3360b9a7b141ce318d65dad9645cfb68..29d570a711b58a486f06c1ce2728c55caa8eb30f 100644 (file)
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -1152,7 +1152,7 @@ static void callback_zoom_inout (GtkWidget *toggle, gpointer data)
 {
        struct graph *g = (struct graph * )data;
 
-       if (GTK_TOGGLE_BUTTON (toggle)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (toggle)))
                g->zoom.flags &= ~ZOOM_OUT;
        else
                g->zoom.flags |= ZOOM_OUT;
@@ -1208,7 +1208,7 @@ static void callback_zoom_flags (GtkWidget *toggle, gpointer data)
        struct graph *g = (struct graph * )data;
        int flag = (long)g_object_get_data(G_OBJECT(toggle), "flag");
 
-       if (GTK_TOGGLE_BUTTON (toggle)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (toggle)))
                g->zoom.flags |= flag;
        else
                g->zoom.flags &= ~flag;
@@ -1413,7 +1413,7 @@ static void callback_mag_flags (GtkWidget *toggle, gpointer data)
        struct graph *g = (struct graph * )data;
        int flag = (long)g_object_get_data(G_OBJECT(toggle), "flag");
 
-       if (GTK_TOGGLE_BUTTON (toggle)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (toggle)))
                g->magnify.flags |= flag;
        else
                g->magnify.flags &= ~flag;
@@ -1450,7 +1450,7 @@ static void callback_zoomlock_h (GtkWidget *toggle, gpointer data)
 {
        struct graph *g = (struct graph * )data;
 
-       if (GTK_TOGGLE_BUTTON (toggle)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (toggle)))
                g->zoom.flags |= ZOOM_HLOCK;
        else
                g->zoom.flags &= ~ZOOM_HLOCK;
@@ -1460,7 +1460,7 @@ static void callback_zoomlock_v (GtkWidget *toggle, gpointer data)
 {
        struct graph *g = (struct graph * )data;
 
-       if (GTK_TOGGLE_BUTTON (toggle)->active)
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (toggle)))
                g->zoom.flags |= ZOOM_VLOCK;
        else
                g->zoom.flags &= ~ZOOM_VLOCK;
@@ -1497,7 +1497,7 @@ static void callback_cross_on_off (GtkWidget *toggle, gpointer data)
 {
        struct graph *g = (struct graph * )data;
 
-       if (GTK_TOGGLE_BUTTON (toggle)->active) {
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (toggle))) {
                int x, y;
                g->cross.draw = TRUE;
                gdk_window_get_pointer (g->drawing_area->window, &x, &y, 0);
@@ -1589,7 +1589,7 @@ static void callback_graph_type (GtkWidget *toggle, gpointer data)
 
        new_type = (long)g_object_get_data(G_OBJECT(toggle),"new-graph-type");
 
-       if (!GTK_TOGGLE_BUTTON (toggle)->active)
+       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (toggle)))
                return;
 
        old_type = g->type;