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

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

svn path=/trunk/; revision=24895
This commit is contained in:
Bill Meier 2008-04-11 16:44:31 +00:00
parent 10f2ea11d5
commit 74e1c12021
18 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/cfilter_combo_utils.c
View File

@ -42,7 +42,7 @@ static guint cfilter_combo_max_recent = 20;
static gboolean
cfilter_combo_add(gchar *s) {
GList *li;
GList *fl = OBJECT_GET_DATA(top_level, E_CFILTER_FL_KEY);
GList *fl = g_object_get_data(G_OBJECT(top_level), E_CFILTER_FL_KEY);
li = g_list_first(fl);
while (li) {
@ -55,7 +55,7 @@ cfilter_combo_add(gchar *s) {
li = li->next;
}
fl = g_list_append(fl, s);
OBJECT_SET_DATA(top_level, E_CFILTER_FL_KEY, fl);
g_object_set_data(G_OBJECT(top_level), E_CFILTER_FL_KEY, fl);
return TRUE;
}
@ -64,7 +64,7 @@ cfilter_combo_add(gchar *s) {
* of the combo box GList to the user's recent file */
void
cfilter_combo_recent_write_all(FILE *rf) {
GList *cfilter_list = OBJECT_GET_DATA(top_level, E_CFILTER_FL_KEY);
GList *cfilter_list = g_object_get_data(G_OBJECT(top_level), E_CFILTER_FL_KEY);
GList *li;
guint max_count = 0;

4
gtk/column_prefs.c
View File

@ -81,7 +81,7 @@ column_prefs_show() {
main_vb = gtk_vbox_new(FALSE, 5);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
gtk_widget_show(main_vb);
OBJECT_SET_DATA(GTK_OBJECT(main_vb), E_COL_CM_KEY, (gpointer)FALSE);
g_object_set_data(G_OBJECT(GTK_OBJECT(main_vb)), E_COL_CM_KEY, (gpointer)FALSE);
/* Top row: Column list and buttons */
top_hb = gtk_hbox_new(FALSE, 5);
@ -569,5 +569,5 @@ void
column_prefs_destroy(GtkWidget *w) {
/* Let the list cb know we're about to destroy the widget tree, so it */
/* doesn't operate on widgets that don't exist. */
OBJECT_SET_DATA(w, E_COL_CM_KEY, (gpointer)TRUE);
g_object_set_data(G_OBJECT(w), E_COL_CM_KEY, (gpointer)TRUE);
}

24
gtk/dcerpc_stat.c
View File

@ -327,7 +327,7 @@ gtk_dcerpcstat_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(rs->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL);
@ -554,7 +554,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
"Service Response Time Statistics Filter",
FALSE,
FALSE,
FALSE
FALSE
};
/* if the window is already open, bring it to front and
@ -634,7 +634,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
/* Filter entry */
filter_entry=gtk_entry_new();
SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
SIGNAL_CONNECT(filter_entry, "changed", filter_te_syntax_check_cb, NULL);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
if(filter){
@ -645,21 +645,21 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_box_pack_start(GTK_BOX(dlg_box), filter_box, TRUE, TRUE, 0);
gtk_widget_show(filter_box);
OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_entry);
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry);
/* button box */
bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
bbox = dlg_button_row_new(WIRESHARK_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL);
gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
gtk_widget_show(bbox);
start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
g_signal_connect_swapped(start_button, "clicked",
G_CALLBACK(dcerpcstat_start_button_clicked), NULL);
cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
window_set_cancel_button(dlg, cancel_button, window_cancel_button_cb);
SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
/* Catch the "activate" signal on the filter text entry, so that
@ -669,13 +669,13 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
focus. */
dlg_set_activate(filter_entry, start_button);
gtk_widget_grab_default(start_button );
gtk_widget_grab_default(start_button );
/* Give the initial focus to the "Filter" entry box. */
gtk_widget_grab_focus(filter_entry);
gtk_widget_show_all(dlg);
window_present(dlg);
window_present(dlg);
}
void

8
gtk/decode_as_ber.c
View File

@ -66,7 +66,7 @@ decode_ber(GtkWidget *notebook_pg)
GtkTreeIter iter;
syntax = NULL;
list = OBJECT_GET_DATA(notebook_pg, E_PAGE_LIST);
list = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_LIST);
if (requested_action == E_DECODE_NO)
gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)));
@ -125,9 +125,9 @@ decode_ber_add_page (packet_info *pinfo _U_)
/* create page content */
page_hb = gtk_hbox_new(FALSE, 5);
OBJECT_SET_DATA(page_hb, E_PAGE_ACTION, decode_ber);
OBJECT_SET_DATA(page_hb, E_PAGE_TABLE, "ASN.1");
OBJECT_SET_DATA(page_hb, E_PAGE_TITLE, "ASN.1");
g_object_set_data(G_OBJECT(page_hb), E_PAGE_ACTION, decode_ber);
g_object_set_data(G_OBJECT(page_hb), E_PAGE_TABLE, "ASN.1");
g_object_set_data(G_OBJECT(page_hb), E_PAGE_TITLE, "ASN.1");
info_vb = gtk_vbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(page_hb), info_vb, TRUE, TRUE, 0);

14
gtk/decode_as_dcerpc.c
View File

@ -294,13 +294,13 @@ decode_dcerpc(GtkWidget *notebook_pg)
decode_dcerpc_bind_values_t *binding;
list = OBJECT_GET_DATA(notebook_pg, E_PAGE_LIST);
list = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_LIST);
if (requested_action == E_DECODE_NO)
gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)));
binding = OBJECT_GET_DATA(notebook_pg, E_PAGE_BINDING);
binding = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_BINDING);
/*table_name = OBJECT_GET_DATA(notebook_pg, E_PAGE_TABLE);*/
/*table_name = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_TABLE);*/
table_name = "DCE-RPC";
decode_change_one_dcerpc_binding(table_name, binding, list);
}
@ -362,10 +362,10 @@ decode_dcerpc_add_page (packet_info *pinfo)
/* create page content */
page_hb = gtk_hbox_new(FALSE, 5);
OBJECT_SET_DATA(page_hb, E_PAGE_ACTION, decode_dcerpc);
OBJECT_SET_DATA(page_hb, E_PAGE_TABLE, "DCE-RPC");
OBJECT_SET_DATA(page_hb, E_PAGE_TITLE, "DCE-RPC");
OBJECT_SET_DATA(page_hb, E_PAGE_BINDING, binding);
g_object_set_data(G_OBJECT(page_hb), E_PAGE_ACTION, decode_dcerpc);
g_object_set_data(G_OBJECT(page_hb), E_PAGE_TABLE, "DCE-RPC");
g_object_set_data(G_OBJECT(page_hb), E_PAGE_TITLE, "DCE-RPC");
g_object_set_data(G_OBJECT(page_hb), E_PAGE_BINDING, binding);
info_vb = gtk_vbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(page_hb), info_vb, TRUE, TRUE, 0);

8
gtk/dlg_utils.c
View File

@ -48,7 +48,7 @@ dlg_button_new(GtkWidget *hbox, GtkWidget *button_hbox, const gchar *stock_id)
button = BUTTON_NEW_FROM_STOCK(stock_id);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
OBJECT_SET_DATA(hbox, stock_id, button);
g_object_set_data(G_OBJECT(hbox), stock_id, button);
gtk_box_pack_end(GTK_BOX(button_hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
return button;
@ -68,7 +68,7 @@ dlg_button_focus_nth(GtkWidget *hbox, gint focus_item) {
if (!hbox)
return;
button_hbox = OBJECT_GET_DATA(hbox, BUTTON_HBOX_KEY);
button_hbox = g_object_get_data(G_OBJECT(hbox), BUTTON_HBOX_KEY);
children = gtk_container_children(GTK_CONTAINER(button_hbox));
while (children) {
@ -188,7 +188,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
button_hbox = gtk_hbutton_box_new();
gtk_box_pack_end(GTK_BOX(hbox), button_hbox, TRUE, TRUE, 0);
OBJECT_SET_DATA(hbox, BUTTON_HBOX_KEY, button_hbox);
g_object_set_data(G_OBJECT(hbox), BUTTON_HBOX_KEY, button_hbox);
gtk_widget_show(button_hbox);
help_hbox = gtk_hbutton_box_new();
@ -210,7 +210,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
if (help) {
button = BUTTON_NEW_FROM_STOCK(help);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
OBJECT_SET_DATA(hbox, help, button);
g_object_set_data(G_OBJECT(hbox), help, button);
gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
buttons--;

8
gtk/expert_dlg.c
View File

@ -440,7 +440,7 @@ expert_dlg_severity_cb(GtkWidget *w, gpointer data)
expert_tapdata_t * etd;
etd = OBJECT_GET_DATA(w, "tapdata");
etd = g_object_get_data(G_OBJECT(w), "tapdata");
etd->severity_report_level = expert_severity_om_vals[i].value;
@ -517,7 +517,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_)
menu=gtk_menu_new();
for(i=0; expert_severity_om_vals[i].strptr != NULL;i++){
menu_item=gtk_menu_item_new_with_label(expert_severity_om_vals[i].strptr);
OBJECT_SET_DATA(menu_item, "tapdata", etd);
g_object_set_data(G_OBJECT(menu_item), "tapdata", etd);
SIGNAL_CONNECT(menu_item, "activate", expert_dlg_severity_cb, (long) i);
gtk_menu_append(GTK_MENU(menu), menu_item);
if(expert_severity_om_vals[i].value == (guint) etd->severity_report_level) {
@ -555,11 +555,11 @@ expert_dlg_init(const char *optarg, void* userdata _U_)
}
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(etd->win, close_bt, window_cancel_button_cb);
if(topic_available(HELP_EXPERT_INFO_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_EXPERT_INFO_DIALOG);
gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
}

14
gtk/file_dlg.c
View File

@ -219,7 +219,7 @@ file_selection_browse(GtkWidget *file_bt, GtkWidget *file_te, const char *label,
/* Has a file selection dialog box already been opened for that top-level
widget? */
fs = OBJECT_GET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY);
fs = g_object_get_data(G_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY);
if (fs != NULL) {
/* Yes. Just re-activate that dialog box. */
reactivate_window(fs);
@ -228,13 +228,13 @@ file_selection_browse(GtkWidget *file_bt, GtkWidget *file_te, const char *label,
fs = file_selection_new(label, action);
OBJECT_SET_DATA(fs, PRINT_FILE_TE_KEY, file_te);
g_object_set_data(G_OBJECT(fs), PRINT_FILE_TE_KEY, file_te);
/* Set the E_FS_CALLER_PTR_KEY for the new dialog to point to our caller. */
OBJECT_SET_DATA(fs, E_FS_CALLER_PTR_KEY, caller);
g_object_set_data(G_OBJECT(fs), E_FS_CALLER_PTR_KEY, caller);
/* Set the E_FILE_SEL_DIALOG_PTR_KEY for the caller to point to us */
OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, fs);
g_object_set_data(G_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, fs);
/* Call a handler when the file selection box is destroyed, so we can inform
our caller, if any, that it's been destroyed. */
@ -283,7 +283,7 @@ file_selection_browse_ok_cb(GtkWidget *w _U_, gpointer data)
return;
}
gtk_entry_set_text(GTK_ENTRY(OBJECT_GET_DATA(win, PRINT_FILE_TE_KEY)),
gtk_entry_set_text(GTK_ENTRY(g_object_get_data(G_OBJECT(win), PRINT_FILE_TE_KEY)),
f_name);
window_destroy(GTK_WIDGET(win));
@ -299,10 +299,10 @@ file_selection_browse_destroy_cb(GtkWidget *win, GtkWidget* parent_te)
/* Get the widget that requested that we be popped up.
(It should arrange to destroy us if it's destroyed, so
that we don't get a pointer to a non-existent window here.) */
caller = OBJECT_GET_DATA(win, E_FS_CALLER_PTR_KEY);
caller = g_object_get_data(G_OBJECT(win), E_FS_CALLER_PTR_KEY);
/* Tell it we no longer exist. */
OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, NULL);
g_object_set_data(G_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, NULL);
/* Give the focus to the file text entry widget so the user can just press
Return to print to the file. */

16
gtk/firewall_dlg.c
View File

@ -239,7 +239,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
for (i = 0; i < NUM_PRODS; i++) {
menu_item = gtk_menu_item_new_with_label(products[i].name);
SIGNAL_CONNECT(menu_item, "activate", select_product, GUINT_TO_POINTER(i));
OBJECT_SET_DATA(menu_item, WS_RULE_INFO_KEY, rule_info);
g_object_set_data(G_OBJECT(menu_item), WS_RULE_INFO_KEY, rule_info);
gtk_menu_append(GTK_MENU(menu), menu_item);
/* if (i == 0)
gtk_menu_item_select(GTK_MENU_ITEM(menu_item)); */
@ -308,7 +308,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
window_set_cancel_button(rule_w, button, window_cancel_button_cb);
/* Tuck away the rule_info object into the window */
OBJECT_SET_DATA(rule_w, WS_RULE_INFO_KEY, rule_info);
g_object_set_data(G_OBJECT(rule_w), WS_RULE_INFO_KEY, rule_info);
SIGNAL_CONNECT(rule_w, "delete_event", window_delete_event_cb, NULL);
SIGNAL_CONNECT(rule_w, "destroy", firewall_destroy_cb, NULL);
@ -329,7 +329,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
menu_item = gtk_menu_item_new_with_label(name); \
SIGNAL_CONNECT(menu_item, "activate", select_filter, \
GUINT_TO_POINTER(rt)); \
OBJECT_SET_DATA(menu_item, WS_RULE_INFO_KEY, rule_info); \
g_object_set_data(G_OBJECT(menu_item), WS_RULE_INFO_KEY, rule_info); \
gtk_menu_append(GTK_MENU(menu), menu_item); \
if (! rt_set) { \
rt_set = TRUE; \
@ -349,7 +349,7 @@ select_product(GtkWidget *w, gpointer data)
rule_type_t rule_type = RT_NONE;
gboolean rt_set = FALSE, sensitive = FALSE;
rule_info = OBJECT_GET_DATA(w, WS_RULE_INFO_KEY);
rule_info = g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
if (prod >= NUM_PRODS || !rule_info)
return;
@ -429,7 +429,7 @@ select_filter(GtkWidget *w, gpointer data)
rule_type_t cur_type = GPOINTER_TO_UINT(data);
rule_info_t *rule_info;
rule_info = OBJECT_GET_DATA(w, WS_RULE_INFO_KEY);
rule_info = g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
if (cur_type >= NUM_RULE_TYPES || !rule_info)
return;
@ -660,7 +660,7 @@ firewall_destroy_cb(GtkWidget *w, gpointer data _U_)
{
rule_info_t *rule_info;
rule_info = OBJECT_GET_DATA(w, WS_RULE_INFO_KEY);
rule_info = g_object_get_data(G_OBJECT(w), WS_RULE_INFO_KEY);
forget_rule_info(rule_info);
g_free(rule_info);
@ -705,7 +705,7 @@ firewall_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
rule_info->firewall_save_as_w = new_win;
/* Tuck away the rule_info object into the window */
OBJECT_SET_DATA(new_win, WS_RULE_INFO_KEY, rule_info);
g_object_set_data(G_OBJECT(new_win), WS_RULE_INFO_KEY, rule_info);
SIGNAL_CONNECT(new_win, "destroy", firewall_save_as_destroy_cb, rule_info);
@ -763,7 +763,7 @@ firewall_save_as_ok_cb(GtkWidget * w _U_, gpointer fs)
return;
}
rule_info = OBJECT_GET_DATA(fs, WS_RULE_INFO_KEY);
rule_info = g_object_get_data(G_OBJECT(fs), WS_RULE_INFO_KEY);
fh = eth_fopen(to_name, "w");
if (fh == NULL) {
open_failure_alert_box(to_name, errno, TRUE);

22
gtk/follow_stream.c
View File

@ -313,11 +313,11 @@ follow_find_cb(GtkWidget * w _U_, gpointer data)
buttons_row = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL,
NULL);
gtk_container_add(GTK_CONTAINER(main_vb), buttons_row);
find_bt = OBJECT_GET_DATA(buttons_row, GTK_STOCK_FIND);
cancel_bt = OBJECT_GET_DATA(buttons_row, GTK_STOCK_CANCEL);
find_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_FIND);
cancel_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_CANCEL);
SIGNAL_CONNECT(find_bt, "clicked", follow_find_button_cb, follow_info);
OBJECT_SET_DATA(find_bt, "find_string", find_text_box);
g_object_set_data(G_OBJECT(find_bt), "find_string", find_text_box);
window_set_cancel_button(find_dlg_w, cancel_bt,
window_cancel_button_cb);
@ -341,7 +341,7 @@ follow_find_button_cb(GtkWidget * w, gpointer data)
GtkWidget *find_string_w;
/* Get the text the user typed into the find field */
find_string_w = (GtkWidget *)OBJECT_GET_DATA(w, "find_string");
find_string_w = (GtkWidget *)g_object_get_data(G_OBJECT(w), "find_string");
find_string = gtk_entry_get_text(GTK_ENTRY(find_string_w));
/* Get the buffer associated with the follow stream */
@ -524,7 +524,7 @@ follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
follow_info->follow_save_as_w = new_win;
/* Tuck away the follow_info object into the window */
OBJECT_SET_DATA(new_win, E_FOLLOW_INFO_KEY, follow_info);
g_object_set_data(G_OBJECT(new_win), E_FOLLOW_INFO_KEY, follow_info);
SIGNAL_CONNECT(new_win, "destroy", follow_save_as_destroy_cb,
follow_info);
@ -582,7 +582,7 @@ follow_save_as_ok_cb(GtkWidget * w _U_, gpointer fs)
return;
}
follow_info = OBJECT_GET_DATA(fs, E_FOLLOW_INFO_KEY);
follow_info = g_object_get_data(G_OBJECT(fs), E_FOLLOW_INFO_KEY);
if (follow_info->show_type == SHOW_RAW) {
/* Write the data out as raw binary data */
fh = eth_fopen(to_name, "wb");
@ -882,26 +882,26 @@ follow_stream(gchar *title, follow_info_t *follow_info,
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_FILTER_OUT_STREAM);
button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_FILTER_OUT_STREAM);
gtk_tooltips_set_tip (tooltips, button,
"Build a display filter which cuts this stream from the capture", NULL);
SIGNAL_CONNECT(button, "clicked", follow_filter_out_stream,
follow_info);
button = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
window_set_cancel_button(streamwindow, button, window_cancel_button_cb);
gtk_tooltips_set_tip (tooltips, button,
"Close the dialog and keep the current display filter", NULL);
gtk_widget_grab_default(button);
if(topic_available(HELP_FILESET_DIALOG)) {
button = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
SIGNAL_CONNECT(button, "clicked", topic_cb,
HELP_FOLLOW_TCP_STREAM_DIALOG);
}
/* Tuck away the follow_info object into the window */
OBJECT_SET_DATA(streamwindow, E_FOLLOW_INFO_KEY, follow_info);
g_object_set_data(G_OBJECT(streamwindow), E_FOLLOW_INFO_KEY, follow_info);
follow_load_text(follow_info);
remember_follow_info(follow_info);
@ -930,7 +930,7 @@ follow_destroy_cb(GtkWidget *w, gpointer data _U_)
GList *cur;
int i;
follow_info = OBJECT_GET_DATA(w, E_FOLLOW_INFO_KEY);
follow_info = g_object_get_data(G_OBJECT(w), E_FOLLOW_INFO_KEY);
switch(follow_info->follow_type) {

8
gtk/funnel_stat.c
View File

@ -195,7 +195,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) {
tw->bt_close = gtk_button_new_with_label("Close");
GTK_WIDGET_SET_FLAGS(tw->bt_close, GTK_CAN_DEFAULT);
OBJECT_SET_DATA(hbox, "Close", tw->bt_close);
g_object_set_data(G_OBJECT(hbox), "Close", tw->bt_close);
gtk_box_pack_end(GTK_BOX(hbox), tw->bt_close, FALSE, FALSE, 0);
gtk_widget_show(tw->bt_close);
@ -445,13 +445,13 @@ static void funnel_new_dialog(const gchar* title,
}
bbox = dlg_button_row_new(GTK_STOCK_CANCEL,GTK_STOCK_OK, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
gtk_box_pack_start(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", funnel_dlg_cb, dd);
gtk_widget_grab_default(bt_ok);
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", funnel_cancel_btn_cb, win);
gtk_widget_grab_default(bt_cancel);

10
gtk/goto_dlg.c
View File

@ -81,14 +81,14 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_container_add(GTK_CONTAINER(main_vb), bbox);
gtk_widget_show(bbox);
ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_JUMP_TO);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_JUMP_TO);
SIGNAL_CONNECT(ok_bt, "clicked", goto_frame_ok_cb, goto_frame_w);
cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
window_set_cancel_button(goto_frame_w, cancel_bt, window_cancel_button_cb);
if(topic_available(HELP_GOTO_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_GOTO_DIALOG);
}
@ -104,7 +104,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_grab_focus(fnumber_te);
/* Attach pointers to needed widgets to the capture prefs window/object */
OBJECT_SET_DATA(goto_frame_w, E_GOTO_FNUMBER_KEY, fnumber_te);
g_object_set_data(G_OBJECT(goto_frame_w), E_GOTO_FNUMBER_KEY, fnumber_te);
SIGNAL_CONNECT(goto_frame_w, "delete_event", window_delete_event_cb, NULL);
@ -120,7 +120,7 @@ goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
guint fnumber;
char *p;
fnumber_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_GOTO_FNUMBER_KEY);
fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_GOTO_FNUMBER_KEY);
fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
fnumber = strtoul(fnumber_text, &p, 10);

26
gtk/graph_analysis.c
View File

@ -1011,9 +1011,9 @@ static void dialog_graph_redraw(graph_analysis_data_t* user_data)
static gint button_press_event(GtkWidget *widget, GdkEventButton *event _U_)
{
graph_analysis_data_t *user_data;
guint32 item;
guint32 item;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
if (event->type != GDK_BUTTON_PRESS) return TRUE;
@ -1037,7 +1037,7 @@ static gint scroll_event(GtkWidget *widget, GdkEventScroll *event)
{
graph_analysis_data_t *user_data;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
/* Up scroll */
switch(event->direction) {
@ -1070,7 +1070,7 @@ static gint key_press_event(GtkWidget *widget, GdkEventKey *event _U_)
{
graph_analysis_data_t *user_data;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
/* if there is nothing selected, just return */
if (user_data->dlg.selected_item == 0xFFFFFFFF) return TRUE;
@ -1105,7 +1105,7 @@ static gint expose_event(GtkWidget *widget, GdkEventExpose *event)
{
graph_analysis_data_t *user_data;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
if(!user_data){
exit(10);
}
@ -1126,7 +1126,7 @@ static gint expose_event_comments(GtkWidget *widget, GdkEventExpose *event)
{
graph_analysis_data_t *user_data;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
if(!user_data){
exit(10);
}
@ -1147,7 +1147,7 @@ static gint expose_event_time(GtkWidget *widget, GdkEventExpose *event)
{
graph_analysis_data_t *user_data;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
if(!user_data){
exit(10);
}
@ -1190,7 +1190,7 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
{0, 0xFFFF, 0xFFFF, 0x99FF}
};
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
if(!user_data){
exit(10);
@ -1237,7 +1237,7 @@ static gint configure_event_comments(GtkWidget *widget, GdkEventConfigure *event
{
graph_analysis_data_t *user_data;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
if(!user_data){
exit(10);
@ -1270,7 +1270,7 @@ static gint configure_event_time(GtkWidget *widget, GdkEventConfigure *event _U_
{
graph_analysis_data_t *user_data;
user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
user_data=(graph_analysis_data_t *)g_object_get_data(G_OBJECT(widget), "graph_analysis_data_t");
if(!user_data){
exit(10);
@ -1358,7 +1358,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
/* create "time" draw area */
user_data->dlg.draw_area_time=gtk_drawing_area_new();
WIDGET_SET_SIZE(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.pixmap_height);
OBJECT_SET_DATA(user_data->dlg.draw_area_time, "graph_analysis_data_t", user_data);
g_object_set_data(G_OBJECT(user_data->dlg.draw_area_time), "graph_analysis_data_t", user_data);
/* create "comments" draw area */
user_data->dlg.draw_area_comments=gtk_drawing_area_new();
@ -1370,7 +1370,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
gtk_container_add(GTK_CONTAINER(viewport_comments), user_data->dlg.draw_area_comments);
gtk_container_add(GTK_CONTAINER(scroll_window_comments), viewport_comments);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport_comments), GTK_SHADOW_NONE);
OBJECT_SET_DATA(user_data->dlg.draw_area_comments, "graph_analysis_data_t", user_data);
g_object_set_data(G_OBJECT(user_data->dlg.draw_area_comments), "graph_analysis_data_t", user_data);
gtk_widget_add_events (user_data->dlg.draw_area_comments, GDK_BUTTON_PRESS_MASK);
SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "scroll_event", scroll_event, user_data);
@ -1391,7 +1391,7 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
gtk_container_add(GTK_CONTAINER(viewport), user_data->dlg.draw_area);
gtk_container_add(GTK_CONTAINER(user_data->dlg.scroll_window), viewport);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
OBJECT_SET_DATA(user_data->dlg.draw_area, "graph_analysis_data_t", user_data);
g_object_set_data(G_OBJECT(user_data->dlg.draw_area), "graph_analysis_data_t", user_data);
GTK_WIDGET_SET_FLAGS(user_data->dlg.draw_area, GTK_CAN_FOCUS);
gtk_widget_grab_focus(user_data->dlg.draw_area);

12
gtk/gui_utils.c
View File

@ -156,7 +156,7 @@ window_new_with_geom(GtkWindowType type, const gchar *title, const gchar *geom_n
window_geometry_t geom;
GtkWidget *win = window_new(type, title);
OBJECT_SET_DATA(win, WINDOW_GEOM_KEY, (gpointer)g_strdup(geom_name));
g_object_set_data(G_OBJECT(win), WINDOW_GEOM_KEY, (gpointer)g_strdup(geom_name));
/* do we have a previously saved size and position of this window? */
if(geom_name) {
@ -203,7 +203,7 @@ window_present(GtkWidget *win)
gtk_window_present(GTK_WINDOW(win));
/* do we have a previously saved size and position of this window? */
name = OBJECT_GET_DATA(win, WINDOW_GEOM_KEY);
name = g_object_get_data(G_OBJECT(win), WINDOW_GEOM_KEY);
if(name) {
if(window_geom_load(name, &geom)) {
/* XXX - use prefs to select which values to set? */
@ -491,7 +491,7 @@ window_destroy(GtkWidget *win)
if(!GTK_WIDGET_NO_WINDOW(win) && GTK_WIDGET_VISIBLE(win)) {
window_get_geometry(win, &geom);
name = OBJECT_GET_DATA(win, WINDOW_GEOM_KEY);
name = g_object_get_data(G_OBJECT(win), WINDOW_GEOM_KEY);
if(name) {
window_geom_save(name, &geom);
g_free((gpointer)name);
@ -538,10 +538,10 @@ set_main_window_name(const gchar *window_name)
gchar *old_window_name;
/* Attach the new un-decorated window name to the window. */
old_window_name = OBJECT_GET_DATA(top_level, MAIN_WINDOW_NAME_KEY);
old_window_name = g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY);
if (old_window_name != NULL)
g_free(old_window_name);
OBJECT_SET_DATA(top_level, MAIN_WINDOW_NAME_KEY, g_strdup(window_name));
g_object_set_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY, g_strdup(window_name));
update_main_window_name();
}
@ -554,7 +554,7 @@ update_main_window_name(void)
gchar *window_name;
gchar *title;
window_name = OBJECT_GET_DATA(top_level, MAIN_WINDOW_NAME_KEY);
window_name = g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY);
if (window_name != NULL) {
/* use user-defined window title if preference is set */
title = create_user_window_title(window_name);

18
gtk/print_prefs.c
View File

@ -88,19 +88,19 @@ GtkWidget * printer_prefs_show(void)
/* Output format */
button = create_preference_radio_buttons(main_tb, 0, "Format:",
NULL, print_format_vals, prefs.pr_format);
OBJECT_SET_DATA(main_vb, E_PRINT_FORMAT_KEY, button);
g_object_set_data(G_OBJECT(main_vb), E_PRINT_FORMAT_KEY, button);
/* Output destination */
button = create_preference_radio_buttons(main_tb, 1, "Print to:",
NULL, print_dest_vals, prefs.pr_dest);
OBJECT_SET_DATA(main_vb, E_PRINT_DESTINATION_KEY,
g_object_set_data(G_OBJECT(main_vb), E_PRINT_DESTINATION_KEY,
button);
#ifndef _WIN32
/* Command text entry */
cmd_te = create_preference_entry(main_tb, 2, "Command:", NULL,
prefs.pr_cmd);
OBJECT_SET_DATA(main_vb, PRINT_CMD_TE_KEY, cmd_te);
g_object_set_data(G_OBJECT(main_vb), PRINT_CMD_TE_KEY, cmd_te);
#endif
@ -122,7 +122,7 @@ GtkWidget * printer_prefs_show(void)
gtk_widget_show(file_bt);
file_te = gtk_entry_new();
OBJECT_SET_DATA(main_vb, PRINT_FILE_TE_KEY, file_te);
g_object_set_data(G_OBJECT(main_vb), PRINT_FILE_TE_KEY, file_te);
if (prefs.pr_file) gtk_entry_set_text(GTK_ENTRY(file_te), prefs.pr_file);
gtk_box_pack_start(GTK_BOX(file_bt_hb), file_te, TRUE, TRUE, 0);
gtk_widget_show(file_te);
@ -146,22 +146,22 @@ void
printer_prefs_fetch(GtkWidget *w)
{
prefs.pr_format = fetch_preference_radio_buttons_val(
OBJECT_GET_DATA(w, E_PRINT_FORMAT_KEY), print_format_vals);
g_object_get_data(G_OBJECT(w), E_PRINT_FORMAT_KEY), print_format_vals);
prefs.pr_dest = fetch_preference_radio_buttons_val(
OBJECT_GET_DATA(w, E_PRINT_DESTINATION_KEY), print_dest_vals);
g_object_get_data(G_OBJECT(w), E_PRINT_DESTINATION_KEY), print_dest_vals);
#ifndef _WIN32
if (prefs.pr_cmd)
g_free(prefs.pr_cmd);
prefs.pr_cmd = g_strdup(gtk_entry_get_text(
GTK_ENTRY(OBJECT_GET_DATA(w, PRINT_CMD_TE_KEY))));
GTK_ENTRY(g_object_get_data(G_OBJECT(w), PRINT_CMD_TE_KEY))));
#endif
if (prefs.pr_file)
g_free(prefs.pr_file);
prefs.pr_file = g_strdup(gtk_entry_get_text(
GTK_ENTRY(OBJECT_GET_DATA(w, PRINT_FILE_TE_KEY))));
GTK_ENTRY(g_object_get_data(G_OBJECT(w), PRINT_FILE_TE_KEY))));
}
void
@ -177,7 +177,7 @@ printer_prefs_destroy(GtkWidget *w)
/* Is there a file selection dialog associated with this
Preferences dialog? */
fs = OBJECT_GET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY);
fs = g_object_get_data(G_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY);
if (fs != NULL) {
/* Yes. Destroy it. */

50
gtk/profile_dlg.c
View File

@ -164,7 +164,7 @@ fill_list(GtkWidget *main_w)
const gchar *profiles_dir, *name;
gchar *filename;
profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
profile_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY));
store = GTK_LIST_STORE(gtk_tree_view_get_model(profile_l));
fl_entry = add_to_profile_list(DEFAULT_PROFILE, DEFAULT_PROFILE, PROF_STAT_DEFAULT);
@ -383,7 +383,7 @@ static void
profile_dlg_ok_cb(GtkWidget *ok_bt, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(ok_bt);
GtkTreeView *profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
GtkTreeView *profile_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY));
/*
* Apply the profile and destroy the dialog box.
@ -394,8 +394,8 @@ profile_dlg_ok_cb(GtkWidget *ok_bt, gpointer data _U_)
static void
profile_dlg_apply_cb(GtkWidget *apply_bt, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(apply_bt);
GtkTreeView *profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
GtkWidget *main_w = gtk_widget_get_toplevel(apply_bt);
GtkTreeView *profile_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY));
/*
* Apply the profile, but don't destroy the dialog box.
@ -456,15 +456,15 @@ profile_key_release_cb(GtkWidget *list, GdkEventKey *event, gpointer data _U_)
static void
profile_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_)
{
GtkWidget *profile_l = GTK_WIDGET(gtk_tree_selection_get_tree_view(sel));
GtkWidget *main_w = gtk_widget_get_toplevel(profile_l);
GtkWidget *profile_l = GTK_WIDGET(gtk_tree_selection_get_tree_view(sel));
GtkWidget *main_w = gtk_widget_get_toplevel(profile_l);
GtkTreeModel *model;
GtkTreeIter iter;
GtkWidget *name_te = OBJECT_GET_DATA(main_w, E_PROF_NAME_TE_KEY);
GtkWidget *copy_bt = OBJECT_GET_DATA(main_w, E_PROF_COPY_BT_KEY);
GtkWidget *del_bt = OBJECT_GET_DATA(main_w, E_PROF_DEL_BT_KEY);
GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY);
GtkWidget *copy_bt = g_object_get_data(G_OBJECT(main_w), E_PROF_COPY_BT_KEY);
GtkWidget *del_bt = g_object_get_data(G_OBJECT(main_w), E_PROF_DEL_BT_KEY);
profile_def *profile;
gchar *name = NULL;
gchar *name = NULL;
GList *fl_entry;
gint sensitivity = FALSE;
@ -513,8 +513,8 @@ static void
profile_new_bt_clicked_cb(GtkWidget *w, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(w);
GtkWidget *name_te = OBJECT_GET_DATA(main_w, E_PROF_NAME_TE_KEY);
GtkTreeView *profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY);
GtkTreeView *profile_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY));
GtkListStore *store;
GtkTreeIter iter;
GList *fl_entry;
@ -538,8 +538,8 @@ static void
profile_copy_bt_clicked_cb(GtkWidget *w, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(w);
GtkWidget *name_te = OBJECT_GET_DATA(main_w, E_PROF_NAME_TE_KEY);
GtkTreeView *profile_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY));
GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY);
GtkTreeView *profile_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY));
GtkListStore *store;
GtkTreeIter iter;
GList *fl_entry;
@ -568,8 +568,8 @@ static void
profile_name_te_changed_cb(GtkWidget *w, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(w);
GtkWidget *name_te = OBJECT_GET_DATA(main_w, E_PROF_NAME_TE_KEY);
GtkWidget *profile_l = OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY);
GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY);
GtkWidget *profile_l = g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY);
profile_def *profile;
GList *fl_entry;
const gchar *name = "";
@ -605,7 +605,7 @@ static void
profile_del_bt_clicked_cb(GtkWidget *w, gpointer data _U_)
{
GtkWidget *main_w = gtk_widget_get_toplevel(w);
GtkWidget *profile_l = OBJECT_GET_DATA(main_w, E_PROF_PROFILE_L_KEY);
GtkWidget *profile_l = g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY);
GList *fl_entry;
GtkTreeSelection *sel;
@ -707,7 +707,7 @@ profile_dialog_new(void)
copy_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_COPY);
gtk_widget_set_sensitive(copy_bt, FALSE);
SIGNAL_CONNECT(copy_bt, "clicked", profile_copy_bt_clicked_cb, NULL);
OBJECT_SET_DATA(main_w, E_PROF_COPY_BT_KEY, copy_bt);
g_object_set_data(G_OBJECT(main_w), E_PROF_COPY_BT_KEY, copy_bt);
gtk_widget_show(copy_bt);
gtk_box_pack_start (GTK_BOX (list_bb), copy_bt, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, copy_bt,
@ -717,7 +717,7 @@ profile_dialog_new(void)
del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE);
gtk_widget_set_sensitive(del_bt, FALSE);
SIGNAL_CONNECT(del_bt, "clicked", profile_del_bt_clicked_cb, NULL);
OBJECT_SET_DATA(main_w, E_PROF_DEL_BT_KEY, del_bt);
g_object_set_data(G_OBJECT(main_w), E_PROF_DEL_BT_KEY, del_bt);
gtk_widget_show(del_bt);
gtk_box_pack_start (GTK_BOX (list_bb), del_bt, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, del_bt, "Delete the selected profile", NULL);
@ -746,7 +746,7 @@ profile_dialog_new(void)
SIGNAL_CONNECT(sel, "changed", profile_sel_list_cb, profile_vb);
SIGNAL_CONNECT(profile_l, "button_press_event", profile_button_press_cb, NULL);
SIGNAL_CONNECT(profile_l, "key_release_event", profile_key_release_cb, NULL);
OBJECT_SET_DATA(main_w, E_PROF_PROFILE_L_KEY, profile_l);
g_object_set_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY, profile_l);
gtk_container_add(GTK_CONTAINER(profile_sc), profile_l);
gtk_widget_show(profile_l);
@ -775,7 +775,7 @@ profile_dialog_new(void)
name_te = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(middle_hb), name_te, TRUE, TRUE, 0);
OBJECT_SET_DATA(main_w, E_PROF_NAME_TE_KEY, name_te);
g_object_set_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY, name_te);
SIGNAL_CONNECT(name_te, "changed", profile_name_te_changed_cb, NULL);
#ifdef _WIN32
gtk_tooltips_set_tip (tooltips, name_te, "A profile name cannot start or end with a period (.), and cannot contain any of the following characters:\n \\ / : * ? \" < > |", NULL);
@ -789,7 +789,7 @@ profile_dialog_new(void)
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
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);
SIGNAL_CONNECT(ok_bt, "clicked", profile_dlg_ok_cb, NULL);
gtk_tooltips_set_tip (tooltips, ok_bt, "Apply the profiles and close this dialog", NULL);
@ -800,16 +800,16 @@ profile_dialog_new(void)
handle the Return key has the input focus. */
dlg_set_activate(name_te, ok_bt);
apply_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_APPLY);
apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY);
SIGNAL_CONNECT(apply_bt, "clicked", profile_dlg_apply_cb, NULL);
gtk_tooltips_set_tip (tooltips, apply_bt, "Apply the profiles and keep this dialog open", NULL);
cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
gtk_tooltips_set_tip (tooltips, cancel_bt, "Cancel the changes", NULL);
SIGNAL_CONNECT(cancel_bt, "clicked", profile_dlg_cancel_cb, NULL);
window_set_cancel_button(main_w, cancel_bt, NULL);
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_CONFIG_PROFILES_DIALOG);
gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);

6
gtk/rtp_player_prefs.c
View File

@ -56,7 +56,7 @@ rtp_player_prefs_show(void)
gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
gtk_widget_show(main_tb);
OBJECT_SET_DATA(main_tb, E_TOOLTIPS_KEY, tooltips);
g_object_set_data(G_OBJECT(main_tb), E_TOOLTIPS_KEY, tooltips);
/* Max visable channels in RTP Player */
rtp_player_max_visible_te = create_preference_entry(main_tb, pos++,
@ -66,7 +66,7 @@ rtp_player_prefs_show(void)
gtk_entry_set_text(GTK_ENTRY(rtp_player_max_visible_te), max_visible_str);
gtk_tooltips_set_tip(tooltips, rtp_player_max_visible_te,
"Maximum height of RTP Player window is defined here.", NULL);
OBJECT_SET_DATA(main_vb, RTP_PLAYER_MAX_VISIBLE_KEY, rtp_player_max_visible_te);
g_object_set_data(G_OBJECT(main_vb), RTP_PLAYER_MAX_VISIBLE_KEY, rtp_player_max_visible_te);
/* Show 'em what we got */
gtk_widget_show_all(main_vb);
@ -79,7 +79,7 @@ rtp_player_prefs_fetch(GtkWidget *w _U_)
{
GtkWidget *rtp_player_max_visible_te;
rtp_player_max_visible_te = (GtkWidget *)OBJECT_GET_DATA(w, RTP_PLAYER_MAX_VISIBLE_KEY);
rtp_player_max_visible_te = (GtkWidget *)g_object_get_data(G_OBJECT(w), RTP_PLAYER_MAX_VISIBLE_KEY);
prefs.rtp_player_max_visible = strtol(gtk_entry_get_text(
GTK_ENTRY(rtp_player_max_visible_te)), NULL, 10);

8
gtk/stream_prefs.c
View File

@ -106,7 +106,7 @@ stream_prefs_show()
menu = gtk_menu_new ();
for (i = 0; i < mcount; i++){
menuitem = gtk_menu_item_new_with_label (mt[i]);
OBJECT_SET_DATA(menuitem, STREAM_CS_KEY, colorsel);
g_object_set_data(G_OBJECT(menuitem), STREAM_CS_KEY, colorsel);
SIGNAL_CONNECT(menuitem, "activate", update_current_color, &tcolors[i]);
gtk_widget_show (menuitem);
gtk_menu_append (GTK_MENU (menu), menuitem);
@ -146,7 +146,7 @@ stream_prefs_show()
gtk_table_attach(GTK_TABLE(main_tb), colorsel, 0, 3, 2, 3,
GTK_SHRINK, GTK_SHRINK, 0, 0);
OBJECT_SET_DATA(colorsel, STREAM_SAMPLE_KEY, sample);
g_object_set_data(G_OBJECT(colorsel), STREAM_SAMPLE_KEY, sample);
SIGNAL_CONNECT(colorsel, "color-changed", update_text_color, NULL);
gtk_widget_show(colorsel);
@ -156,7 +156,7 @@ stream_prefs_show()
static void
update_text_color(GtkWidget *w, gpointer data _U_) {
GtkTextView *sample = OBJECT_GET_DATA(w, STREAM_SAMPLE_KEY);
GtkTextView *sample = g_object_get_data(G_OBJECT(w), STREAM_SAMPLE_KEY);
GtkTextBuffer *buf;
GtkTextTag *tag;
@ -179,7 +179,7 @@ update_current_color(GtkWidget *w, gpointer data)
{
GtkColorSelection *colorsel;
colorsel = GTK_COLOR_SELECTION(OBJECT_GET_DATA(w, STREAM_CS_KEY));
colorsel = GTK_COLOR_SELECTION(g_object_get_data(G_OBJECT(w), STREAM_CS_KEY));
curcolor = (GdkColor *) data;
gtk_color_selection_set_current_color(colorsel, curcolor);