aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/capture_file_dlg.c120
-rw-r--r--gtk/capture_if_details_dlg.c4
-rw-r--r--gtk/capture_if_dlg.c6
-rw-r--r--gtk/capture_info_dlg.c4
-rw-r--r--gtk/dcerpc_stat.c4
-rw-r--r--gtk/expert_comp_dlg.c4
-rw-r--r--gtk/fc_stat.c2
-rw-r--r--gtk/fileset_dlg.c4
-rw-r--r--gtk/follow_ssl.c2
-rw-r--r--gtk/follow_tcp.c2
-rw-r--r--gtk/follow_udp.c2
-rw-r--r--gtk/gsm_a_stat.c2
-rw-r--r--gtk/gsm_map_stat.c2
-rw-r--r--gtk/gsm_map_summary.c2
-rw-r--r--gtk/h225_counter.c2
-rw-r--r--gtk/h225_ras_srt.c2
-rw-r--r--gtk/ldap_stat.c2
-rw-r--r--gtk/mgcp_stat.c2
-rw-r--r--gtk/mtp3_stat.c4
-rw-r--r--gtk/mtp3_summary.c2
-rw-r--r--gtk/ncp_stat.c2
-rw-r--r--gtk/packet_list.c2
-rw-r--r--gtk/proto_dlg.c10
-rw-r--r--gtk/proto_hier_stats_dlg.c4
-rw-r--r--gtk/radius_stat.c2
25 files changed, 97 insertions, 97 deletions
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index 986fb043fa..a9322617dc 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -134,35 +134,35 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name)
/* init preview labels */
- label = OBJECT_GET_DATA(prev, PREVIEW_FILENAME_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY);
gtk_label_set_text(GTK_LABEL(label), "-");
- label = OBJECT_GET_DATA(prev, PREVIEW_FORMAT_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
gtk_label_set_text(GTK_LABEL(label), "-");
- label = OBJECT_GET_DATA(prev, PREVIEW_SIZE_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
gtk_label_set_text(GTK_LABEL(label), "-");
- label = OBJECT_GET_DATA(prev, PREVIEW_ELAPSED_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_ELAPSED_KEY);
gtk_label_set_text(GTK_LABEL(label), "-");
- label = OBJECT_GET_DATA(prev, PREVIEW_PACKETS_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
gtk_label_set_text(GTK_LABEL(label), "-");
- label = OBJECT_GET_DATA(prev, PREVIEW_FIRST_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FIRST_KEY);
gtk_label_set_text(GTK_LABEL(label), "-");
if(!cf_name) {
return NULL;
}
- label = OBJECT_GET_DATA(prev, PREVIEW_FILENAME_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY);
gtk_label_set_text(GTK_LABEL(label), get_basename(cf_name));
if (test_for_directory(cf_name) == EISDIR) {
- label = OBJECT_GET_DATA(prev, PREVIEW_FORMAT_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
gtk_label_set_text(GTK_LABEL(label), "directory");
return NULL;
}
wth = wtap_open_offline(cf_name, &err, &err_info, TRUE);
if (wth == NULL) {
- label = OBJECT_GET_DATA(prev, PREVIEW_FORMAT_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
if(err == WTAP_ERR_FILE_UNKNOWN_FORMAT) {
gtk_label_set_text(GTK_LABEL(label), "unknown file format");
} else {
@@ -179,12 +179,12 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name)
return NULL;
}
g_snprintf(string_buff, PREVIEW_STR_MAX, "%" G_GINT64_MODIFIER "d bytes", filesize);
- label = OBJECT_GET_DATA(prev, PREVIEW_SIZE_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
gtk_label_set_text(GTK_LABEL(label), string_buff);
/* type */
g_snprintf(string_buff, PREVIEW_STR_MAX, "%s", wtap_file_type_string(wtap_file_type(wth)));
- label = OBJECT_GET_DATA(prev, PREVIEW_FORMAT_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
gtk_label_set_text(GTK_LABEL(label), string_buff);
return wth;
@@ -241,7 +241,7 @@ preview_do(GtkWidget *prev, wtap *wth)
if(err != 0) {
g_snprintf(string_buff, PREVIEW_STR_MAX, "error after reading %u packets", packets);
- label = OBJECT_GET_DATA(prev, PREVIEW_PACKETS_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
gtk_label_set_text(GTK_LABEL(label), string_buff);
wtap_close(wth);
return;
@@ -253,7 +253,7 @@ preview_do(GtkWidget *prev, wtap *wth)
} else {
g_snprintf(string_buff, PREVIEW_STR_MAX, "%u", packets);
}
- label = OBJECT_GET_DATA(prev, PREVIEW_PACKETS_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_PACKETS_KEY);
gtk_label_set_text(GTK_LABEL(label), string_buff);
/* first packet */
@@ -271,7 +271,7 @@ preview_do(GtkWidget *prev, wtap *wth)
} else {
g_snprintf(string_buff, PREVIEW_STR_MAX, "?");
}
- label = OBJECT_GET_DATA(prev, PREVIEW_FIRST_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_FIRST_KEY);
gtk_label_set_text(GTK_LABEL(label), string_buff);
/* elapsed time */
@@ -286,7 +286,7 @@ preview_do(GtkWidget *prev, wtap *wth)
if(is_breaked) {
g_snprintf(string_buff, PREVIEW_STR_MAX, "unknown");
}
- label = OBJECT_GET_DATA(prev, PREVIEW_ELAPSED_KEY);
+ label = g_object_get_data(G_OBJECT(prev), PREVIEW_ELAPSED_KEY);
gtk_label_set_text(GTK_LABEL(label), string_buff);
wtap_close(wth);
@@ -319,7 +319,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
static void
file_open_entry_changed(GtkWidget *w _U_, gpointer file_sel)
{
- GtkWidget *prev = OBJECT_GET_DATA(file_sel, PREVIEW_TABLE_KEY);
+ GtkWidget *prev = g_object_get_data(G_OBJECT(file_sel), PREVIEW_TABLE_KEY);
const gchar* cf_name;
gboolean have_preview;
wtap *wth;
@@ -400,17 +400,17 @@ preview_new(void)
label = add_string_to_table(table, &row, "Filename:", "-");
WIDGET_SET_SIZE(label, DEF_WIDTH/3, -1);
- OBJECT_SET_DATA(table, PREVIEW_FILENAME_KEY, label);
+ g_object_set_data(G_OBJECT(table), PREVIEW_FILENAME_KEY, label);
label = add_string_to_table(table, &row, "Format:", "-");
- OBJECT_SET_DATA(table, PREVIEW_FORMAT_KEY, label);
+ g_object_set_data(G_OBJECT(table), PREVIEW_FORMAT_KEY, label);
label = add_string_to_table(table, &row, "Size:", "-");
- OBJECT_SET_DATA(table, PREVIEW_SIZE_KEY, label);
+ g_object_set_data(G_OBJECT(table), PREVIEW_SIZE_KEY, label);
label = add_string_to_table(table, &row, "Packets:", "-");
- OBJECT_SET_DATA(table, PREVIEW_PACKETS_KEY, label);
+ g_object_set_data(G_OBJECT(table), PREVIEW_PACKETS_KEY, label);
label = add_string_to_table(table, &row, "First Packet:", "-");
- OBJECT_SET_DATA(table, PREVIEW_FIRST_KEY, label);
+ g_object_set_data(G_OBJECT(table), PREVIEW_FIRST_KEY, label);
label = add_string_to_table(table, &row, "Elapsed time:", "-");
- OBJECT_SET_DATA(table, PREVIEW_ELAPSED_KEY, label);
+ g_object_set_data(G_OBJECT(table), PREVIEW_ELAPSED_KEY, label);
return table;
}
@@ -504,16 +504,16 @@ file_open_cmd(GtkWidget *w)
"Open the \"Display Filter\" dialog, to edit/apply filters", NULL);
filter_te = gtk_entry_new();
- OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_te);
+ g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
gtk_box_pack_start(GTK_BOX(filter_hbox), filter_te, TRUE, TRUE, 3);
SIGNAL_CONNECT(filter_te, "changed", filter_te_syntax_check_cb, NULL);
gtk_widget_show(filter_te);
gtk_tooltips_set_tip(tooltips, filter_te, "Enter a display filter.", NULL);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_open_w, E_RFILTER_TE_KEY, filter_te);
+ g_object_set_data(G_OBJECT(file_open_w), E_RFILTER_TE_KEY, filter_te);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_open_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_open_w)->ok_button),
E_RFILTER_TE_KEY, filter_te);
#endif
@@ -523,10 +523,10 @@ file_open_cmd(GtkWidget *w)
g_resolv_flags & RESOLV_MAC);
gtk_box_pack_start(GTK_BOX(main_vb), m_resolv_cb, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_open_w,
+ g_object_set_data(G_OBJECT(file_open_w),
E_FILE_M_RESOLVE_KEY, m_resolv_cb);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_open_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_open_w)->ok_button),
E_FILE_M_RESOLVE_KEY, m_resolv_cb);
#endif
gtk_widget_show(m_resolv_cb);
@@ -537,9 +537,9 @@ file_open_cmd(GtkWidget *w)
gtk_box_pack_start(GTK_BOX(main_vb), n_resolv_cb, FALSE, FALSE, 0);
gtk_widget_show(n_resolv_cb);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_open_w, E_FILE_N_RESOLVE_KEY, n_resolv_cb);
+ g_object_set_data(G_OBJECT(file_open_w), E_FILE_N_RESOLVE_KEY, n_resolv_cb);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_open_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_open_w)->ok_button),
E_FILE_N_RESOLVE_KEY, n_resolv_cb);
#endif
@@ -549,9 +549,9 @@ file_open_cmd(GtkWidget *w)
gtk_box_pack_start(GTK_BOX(main_vb), t_resolv_cb, FALSE, FALSE, 0);
gtk_widget_show(t_resolv_cb);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_open_w, E_FILE_T_RESOLVE_KEY, t_resolv_cb);
+ g_object_set_data(G_OBJECT(file_open_w), E_FILE_T_RESOLVE_KEY, t_resolv_cb);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_open_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_open_w)->ok_button),
E_FILE_T_RESOLVE_KEY, t_resolv_cb);
#endif
@@ -560,7 +560,7 @@ file_open_cmd(GtkWidget *w)
/* preview widget */
prev = preview_new();
- OBJECT_SET_DATA(file_open_w, PREVIEW_TABLE_KEY, prev);
+ g_object_set_data(G_OBJECT(file_open_w), PREVIEW_TABLE_KEY, prev);
gtk_widget_show_all(prev);
gtk_box_pack_start(GTK_BOX(main_hb), prev, TRUE, TRUE, 0);
@@ -569,8 +569,8 @@ file_open_cmd(GtkWidget *w)
file_open_entry_changed, file_open_w);
file_open_entry_changed(file_open_w, file_open_w);
- OBJECT_SET_DATA(file_open_w, E_DFILTER_TE_KEY,
- OBJECT_GET_DATA(w, E_DFILTER_TE_KEY));
+ g_object_set_data(G_OBJECT(file_open_w), E_DFILTER_TE_KEY,
+ g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY));
if (gtk_dialog_run(GTK_DIALOG(file_open_w)) == GTK_RESPONSE_ACCEPT)
{
file_open_ok_cb(file_open_w, file_open_w);
@@ -585,8 +585,8 @@ file_open_cmd(GtkWidget *w)
SIGNAL_CONNECT(GTK_FILE_SELECTION(file_open_w)->ok_button, "clicked",
file_open_ok_cb, file_open_w);
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_open_w)->ok_button,
- E_DFILTER_TE_KEY, OBJECT_GET_DATA(w, E_DFILTER_TE_KEY));
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_open_w)->ok_button),
+ E_DFILTER_TE_KEY, g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY));
/* Connect the cancel_button to destroy the widget */
window_set_cancel_button(file_open_w,
@@ -648,7 +648,7 @@ file_open_ok_cb(GtkWidget *w, gpointer fs) {
#else
cf_name = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
#endif
- filter_te = OBJECT_GET_DATA(w, E_RFILTER_TE_KEY);
+ filter_te = g_object_get_data(G_OBJECT(w), E_RFILTER_TE_KEY);
rfilter = gtk_entry_get_text(GTK_ENTRY(filter_te));
if (!dfilter_compile(rfilter, &rfcode)) {
bad_dfilter_alert_box(rfilter);
@@ -693,17 +693,17 @@ file_open_ok_cb(GtkWidget *w, gpointer fs) {
/* Set the global resolving variable */
g_resolv_flags = prefs.name_resolve;
- m_resolv_cb = OBJECT_GET_DATA(w, E_FILE_M_RESOLVE_KEY);
+ m_resolv_cb = g_object_get_data(G_OBJECT(w), E_FILE_M_RESOLVE_KEY);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (m_resolv_cb)))
g_resolv_flags |= RESOLV_MAC;
else
g_resolv_flags &= ~RESOLV_MAC;
- n_resolv_cb = OBJECT_GET_DATA(w, E_FILE_N_RESOLVE_KEY);
+ n_resolv_cb = g_object_get_data(G_OBJECT(w), E_FILE_N_RESOLVE_KEY);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (n_resolv_cb)))
g_resolv_flags |= RESOLV_NETWORK;
else
g_resolv_flags &= ~RESOLV_NETWORK;
- t_resolv_cb = OBJECT_GET_DATA(w, E_FILE_T_RESOLVE_KEY);
+ t_resolv_cb = g_object_get_data(G_OBJECT(w), E_FILE_T_RESOLVE_KEY);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (t_resolv_cb)))
g_resolv_flags |= RESOLV_TRANSPORT;
else
@@ -857,16 +857,16 @@ file_merge_cmd(GtkWidget *w)
"Open the \"Display Filter\" dialog, to edit/apply filters", NULL);
filter_te = gtk_entry_new();
- OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_te);
+ g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_te);
gtk_box_pack_start(GTK_BOX(filter_hbox), filter_te, TRUE, TRUE, 3);
SIGNAL_CONNECT(filter_te, "changed", filter_te_syntax_check_cb, NULL);
gtk_widget_show(filter_te);
gtk_tooltips_set_tip(tooltips, filter_te, "Enter a display filter.", NULL);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_merge_w, E_RFILTER_TE_KEY, filter_te);
+ g_object_set_data(G_OBJECT(file_merge_w), E_RFILTER_TE_KEY, filter_te);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_merge_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_merge_w)->ok_button),
E_RFILTER_TE_KEY, filter_te);
#endif
@@ -876,10 +876,10 @@ file_merge_cmd(GtkWidget *w)
" the packet timestamps will be ignored.", NULL);
gtk_box_pack_start(GTK_BOX(main_vb), prepend_rb, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_merge_w,
+ g_object_set_data(G_OBJECT(file_merge_w),
E_MERGE_PREPEND_KEY, prepend_rb);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_merge_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_merge_w)->ok_button),
E_MERGE_PREPEND_KEY, prepend_rb);
#endif
gtk_widget_show(prepend_rb);
@@ -892,9 +892,9 @@ file_merge_cmd(GtkWidget *w)
gtk_box_pack_start(GTK_BOX(main_vb), chrono_rb, FALSE, FALSE, 0);
gtk_widget_show(chrono_rb);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_merge_w, E_MERGE_CHRONO_KEY, chrono_rb);
+ g_object_set_data(G_OBJECT(file_merge_w), E_MERGE_CHRONO_KEY, chrono_rb);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_merge_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_merge_w)->ok_button),
E_MERGE_CHRONO_KEY, chrono_rb);
#endif
@@ -907,9 +907,9 @@ file_merge_cmd(GtkWidget *w)
gtk_box_pack_start(GTK_BOX(main_vb), append_rb, FALSE, FALSE, 0);
gtk_widget_show(append_rb);
#if GTK_CHECK_VERSION(2,4,0)
- OBJECT_SET_DATA(file_merge_w, E_MERGE_APPEND_KEY, append_rb);
+ g_object_set_data(G_OBJECT(file_merge_w), E_MERGE_APPEND_KEY, append_rb);
#else
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_merge_w)->ok_button,
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_merge_w)->ok_button),
E_MERGE_APPEND_KEY, append_rb);
#endif
@@ -918,7 +918,7 @@ file_merge_cmd(GtkWidget *w)
/* preview widget */
prev = preview_new();
- OBJECT_SET_DATA(file_merge_w, PREVIEW_TABLE_KEY, prev);
+ g_object_set_data(G_OBJECT(file_merge_w), PREVIEW_TABLE_KEY, prev);
gtk_widget_show_all(prev);
gtk_box_pack_start(GTK_BOX(main_hb), prev, TRUE, TRUE, 0);
@@ -927,8 +927,8 @@ file_merge_cmd(GtkWidget *w)
file_open_entry_changed, file_merge_w);
file_open_entry_changed(file_merge_w, file_merge_w);
- OBJECT_SET_DATA(file_merge_w, E_DFILTER_TE_KEY,
- OBJECT_GET_DATA(w, E_DFILTER_TE_KEY));
+ g_object_set_data(G_OBJECT(file_merge_w), E_DFILTER_TE_KEY,
+ g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY));
if (gtk_dialog_run(GTK_DIALOG(file_merge_w)) == GTK_RESPONSE_ACCEPT)
{
file_merge_ok_cb(file_merge_w, file_merge_w);
@@ -943,8 +943,8 @@ file_merge_cmd(GtkWidget *w)
SIGNAL_CONNECT(GTK_FILE_SELECTION(file_merge_w)->ok_button, "clicked",
file_merge_ok_cb, file_merge_w);
- OBJECT_SET_DATA(GTK_FILE_SELECTION(file_merge_w)->ok_button,
- E_DFILTER_TE_KEY, OBJECT_GET_DATA(w, E_DFILTER_TE_KEY));
+ g_object_set_data(G_OBJECT(GTK_FILE_SELECTION(file_merge_w)->ok_button),
+ E_DFILTER_TE_KEY, g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY));
/* Connect the cancel_button to destroy the widget */
window_set_cancel_button(file_merge_w,
@@ -1005,7 +1005,7 @@ file_merge_ok_cb(GtkWidget *w, gpointer fs) {
#else
cf_name = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
#endif
- filter_te = OBJECT_GET_DATA(w, E_RFILTER_TE_KEY);
+ filter_te = g_object_get_data(G_OBJECT(w), E_RFILTER_TE_KEY);
rfilter = gtk_entry_get_text(GTK_ENTRY(filter_te));
if (!dfilter_compile(rfilter, &rfcode)) {
bad_dfilter_alert_box(rfilter);
@@ -1025,7 +1025,7 @@ file_merge_ok_cb(GtkWidget *w, gpointer fs) {
}
/* merge or append the two files */
- rb = OBJECT_GET_DATA(w, E_MERGE_CHRONO_KEY);
+ rb = g_object_get_data(G_OBJECT(w), E_MERGE_CHRONO_KEY);
tmpname = NULL;
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rb))) {
/* chronological order */
@@ -1033,7 +1033,7 @@ file_merge_ok_cb(GtkWidget *w, gpointer fs) {
in_filenames[1] = cf_name;
merge_status = cf_merge_files(&tmpname, 2, in_filenames, filetype, FALSE);
} else {
- rb = OBJECT_GET_DATA(w, E_MERGE_PREPEND_KEY);
+ rb = g_object_get_data(G_OBJECT(w), E_MERGE_PREPEND_KEY);
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (rb))) {
/* prepend file */
in_filenames[0] = cf_name;
@@ -1236,7 +1236,7 @@ select_file_type_cb(GtkWidget *w _U_, gpointer data)
if (filetype != new_filetype) {
filetype = new_filetype;
- compressed_cb = OBJECT_GET_DATA(file_save_as_w, "compressed");
+ compressed_cb = g_object_get_data(G_OBJECT(file_save_as_w), "compressed");
if(compressed_cb)
gtk_widget_set_sensitive(compressed_cb, wtap_dump_can_compress(new_filetype));
}
@@ -1340,7 +1340,7 @@ file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_sa
* encapsulation ... */
/* the rest of the implementation is just working fine :-( */
/*gtk_widget_show(compressed_cb);*/
- OBJECT_SET_DATA(file_save_as_w, "compressed", compressed_cb);
+ g_object_set_data(G_OBJECT(file_save_as_w), "compressed", compressed_cb);
gtk_widget_set_sensitive(compressed_cb, wtap_dump_can_compress(cfile.cd_t));
SIGNAL_CONNECT(file_save_as_w, "destroy", file_save_as_destroy_cb, NULL);
@@ -1390,7 +1390,7 @@ file_save_as_cb(GtkWidget *w _U_, gpointer fs) {
cf_name = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
#endif
- compressed_cb = OBJECT_GET_DATA(file_save_as_w, "compressed");
+ compressed_cb = g_object_get_data(G_OBJECT(file_save_as_w), "compressed");
/* XXX - if the user requests to save to an already existing filename, */
/* ask in a dialog if that's intended */
diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c
index cbb752ee6d..4cb52b9266 100644
--- a/gtk/capture_if_details_dlg.c
+++ b/gtk/capture_if_details_dlg.c
@@ -2357,11 +2357,11 @@ capture_if_details_open_win(char *iface)
}
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
- 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(details_open_w, close_bt, window_cancel_button_cb);
if(topic_available(HELP_CAPTURE_INTERFACES_DETAILS_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_CAPTURE_INTERFACES_DETAILS_DIALOG);
}
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 29bd62708e..9ec1cefa14 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -412,7 +412,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
if (airpcap_if_list == NULL)
airpcap_if_active = airpcap_if_selected = NULL;
- decryption_cm = OBJECT_GET_DATA(airpcap_tb,AIRPCAP_TOOLBAR_DECRYPTION_KEY);
+ decryption_cm = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
update_decryption_mode_list(decryption_cm);
if (airpcap_if_list == NULL && err == CANT_GET_AIRPCAP_INTERFACE_LIST) {
@@ -636,12 +636,12 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
}
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
- 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(cap_if_w, close_bt, window_cancel_button_cb);
gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
if(topic_available(HELP_CAPTURE_INTERFACES_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_CAPTURE_INTERFACES_DIALOG);
}
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 2e2eb200ca..d320c07984 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -264,7 +264,7 @@ const gchar *iface)
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 3);
gtk_widget_show(bbox);
- stop_bt = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CAPTURE_STOP);
+ stop_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CAPTURE_STOP);
window_set_cancel_button(info->cap_w, stop_bt, NULL);
SIGNAL_CONNECT(stop_bt, "clicked", capture_info_delete_cb, capture_opts);
@@ -272,7 +272,7 @@ const gchar *iface)
capture_opts);
if(topic_available(HELP_CAPTURE_INFO_DIALOG)) {
- ci_help = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+ ci_help = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
gtk_tooltips_set_tip (tooltips, ci_help, ("Get help about this dialog"), NULL);
SIGNAL_CONNECT(ci_help, "clicked", topic_cb, HELP_CAPTURE_INFO_DIALOG);
}
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 25e12d1b09..c2653e0cdd 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -652,11 +652,11 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
- start_button = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_CREATE_STAT);
+ start_button = g_object_get_data(G_OBJECT(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);
+ cancel_button = g_object_get_data(G_OBJECT(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);
diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index 666ccef5da..537c01e147 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.c
@@ -270,11 +270,11 @@ expert_comp_init(const char *optarg _U_, 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(ss->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);
}
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 1572b5bece..eaec6362bf 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -192,7 +192,7 @@ gtk_fcstat_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(fc->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(fc->win, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 4c12d7352b..1f9b339623 100644
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.c
@@ -322,12 +322,12 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_)
}
gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
- 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(fs_w, close_bt, window_cancel_button_cb);
gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
if(topic_available(HELP_FILESET_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_FILESET_DIALOG);
}
diff --git a/gtk/follow_ssl.c b/gtk/follow_ssl.c
index fbd9e71a5c..81d2d64b8b 100644
--- a/gtk/follow_ssl.c
+++ b/gtk/follow_ssl.c
@@ -177,7 +177,7 @@ follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_)
}
/* Set the display filter entry accordingly */
- filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY);
+ filter_te = g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY);
/* needed in follow_filter_out_stream(), is there a better way? */
follow_info->filter_te = filter_te;
diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c
index 665b5e629c..ab3bac2e8d 100644
--- a/gtk/follow_tcp.c
+++ b/gtk/follow_tcp.c
@@ -155,7 +155,7 @@ follow_tcp_stream_cb(GtkWidget * w, gpointer data _U_)
follow_filter = build_follow_filter(&cfile.edt->pi);
/* Set the display filter entry accordingly */
- filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY);
+ filter_te = g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY);
/* needed in follow_filter_out_stream(), is there a better way? */
follow_info->filter_te = filter_te;
diff --git a/gtk/follow_udp.c b/gtk/follow_udp.c
index c9accfe8e9..d91f8d04bc 100644
--- a/gtk/follow_udp.c
+++ b/gtk/follow_udp.c
@@ -123,7 +123,7 @@ follow_udp_stream_cb(GtkWidget *w, gpointer data _U_)
}
/* Set the display filter entry accordingly */
- filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY);
+ filter_te = g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY);
/* needed in follow_filter_out_stream(), is there a better way? */
follow_info->filter_te = filter_te;
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index b4b23d2b99..c9beedbd80 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -439,7 +439,7 @@ gsm_a_stat_gtk_win_create(
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(dlg_p->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(dlg_p->win, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index babaa9c5d8..64ac9e5045 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -389,7 +389,7 @@ gsm_map_stat_gtk_win_create(
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(dlg_p->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(dlg_p->win, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index df150edd2c..39b002f81e 100644
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.c
@@ -283,7 +283,7 @@ gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_container_add(GTK_CONTAINER(main_vb), bbox);
gtk_widget_show(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);
SIGNAL_CONNECT(sum_open_w, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 11b6f7099b..f567cfe721 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -547,7 +547,7 @@ gtk_h225counter_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);
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 91070a1087..be2c42b05d 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -327,7 +327,7 @@ gtk_h225rassrt_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);
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index e288cd5d24..76206103b8 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -225,7 +225,7 @@ gtk_ldapstat_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(ldap->win, close_bt, window_cancel_button_cb);
SIGNAL_CONNECT(ldap->win, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index aebab90604..6a8343dcc4 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -291,7 +291,7 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_)
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_start(GTK_BOX(ms->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(ms->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(ms->win, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index 54faa34dd2..54ace59f89 100644
--- a/gtk/mtp3_stat.c
+++ b/gtk/mtp3_stat.c
@@ -398,9 +398,9 @@ mtp3_stat_gtk_win_create(
/* Button row. */
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+ 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(dlg_p->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(dlg_p->win, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c
index e10a6805df..c0bb9f812c 100644
--- a/gtk/mtp3_summary.c
+++ b/gtk/mtp3_summary.c
@@ -422,7 +422,7 @@ mtp3_sum_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_container_add(GTK_CONTAINER(main_vb), bbox);
gtk_widget_show(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);
SIGNAL_CONNECT(sum_open_w, "delete_event", window_delete_event_cb, NULL);
diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c
index 4459f05058..361aa1f79c 100644
--- a/gtk/ncp_stat.c
+++ b/gtk/ncp_stat.c
@@ -708,7 +708,7 @@ gtk_ncpstat_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);
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 0d674ff7df..b01b34e391 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -519,7 +519,7 @@ packet_list_new(e_prefs *prefs)
GTK_JUSTIFY_RIGHT);
}
SIGNAL_CONNECT(packet_list, "button_press_event", popup_menu_handler,
- OBJECT_GET_DATA(popup_menu_object, PM_PACKET_LIST_KEY));
+ g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY));
SIGNAL_CONNECT(packet_list, "button_press_event",
packet_list_button_pressed_cb, NULL);
gtk_clist_set_compare_func(GTK_CLIST(packet_list), packet_list_compare);
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 0341343a45..ce4a64db6b 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -193,21 +193,21 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_box_pack_start(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);
SIGNAL_CONNECT(ok_bt, "clicked", proto_ok_cb, proto_w);
gtk_widget_grab_default(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", proto_apply_cb, proto_w);
- save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE);
+ save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE);
SIGNAL_CONNECT(save_bt, "clicked", proto_save_cb, proto_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(proto_w, cancel_bt, proto_cancel_cb);
if(topic_available(HELP_ENABLED_PROTOCOLS_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_ENABLED_PROTOCOLS_DIALOG);
}
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 707cb00d07..07b766aeb8 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -487,11 +487,11 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
gtk_widget_show(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(dlg, close_bt, window_cancel_button_cb);
if(topic_available(HELP_STATS_PROTO_HIERARCHY_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_PROTO_HIERARCHY_DIALOG);
}
diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c
index 80c04338ae..06504345e9 100644
--- a/gtk/radius_stat.c
+++ b/gtk/radius_stat.c
@@ -342,7 +342,7 @@ gtk_radiusstat_init(const char *optarg, void *userdata _U_)
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
gtk_box_pack_start(GTK_BOX(rs->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(rs->win, bt_close, window_cancel_button_cb);
SIGNAL_CONNECT(rs->win, "delete_event", window_delete_event_cb, NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 19:47:34 +0000