osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

OBJECT_..._DATA --> g_object_..._data 

svn path=/trunk/; revision=24899
This commit is contained in:
Bill Meier 2008-04-11 17:26:09 +00:00
parent 0502078a1b
commit ab9c1b68fd
11 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/rpc_progs.c
View File

@ -394,7 +394,7 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_)
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(win, "delete_event", window_delete_event_cb, NULL);

2
gtk/sctp_chunk_stat.c
View File

@ -328,7 +328,7 @@ sctpstat_init(const char *optarg, void *userdata _U_)
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_end(GTK_BOX(hs->vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(hs->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(hs->win, "delete_event", window_delete_event_cb, NULL);

2
gtk/sip_stat.c
View File

@ -643,7 +643,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_)
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(sp->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(sp->win, "delete_event", window_delete_event_cb, NULL);

2
gtk/smb2_stat.c
View File

@ -190,7 +190,7 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_)
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL);

2
gtk/smb_stat.c
View File

@ -229,7 +229,7 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_)
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL);

2
gtk/stats_tree_stat.c
View File

@ -306,7 +306,7 @@ static void init_gtk_tree(const char* optarg, void *userdata _U_) {
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(st->pr->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(GTK_WINDOW(st->pr->win), "delete_event", window_delete_event_cb, NULL);

4
gtk/summary_dlg.c
View File

@ -413,11 +413,11 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
}
gtk_container_add(GTK_CONTAINER(main_vb), bbox);
close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(sum_open_w, close_bt, window_cancel_button_cb);
if(topic_available(HELP_STATS_SUMMARY_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_SUMMARY_DIALOG);
}

2
gtk/supported_protos_dlg.c
View File

@ -158,7 +158,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
window_set_cancel_button(supported_w, ok_bt, window_cancel_button_cb);
gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(supported_w));

20
gtk/uat_gui.c
View File

@ -503,10 +503,10 @@ static void uat_edit_dialog(uat_t* uat, gint row) {
bbox = dlg_button_row_new(GTK_STOCK_CANCEL,GTK_STOCK_OK, NULL);
gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
bt_ok = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
bt_ok = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
SIGNAL_CONNECT(bt_ok, "clicked", uat_dlg_cb, dd);
bt_cancel = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
bt_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
SIGNAL_CONNECT(bt_cancel, "clicked", uat_cancel_dlg_cb, dd);
window_set_cancel_button(win, bt_cancel, NULL);
@ -586,10 +586,10 @@ static void uat_del_dlg(uat_t* uat, int idx) {
bbox = dlg_button_row_new(GTK_STOCK_CANCEL,GTK_STOCK_DELETE, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
bt_ok = OBJECT_GET_DATA(bbox,GTK_STOCK_DELETE);
bt_ok = g_object_get_data(G_OBJECT(bbox),GTK_STOCK_DELETE);
SIGNAL_CONNECT(bt_ok, "clicked", uat_del_cb, ud);
bt_cancel = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
bt_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
SIGNAL_CONNECT(bt_cancel, "clicked", uat_cancel_del_cb, ud);
window_set_cancel_button( win, bt_cancel, NULL);
@ -792,8 +792,8 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent* e _U_, gpointer u) {
bbox = dlg_button_row_new(GTK_STOCK_YES,GTK_STOCK_NO, NULL);
yes_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_YES);
no_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_NO);
yes_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES);
no_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO);
SIGNAL_CONNECT(no_bt, "clicked", uat_nosave_cb, uat);
SIGNAL_CONNECT(yes_bt, "clicked", uat_yessave_cb, uat);
@ -873,7 +873,7 @@ static GtkWidget* uat_window(void* u) {
if(uat->help) {
GtkWidget* help_btn;
rep->bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CANCEL, NULL);
help_btn = OBJECT_GET_DATA(rep->bbox,GTK_STOCK_HELP);
help_btn = g_object_get_data(G_OBJECT(rep->bbox),GTK_STOCK_HELP);
SIGNAL_CONNECT(help_btn, "clicked", uat_help_cb, uat);
} else {
@ -903,9 +903,9 @@ static GtkWidget* uat_window(void* u) {
gtk_box_pack_end(GTK_BOX(edit_hbox), rep->bt_delete, TRUE, FALSE, 5);
rep->bt_apply = OBJECT_GET_DATA(rep->bbox,GTK_STOCK_APPLY);
rep->bt_cancel = OBJECT_GET_DATA(rep->bbox,GTK_STOCK_CANCEL);
rep->bt_ok = OBJECT_GET_DATA(rep->bbox,GTK_STOCK_OK);
rep->bt_apply = g_object_get_data(G_OBJECT(rep->bbox),GTK_STOCK_APPLY);
rep->bt_cancel = g_object_get_data(G_OBJECT(rep->bbox),GTK_STOCK_CANCEL);
rep->bt_ok = g_object_get_data(G_OBJECT(rep->bbox),GTK_STOCK_OK);
gtk_box_pack_end(GTK_BOX(rep->vbox), rep->bbox, FALSE, FALSE, 0);

6
gtk/wlan_stat_dlg.c
View File

@ -538,16 +538,16 @@ wlanstat_dlg_create (void)
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
close_bt = OBJECT_GET_DATA (bbox, GTK_STOCK_CLOSE);
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button (wlanstat_dlg_w, close_bt, window_cancel_button_cb);
copy_bt = OBJECT_GET_DATA (bbox, GTK_STOCK_COPY);
copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
gtk_tooltips_set_tip(tooltips, copy_bt,
"Copy all statistical values of this page to the clipboard in CSV (Comma Seperated Values) format.", NULL);
SIGNAL_CONNECT(copy_bt, "clicked", wlan_copy_as_csv, hs->table);
if (topic_available (HELP_STATS_WLAN_TRAFFIC_DIALOG)) {
help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_WLAN_TRAFFIC_DIALOG);
}

18
gtk/wsp_stat.c
View File

@ -399,19 +399,19 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_)
}
/* Button row. */
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
window_set_cancel_button(sp->win, bt_close, window_cancel_button_cb);
bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(sp->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(sp->win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(sp->win, "destroy", win_destroy_cb, sp);
SIGNAL_CONNECT(sp->win, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(sp->win, "destroy", win_destroy_cb, sp);
gtk_widget_show_all(sp->win);
window_present(sp->win);
gtk_widget_show_all(sp->win);
window_present(sp->win);
cf_retap_packets(&cfile, FALSE);
cf_retap_packets(&cfile, FALSE);
}
static tap_dfilter_dlg wsp_stat_dlg = {