summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/gtk/Makefile.am6
-rw-r--r--ui/gtk/Makefile.common2
-rw-r--r--ui/gtk/about_dlg.c2
-rw-r--r--ui/gtk/capture_if_dlg.c14
-rw-r--r--ui/gtk/graph_analysis.c2
-rw-r--r--ui/gtk/main.c14
-rw-r--r--ui/gtk/main_welcome.c4
-rw-r--r--ui/gtk/prefs_layout.c12
-rw-r--r--ui/gtk/stock_icons.c86
9 files changed, 71 insertions, 71 deletions
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index d75e681fd7..a8b69bb059 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -91,21 +91,21 @@ expert_indicators.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for elevel in chat error none note warn ; do \
- gdk-pixbuf-csource --raw --name=expert_$${elevel}_pb_data ../image/expert_$${elevel}.png >> $@ ;\
+ gdk-pixbuf-csource --raw --name=expert_$${elevel}_pb_data ../../image/expert_$${elevel}.png >> $@ ;\
done
network_icons.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for icon in bluetooth usb wired wireless ; do \
- gdk-pixbuf-csource --raw --name=network_$${icon}_pb_data ../image/toolbar/network_$${icon}_16.png >> $@ ;\
+ gdk-pixbuf-csource --raw --name=network_$${icon}_pb_data ../../image/toolbar/network_$${icon}_16.png >> $@ ;\
done
remote_icons.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for icon in arrow globe sat ; do \
- gdk-pixbuf-csource --raw --name=remote_$${icon}_pb_data ../image/toolbar/remote_$${icon}_16.png >> $@ ;\
+ gdk-pixbuf-csource --raw --name=remote_$${icon}_pb_data ../../image/toolbar/remote_$${icon}_16.png >> $@ ;\
done
EXTRA_DIST = \
diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index af92171155..6aac077938 100644
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -152,7 +152,7 @@ WIRESHARK_GTK_SRC = \
webbrowser.c \
$(WIRESHARK_CUSTOM_GTK_SRC)
-about_dlg.c main_welcome.c: ../image/wssplash.xpm ../image/wssplash-dev.xpm remote_icons.h
+about_dlg.c main_welcome.c: ../../image/wssplash.xpm ../image/wssplash-dev.xpm remote_icons.h
main_statusbar.c: expert_indicators.h
capture_if_dlg.c: network_icons.h remote_icons.h
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index d0e0f228be..379d54599e 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -52,7 +52,7 @@
#include "ui/gtk/main.h"
#include "ui/gtk/plugins_dlg.h"
-#include "../image/wssplash-dev.xpm"
+#include "../../image/wssplash-dev.xpm"
#include "webbrowser.h"
/*
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index 958e8cbae5..40a3d34d1b 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -70,7 +70,7 @@
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_AIRPCAP
-#include "../image/toolbar/capture_airpcap_16.xpm"
+#include "../../image/toolbar/capture_airpcap_16.xpm"
#endif
#if defined(HAVE_PCAP_REMOTE)
@@ -78,16 +78,16 @@
#endif
#ifdef _WIN32
-#include "../image/toolbar/capture_ethernet_16.xpm"
-#include "../image/toolbar/modem_16.xpm"
+#include "../../image/toolbar/capture_ethernet_16.xpm"
+#include "../../image/toolbar/modem_16.xpm"
#endif
-#include "../image/toolbar/network_virtual_16.xpm"
+#include "../../image/toolbar/network_virtual_16.xpm"
/* new buttons to be used instead of labels for 'Capture','Prepare',' */
-/*#include "../image/toolbar/capture_capture_16.xpm"*/
-/*#include "../image/toolbar/capture_prepare_16.xpm"*/
-/*#include "../image/toolbar/capture_details_16.xpm"*/
+/*#include "../../image/toolbar/capture_capture_16.xpm"*/
+/*#include "../../image/toolbar/capture_prepare_16.xpm"*/
+/*#include "../../image/toolbar/capture_details_16.xpm"*/
#ifdef HAVE_AIRPCAP
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 4b3bd4495b..158430d22f 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -66,7 +66,7 @@
#include "ui/gtk/old-gtk-compat.h"
-#include "../image/voip_bg.xpm"
+#include "../../image/voip_bg.xpm"
/****************************************************************************/
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 7d433bce5e..0362df3e98 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -167,13 +167,13 @@
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_LIBPCAP
-#include "../image/wsicon16.xpm"
-#include "../image/wsicon32.xpm"
-#include "../image/wsicon48.xpm"
-#include "../image/wsicon64.xpm"
-#include "../image/wsiconcap16.xpm"
-#include "../image/wsiconcap32.xpm"
-#include "../image/wsiconcap48.xpm"
+#include "../../image/wsicon16.xpm"
+#include "../../image/wsicon32.xpm"
+#include "../../image/wsicon48.xpm"
+#include "../../image/wsicon64.xpm"
+#include "../../image/wsiconcap16.xpm"
+#include "../../image/wsiconcap32.xpm"
+#include "../../image/wsiconcap48.xpm"
#endif
#ifdef HAVE_AIRPCAP
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 31f1202751..b80c663d7d 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -63,7 +63,7 @@
#include "ui/gtk/webbrowser.h"
#endif
#endif /* HAVE_LIBPCAP */
-#include "../image/wssplash-dev.xpm"
+#include "../../image/wssplash-dev.xpm"
#include "../version_info.h"
#ifdef _WIN32
@@ -77,7 +77,7 @@
#include "airpcap_gui_utils.h"
#endif
#if defined(HAVE_AIRPCAP)
-#include "../image/toolbar/capture_airpcap_16.xpm"
+#include "../../image/toolbar/capture_airpcap_16.xpm"
#endif
#if defined(HAVE_PCAP_REMOTE)
#include "ui/gtk/remote_icons.h"
diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c
index 3de6d4b408..c8427740e7 100644
--- a/ui/gtk/prefs_layout.c
+++ b/ui/gtk/prefs_layout.c
@@ -39,12 +39,12 @@
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
-#include "../image/icon_layout_1.xpm"
-#include "../image/icon_layout_2.xpm"
-#include "../image/icon_layout_3.xpm"
-#include "../image/icon_layout_4.xpm"
-#include "../image/icon_layout_5.xpm"
-#include "../image/icon_layout_6.xpm"
+#include "../../image/icon_layout_1.xpm"
+#include "../../image/icon_layout_2.xpm"
+#include "../../image/icon_layout_3.xpm"
+#include "../../image/icon_layout_4.xpm"
+#include "../../image/icon_layout_5.xpm"
+#include "../../image/icon_layout_6.xpm"
#define LAYOUT_QTY (layout_type_max - 1)
diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c
index 52456dca18..fd3b48ee67 100644
--- a/ui/gtk/stock_icons.c
+++ b/ui/gtk/stock_icons.c
@@ -32,49 +32,49 @@
#include "ui/gtk/stock_icons.h"
/* these icons are derived from the original stock icons */
-#include "../image/toolbar/capture_interfaces_24.xpm"
-#include "../image/toolbar/capture_options_24.xpm"
-#include "../image/toolbar/capture_start_24.xpm"
-#include "../image/toolbar/capture_stop_24.xpm"
-#include "../image/toolbar/capture_restart_24.xpm"
-#include "../image/toolbar/capture_filter_24.xpm"
-#include "../image/toolbar/capture_details_24.xpm"
-#include "../image/toolbar/display_filter_24.xpm"
-#include "../image/wsicon16.xpm"
-#include "../image/toolbar/colorize_24.xpm"
-#include "../image/toolbar/autoscroll_24.xpm"
-#include "../image/toolbar/resize_columns_24.xpm"
-#include "../image/toolbar/time_24.xpm"
-#include "../image/toolbar/internet_24.xpm"
-#include "../image/toolbar/web_support_24.xpm"
-#include "../image/toolbar/wiki_24.xpm"
-#include "../image/toolbar/conversations_16.xpm"
-#include "../image/toolbar/endpoints_16.xpm"
-#include "../image/toolbar/expert_info_16.xpm"
-#include "../image/toolbar/flow_graph_16.xpm"
-#include "../image/toolbar/graphs_16.xpm"
-#include "../image/toolbar/telephony_16.xpm"
-#include "../image/toolbar/decode_as_16.xpm"
-#include "../image/toolbar/checkbox_16.xpm"
-#include "../image/toolbar/file_set_list_16.xpm"
-#include "../image/toolbar/file_set_next_16.xpm"
-#include "../image/toolbar/file_set_previous_16.xpm"
-#include "../image/toolbar/icon_color_1.xpm"
-#include "../image/toolbar/icon_color_2.xpm"
-#include "../image/toolbar/icon_color_3.xpm"
-#include "../image/toolbar/icon_color_4.xpm"
-#include "../image/toolbar/icon_color_5.xpm"
-#include "../image/toolbar/icon_color_6.xpm"
-#include "../image/toolbar/icon_color_7.xpm"
-#include "../image/toolbar/icon_color_8.xpm"
-#include "../image/toolbar/icon_color_9.xpm"
-#include "../image/toolbar/icon_color_0.xpm"
-#include "../image/toolbar/decode_24.xpm"
-#include "../image/toolbar/audio_player_24.xpm"
-#include "../image/toolbar/voip_flow_24.xpm"
-#include "../image/toolbar/telephone_16.xpm"
-#include "../image/toolbar/analyze_24.xpm"
-#include "../image/WiresharkDoc_24.xpm"
+#include "../../image/toolbar/capture_interfaces_24.xpm"
+#include "../../image/toolbar/capture_options_24.xpm"
+#include "../../image/toolbar/capture_start_24.xpm"
+#include "../../image/toolbar/capture_stop_24.xpm"
+#include "../../image/toolbar/capture_restart_24.xpm"
+#include "../../image/toolbar/capture_filter_24.xpm"
+#include "../../image/toolbar/capture_details_24.xpm"
+#include "../../image/toolbar/display_filter_24.xpm"
+#include "../../image/wsicon16.xpm"
+#include "../../image/toolbar/colorize_24.xpm"
+#include "../../image/toolbar/autoscroll_24.xpm"
+#include "../../image/toolbar/resize_columns_24.xpm"
+#include "../../image/toolbar/time_24.xpm"
+#include "../../image/toolbar/internet_24.xpm"
+#include "../../image/toolbar/web_support_24.xpm"
+#include "../../image/toolbar/wiki_24.xpm"
+#include "../../image/toolbar/conversations_16.xpm"
+#include "../../image/toolbar/endpoints_16.xpm"
+#include "../../image/toolbar/expert_info_16.xpm"
+#include "../../image/toolbar/flow_graph_16.xpm"
+#include "../../image/toolbar/graphs_16.xpm"
+#include "../../image/toolbar/telephony_16.xpm"
+#include "../../image/toolbar/decode_as_16.xpm"
+#include "../../image/toolbar/checkbox_16.xpm"
+#include "../../image/toolbar/file_set_list_16.xpm"
+#include "../../image/toolbar/file_set_next_16.xpm"
+#include "../../image/toolbar/file_set_previous_16.xpm"
+#include "../../image/toolbar/icon_color_1.xpm"
+#include "../../image/toolbar/icon_color_2.xpm"
+#include "../../image/toolbar/icon_color_3.xpm"
+#include "../../image/toolbar/icon_color_4.xpm"
+#include "../../image/toolbar/icon_color_5.xpm"
+#include "../../image/toolbar/icon_color_6.xpm"
+#include "../../image/toolbar/icon_color_7.xpm"
+#include "../../image/toolbar/icon_color_8.xpm"
+#include "../../image/toolbar/icon_color_9.xpm"
+#include "../../image/toolbar/icon_color_0.xpm"
+#include "../../image/toolbar/decode_24.xpm"
+#include "../../image/toolbar/audio_player_24.xpm"
+#include "../../image/toolbar/voip_flow_24.xpm"
+#include "../../image/toolbar/telephone_16.xpm"
+#include "../../image/toolbar/analyze_24.xpm"
+#include "../../image/WiresharkDoc_24.xpm"
typedef struct stock_pixmap_tag{
const char * name;
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-17 14:18:37 +0000