merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/packet_history.c b/gtk/packet_history.c
index 7594bf4760a5b5469ef73c89fa6553df56f741ee..06e60b1c0f668ff747727f87b1ce7dac9984e0c3 100644 (file)
--- a/gtk/packet_history.c
+++ b/gtk/packet_history.c
@@ -26,20 +26,20 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
-
 #include <stdio.h>
 
-#include "file.h"
-#include "globals.h"
+#include <gtk/gtk.h>
 
-#include "menu.h"
-#include "packet_history.h"
+#include "../file.h"
+#include "../globals.h"
 
+#include "gtk/menus.h"
+#include "gtk/packet_history.h"
 
-GList *history_current = NULL;
-GList *history_list = NULL;
-gboolean ignore_jump = FALSE;
+
+static GList *history_current = NULL;
+static GList *history_list = NULL;
+static gboolean ignore_jump = FALSE;
 
 
 #if 0
@@ -123,7 +123,7 @@ void packet_history_add(gint row) {
 
 
 void packet_history_clear(void) {
-    
+
     /* clear "old" list */
     clear_list(history_list);
     history_current = NULL;