OBJECT_..._DATA --> g_object_..._data
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 11 Apr 2008 17:14:11 +0000 (17:14 +0000)
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 11 Apr 2008 17:14:11 +0000 (17:14 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24898 f5534014-38df-0310-8fa8-9805f1628bb7

25 files changed:
gtk/capture_file_dlg.c
gtk/capture_if_details_dlg.c
gtk/capture_if_dlg.c
gtk/capture_info_dlg.c
gtk/dcerpc_stat.c
gtk/expert_comp_dlg.c
gtk/fc_stat.c
gtk/fileset_dlg.c
gtk/follow_ssl.c
gtk/follow_tcp.c
gtk/follow_udp.c
gtk/gsm_a_stat.c
gtk/gsm_map_stat.c
gtk/gsm_map_summary.c
gtk/h225_counter.c
gtk/h225_ras_srt.c
gtk/ldap_stat.c
gtk/mgcp_stat.c
gtk/mtp3_stat.c
gtk/mtp3_summary.c
gtk/ncp_stat.c
gtk/packet_list.c
gtk/proto_dlg.c
gtk/proto_hier_stats_dlg.c
gtk/radius_stat.c

index 986fb043fa33aa795af2ec7485d651aa3768aa2b..a9322617dc32221acec2859f80b6ae333f4a2ab9 100644 (file)
@@ -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 */
index cbb752ee6d9fca25664adacf2f4357640333c01d..4cb52b92662e9949747c522988fc24203ab2dfc2 100644 (file)
@@ -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);
     }
 
index 29bd62708e9da2f17199a4e9ec7dac84046bd4ce..9ec1cefa1455fd7a27d4cbfe85983a80ff6887f8 100644 (file)
@@ -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);
   }
 
index 2e2eb200ca7295659c58eb8ae5a5ce21d0fa5d66..d320c07984d51f467fd1d8e5d6a81ee5a45e5d1e 100644 (file)
@@ -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);
   }
index 25e12d1b093f1ec89b31b2514471bd42ed580d73..c2653e0cdd9f55be91e035603056722bf0758343 100644 (file)
@@ -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);
index 666ccef5da509f0a792411d7fbdddf0cfb972bb8..537c01e147847539d48f2717d5ca0dd279d5945d 100644 (file)
@@ -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);
     }
index 1572b5bece5f916236dab750c8765dfdd392812f..eaec6362bff6a7577e5b2f6d527f0f01fdf9590c 100644 (file)
@@ -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);
index 4c12d7352b68b721e1a4dbedc1a6ccbb22983172..1f9b339623767246f9099fd5b7f228b7dffcc5f7 100644 (file)
@@ -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);
   }
 
index fbd9e71a5c0637f3a40274072604bfcf3d706d92..81d2d64b8b29140ce59a04ed39b2771a4e2680ee 100644 (file)
@@ -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;
index 665b5e629c98ee29e01bcacce714f8b255301c01..ab3bac2e8d172dc7c39d5be1cd9440ccb5c41ad4 100644 (file)
@@ -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;
index c9accfe8e9a8822e37891c259792411e7bea1616..d91f8d04bce603eaf87b53b5fe3f656cd51ae43b 100644 (file)
@@ -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;
index b4b23d2b9964975ab10786694ffdd90008f38f06..c9beedbd80950656b653f3caacd6447da5b4ccb9 100644 (file)
@@ -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);
index babaa9c5d8353921f02b4365a0dfb42ef7c09965..64ac9e5045f5ee8bafc5aaf9fa30c293346a9a15 100644 (file)
@@ -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);
index df150edd2c3235fed94891227864288f1f7e82c8..39b002f81eef1effb190766913ff14ce78cb317e 100644 (file)
@@ -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);
index 11b6f7099b226fe3249502f2e55f7b71d9c8aab1..f567cfe721582f317b2c1019ac0f4f2b3a53ff54 100644 (file)
@@ -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);
index 91070a1087006f884f345a9157ee6ae3729c2642..be2c42b05d263b6682f1c9ef792e5f92d4564612 100644 (file)
@@ -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);
index e288cd5d24a29f731cdb7573ba848f156ebb4120..76206103b8a9ebd4da4f5b19f4bc200739e95f26 100644 (file)
@@ -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);
index aebab906043d470992e5d016bd6b2e44543fdd92..6a8343dcc48630a9ca27df5dfc29782d9f5d410f 100644 (file)
@@ -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);
index 54faa34dd2cd26b28d38eed768396c6cc16a2b25..54ace59f89ef6c0e0b7464b5e5e3eedfa14de981 100644 (file)
@@ -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);
index e10a6805df8e7c531342666e5959ffbf5ab29346..c0bb9f812c8ec135cfbd56e5d563e858c605d759 100644 (file)
@@ -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);
index 4459f05058c2f624c997aa7dbc87e7399a658190..361aa1f79ca7b11db630d085edb19508ce5842fc 100644 (file)
@@ -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);
index 0d674ff7df968b94a3c851f5912dc3fd3203fac3..b01b34e39135b0ce482ab44a317dc6ca71dfc0fb 100644 (file)
@@ -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);
index 0341343a453f0f2792ef22119d8499632d5d5111..ce4a64db6b876013c2a1824e849c69da9796005a 100644 (file)
@@ -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);
   }
 
index 707cb00d07b26395cb0752de674faa6d8e9542db..07b766aeb8d6b11b89d26ef8d9488ec0676b9278 100644 (file)
@@ -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);
        }
 
index 80c04338aedc0fc5b277de46c0c0d90f26f39c97..06504345e91fcd0a05e309f0bdb16ecf2402c1e2 100644 (file)
@@ -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);