merge_all_tap_menus() has been moved to menus.c.

[obnox/wireshark/wip.git] / gtk / voip_calls_dlg.c

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index d53347c74f853ca73fca17106c9b7bf394ea9eb2..79457263f62e88d93794b6559c9c7cf550ba903b 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -72,6 +72,7 @@
 #include "gtk/rtp_player.h"
 #endif /* HAVE_LIBPORTAUDIO */
 
+#include "gtk/old-gtk-compat.h"
 
 /****************************************************************************/
 /* pointer to the one and only dialog window */
@@ -145,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();
@@ -709,12 +710,20 @@ voip_calls_dlg_create(void)
 
        bt_select_all = gtk_button_new_from_stock(GTK_STOCK_SELECT_ALL);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_select_all);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_select_all, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_select_all, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_set_tooltip_text(bt_select_all, "Select all the calls");
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add(GTK_CONTAINER (hbuttonbox), bt_close);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_close, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_set_tooltip_text(bt_close, "Close this dialog");
 
        /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(voip_calls_on_unselect), NULL);*/
@@ -857,7 +866,7 @@ voip_calls_init_tap(const char *dummy _U_, void* userdata _U_)
 
        /* Scan for VoIP calls calls (redissect all packets) */
        cf_retap_packets(&cfile);
-       gdk_window_raise(voip_calls_dlg->window);
+       gdk_window_raise(gtk_widget_get_window(voip_calls_dlg));
        /* Tap listener will be removed and cleaned up in voip_calls_on_destroy */
 }