diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-06-24 22:53:52 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-06-24 22:53:52 +0000 |
| commit | 495ddc2830cb3f490e53519ca3074d1aa52c2600 (patch) | |
| tree | 77e5d5982b4c750466c87c9920628a3620fc15b1 /gtk | |
| parent | 48c21706f2cc3c94f9c4e7e4178c1b65d46662c6 (diff) | |
Make it obvious that this is a development version. Fix a makefile
dependency on the splash images.
svn path=/trunk/; revision=25594
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.common | 2 | ||||
| -rw-r--r-- | gtk/about_dlg.c | 10 | ||||
| -rw-r--r-- | gtk/main_welcome.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gtk/Makefile.common b/gtk/Makefile.common index 99b3d00fc1..de99ab42f5 100644 --- a/gtk/Makefile.common +++ b/gtk/Makefile.common @@ -124,7 +124,7 @@ WIRESHARK_GTK_SRC = \ voip_calls.c \ webbrowser.c -about_dlg.c: ../image/wssplash.xpm +about_dlg.c main_welcome.c: ../image/wssplash.xpm ../image/wssplash-dev.xpm WIRESHARK_TAP_SRC = \ afp_stat.c \ diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index db31b008ed..b8dd0916e0 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -49,7 +49,7 @@ #include "gtk/main.h" #include "gtk/plugins_dlg.h" -#include "../image/wssplash.xpm" +#include "../image/wssplash-dev.xpm" #include "webbrowser.h" static void about_wireshark_destroy_cb(GtkWidget *, gpointer); @@ -358,9 +358,9 @@ about_folders_page_new(void) const gchar *titles[] = { "Name", "Folder", "Typical Files"}; GtkWidget *scrolledwindow; #ifdef HAVE_LIBSMI - gint i; + gint i; gchar **resultArray; -#endif +#endif scrolledwindow = scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow), @@ -370,7 +370,7 @@ about_folders_page_new(void) table = simple_list_new(3, titles); /* connect a callback so we can spot a double-click */ - gtk_signal_connect(GTK_OBJECT(table), "button_press_event", + gtk_signal_connect(GTK_OBJECT(table), "button_press_event", GTK_SIGNAL_FUNC(about_folders_callback), (gpointer)0); simple_list_url_col(table, 1); @@ -430,7 +430,7 @@ about_folders_page_new(void) resultArray = g_strsplit(path, ":", 10); #endif - for(i = 0; resultArray[i]; i++) + for(i = 0; resultArray[i]; i++) about_folders_row(table, "MIB/PIB path", g_strstrip(resultArray[i]), "SMI MIB/PIB search path"); g_strfreev(resultArray); diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c index 676747796b..511ef12c86 100644 --- a/gtk/main_welcome.c +++ b/gtk/main_welcome.c @@ -54,7 +54,7 @@ #include "gtk/help_dlg.h" #include "gtk/stock_icons.h" #include "gtk/capture_globals.h" -#include "../image/wssplash.xpm" +#include "../image/wssplash-dev.xpm" /* XXX */ |