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

Get rid of direct access to struct GtkToggleButton 

svn path=/trunk/; revision=38113
This commit is contained in:
Jörg Mayer 2011-07-19 16:02:16 +00:00
parent 6d20f48e88
commit 1bf94efa12
6 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/iax2_analysis.c
View File

@ -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;

2
gtk/menus.c
View File

@ -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

4
gtk/prefs_nameres.c
View File

@ -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) {

30
gtk/rtp_analysis.c
View File

@ -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;

8
gtk/rtp_player.c
View File

@ -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,

14
gtk/tcp_graph.c
View File

@ -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;