Replace almost all uses of GtkObject (which no longer exists

in GTK3) by GObject (which does).
These were the trivial cases, the two remaining uses in packet_win.c
are left for someone who understands the code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38344 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index 95bad12ade9d52b8ad8e01d1f26a9a1e0936e04d..66a7983a9a67062812e30ee73d691e39086a5c6a 100644 (file)
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -103,7 +103,7 @@ enum
 /* CALLBACKS                                                                */
 /****************************************************************************/
 static void
-mcaststream_on_destroy(GtkObject *object _U_, gpointer user_data _U_)
+mcaststream_on_destroy(GObject *object _U_, gpointer user_data _U_)
 {
        /* Remove the stream tap listener */
        remove_tap_listener_mcast_stream();

diff --git a/gtk/menus.c b/gtk/menus.c
index ec38da4aea8a37edafb7cdbf4998b498bdbae553..8ca582675720b9693c6ff737952096ea641e8430 100644 (file)
--- a/gtk/menus.c
+++ b/gtk/menus.c
@@ -5130,7 +5130,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) {
     g_object_set_data(G_OBJECT(menu_item), MENU_RECENT_FILES_KEY, normalized_cf_name);
     gtk_menu_shell_prepend (GTK_MENU_SHELL(submenu_recent_files), menu_item);
     g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate",
-                             G_CALLBACK(menu_open_recent_file_cmd_cb), (GtkObject *) menu_item);
+                             G_CALLBACK(menu_open_recent_file_cmd_cb), (GObject *) menu_item);
     gtk_widget_show (menu_item);
 
     /* add seperator at last position */
@@ -5142,7 +5142,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) {
     menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
     gtk_menu_shell_append (GTK_MENU_SHELL(submenu_recent_files), menu_item);
     g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate",
-                             G_CALLBACK(clear_menu_recent_capture_file_cmd_cb), (GtkObject *) menu_item);
+                             G_CALLBACK(clear_menu_recent_capture_file_cmd_cb), (GObject *) menu_item);
     gtk_widget_show (menu_item);
 
     update_menu_recent_capture_file(submenu_recent_files);
@@ -6789,7 +6789,7 @@ rebuild_protocol_prefs_menu (module_t *prefs_module_p, gboolean preferences)
                                        gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU));
         gtk_menu_shell_append (GTK_MENU_SHELL(sub_menu), menu_item);
         g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate",
-                                 G_CALLBACK(properties_cb), (GtkObject *) menu_item);
+                                 G_CALLBACK(properties_cb), (GObject *) menu_item);
         gtk_widget_show (menu_item);
         g_free (label);
 

diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index dca4ce589fdf3a40e7a4780633a4743dc4927557..c0d02fdb28e9169e178de14ab0713bdc5efbfdc5 100644 (file)
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -130,7 +130,7 @@ static void new_tree_view_selection_changed_cb(GtkTreeSelection *sel,
                                                gpointer user_data);
 
 
-static void destroy_new_window(GtkObject *object, gpointer user_data);
+static void destroy_new_window(GObject *object, gpointer user_data);
 
 static gboolean
 button_press_handler(GtkWidget *widget, GdkEvent *event, gpointer data _U_)
@@ -829,7 +829,7 @@ edit_pkt_win_key_pressed_cb(GtkWidget *win _U_, GdkEventKey *event, gpointer use
 }
 
 static void
-edit_pkt_destroy_new_window(GtkObject *object _U_, gpointer user_data)
+edit_pkt_destroy_new_window(GObject *object _U_, gpointer user_data)
 {
        /* like destroy_new_window, but without freeding DataPtr->pd */
        struct PacketWinData *DataPtr = user_data;
@@ -979,7 +979,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_)
 }
 
 static void
-destroy_new_window(GtkObject *object _U_, gpointer user_data)
+destroy_new_window(GObject *object _U_, gpointer user_data)
 {
        struct PacketWinData *DataPtr = user_data;
 

diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index 240d26fa776a40f11952254e225ee6ed52ac43dd..d650bcb713aa8c2d865f47fd608b63b1d99a6720 100644 (file)
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -2076,7 +2076,7 @@ on_bt_stop_clicked(GtkButton *button _U_, gpointer user_data _U_)
 
 /****************************************************************************/
 static void
-rtp_player_on_destroy(GtkObject *object _U_, gpointer user_data _U_)
+rtp_player_on_destroy(GObject *object _U_, gpointer user_data _U_)
 {
        PaError err;
        GtkWidget *dialog;

diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index d206597124962fca648ca2b57fa6f2af0a022f59..acfc71422887038e22ceed7216d0a35a30f4b32c 100644 (file)
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -153,7 +153,7 @@ static gboolean save_stream_ok_cb(GtkWidget *ok_bt _U_, gpointer fs)
 /* CALLBACKS                                                                */
 /****************************************************************************/
 static void
-rtpstream_on_destroy(GtkObject *object _U_, gpointer user_data _U_)
+rtpstream_on_destroy(GObject *object _U_, gpointer user_data _U_)
 {
        /* Remove the stream tap listener */
        remove_tap_listener_rtp_stream();

diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index 2db7163f13d6ced91dd61806339906bb9097e99b..18ec79a3d651f92dacffcd9fe531d18715045923 100644 (file)
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.c
@@ -71,7 +71,7 @@ remove_child(struct sctp_udata *child, struct sctp_analyse *parent)
 }
 
 static void
-on_destroy(GtkObject *object _U_, gpointer user_data)
+on_destroy(GObject *object _U_, gpointer user_data)
 {
        struct sctp_analyse *u_data;
        guint16 i, j;

diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index 3098a3b0b7633a1019f8cd4ee36c721f68f66a00..1190980337a7f6fe7f0cc1c77f89f373c09ce729 100644 (file)
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -1247,7 +1247,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data)
 
 
 static void
-quit(GtkObject *object _U_, gpointer user_data)
+quit(GObject *object _U_, gpointer user_data)
 {
        struct sctp_udata *u_data=user_data;
 

diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c
index 73f1493dc0eaa0cbb37ff3088a81f686ead88707..c0a7b41b8d93d2d84db66b6e9efc5d91259c4616 100644 (file)
--- a/gtk/sctp_chunk_stat_dlg.c
+++ b/gtk/sctp_chunk_stat_dlg.c
@@ -464,7 +464,7 @@ typedef struct column_arrows {
 
 
 static void
-chunk_dlg_destroy(GtkObject *object _U_, gpointer user_data)
+chunk_dlg_destroy(GObject *object _U_, gpointer user_data)
 {
     struct sctp_udata *u_data=(struct sctp_udata*)user_data;
     decrease_childcount(u_data->parent);
@@ -474,7 +474,7 @@ chunk_dlg_destroy(GtkObject *object _U_, gpointer user_data)
 }
 
 static void
-on_destroy(GtkObject *object _U_, gpointer user_data)
+on_destroy(GObject *object _U_, gpointer user_data)
 {
     struct sctp_udata *u_data=(struct sctp_udata*)user_data;
     decrease_childcount(u_data->parent);

diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index 1fefe9bb2d455425b6e8d2a9352cc4a7bd801e61..79af0bbef475204b1e40562d4b823c0c257061ce 100644 (file)
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -1638,7 +1638,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data)
 
 
 static void
-quit(GtkObject *object _U_, gpointer user_data)
+quit(GObject *object _U_, gpointer user_data)
 {
        struct sctp_udata *u_data=user_data;
 

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index e15fb17fedfe73903b3ac9ed0595082109f86d14..79457263f62e88d93794b6559c9c7cf550ba903b 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -146,7 +146,7 @@ voip_calls_remove_tap_listener(void)
 /* CALLBACKS                                                                */
 /****************************************************************************/
 static void
-voip_calls_on_destroy(GtkObject *object _U_, gpointer user_data _U_)
+voip_calls_on_destroy(GObject *object _U_, gpointer user_data _U_)
 {
        /* remove_tap_listeners */
        voip_calls_remove_tap_listener();