summaryrefslogtreecommitdiff
path: root/ui/gtk/main_welcome.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-03-27 21:29:44 +0000
committerGerald Combs <gerald@wireshark.org>2013-03-27 21:29:44 +0000
commit194a145c8fbce0ab59bb17278add54ab649a2077 (patch)
treead12fcc50fbe79d3bb3498c853ad916722aff5a3 /ui/gtk/main_welcome.c
parent269c4fd8c28a3b513e4017b4e8e3ac7eb2bc7b70 (diff)
downloadwireshark-194a145c8fbce0ab59bb17278add54ab649a2077.tar.gz
Add the new splash image. Designed by Elliott Aldrich. Switch the splash
image from XPM to PNG+pixbuf. Remove old XPMs. svn path=/trunk/; revision=48600
Diffstat (limited to 'ui/gtk/main_welcome.c')
-rw-r--r--ui/gtk/main_welcome.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 41b9cc34d1..e880a7e477 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -57,6 +57,7 @@
#include "ui/gtk/help_dlg.h"
#include "ui/gtk/capture_file_dlg.h"
#include "ui/gtk/stock_icons.h"
+#include "ui/gtk/wssplash.h"
#ifdef HAVE_LIBPCAP
#include "ui/gtk/capture_dlg.h"
#include "ui/gtk/capture_if_dlg.h"
@@ -64,7 +65,6 @@
#include "ui/gtk/webbrowser.h"
#endif
#endif /* HAVE_LIBPCAP */
-#include "../../image/wssplash-dev.xpm"
#include "../version_info.h"
#ifdef _WIN32
@@ -369,8 +369,7 @@ welcome_header_new(void)
item_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_box_pack_start(GTK_BOX(item_vb), item_hb, FALSE, FALSE, 10);
- /*icon = xpm_to_widget_from_parent(top_level, wssplash_xpm);*/
- icon = xpm_to_widget(wssplash_xpm);
+ icon = pixbuf_to_widget(wssplash_pb_data);
gtk_box_pack_start(GTK_BOX(item_hb), icon, FALSE, FALSE, 10);
header_lb = gtk_label_new(NULL);