merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index 6d4210e37040a7eed7b0033e2f9900a30940ebd4..a41fa8c4053344714aedb6937855aa304ecb2b05 100644 (file)
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -40,7 +40,6 @@
 #include <epan/geoip_db.h>
 #endif
 
-#include "../globals.h"
 #include "../log.h"
 #include "../version_info.h"
 
@@ -74,13 +73,15 @@ static GtkWidget *about_wireshark_w;
 
 
 static void
-about_wireshark(GtkWidget *parent, GtkWidget *main_vb)
+about_wireshark(GtkWidget *parent _U_, GtkWidget *main_vb)
 {
   GtkWidget   *msg_label, *icon;
   gchar       *message;
   const char  *title = "Network Protocol Analyzer";
 
-  icon = xpm_to_widget_from_parent(parent, wssplash_xpm);
+  /*icon = xpm_to_widget_from_parent(parent, wssplash_xpm);*/
+  icon = xpm_to_widget(wssplash_xpm);
+
   gtk_container_add(GTK_CONTAINER(main_vb), icon);
 
   msg_label = gtk_label_new(title);
@@ -286,10 +287,8 @@ about_wireshark_page_new(void)
   main_vb = gtk_vbox_new(FALSE, 6);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12);
 
-#if GTK_CHECK_VERSION(2,9,0)
   g_object_set(gtk_widget_get_settings(main_vb),
     "gtk-label-select-on-focus", FALSE, NULL);
-#endif
 
   about_wireshark(top_level, main_vb);
 
@@ -569,4 +568,3 @@ about_wireshark_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
   /* Note that we no longer have an "About Wireshark" dialog box. */
   about_wireshark_w = NULL;
 }
-