Restructure the recent file code so that recent.c is GUI-independent;

move it to the top-level source directory for now, and move
ui/gtk/recent.h to the ui directory.

svn path=/trunk/; revision=40561

38 files changed, 93 insertions, 1423 deletions

diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index 3e19ee8eea..d50c7d3a74 100644
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -131,7 +131,6 @@ WIRESHARK_GTK_SRC = \
 	proto_help.c	\
 	proto_hier_stats_dlg.c	\
 	range_utils.c	\
-	recent.c	\
 	rtp_player.c	\
 	rtp_stream.c	\
 	sctp_byte_graph_dlg.c	\
@@ -324,7 +323,6 @@ noinst_HEADERS = \
 	proto_help.h	\
 	proto_hier_stats_dlg.h	\
 	range_utils.h \
-	recent.h	\
 	remote_icons.h	\
 	rtp_analysis.h	\
 	rtp_player.h 	\
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 379d54599e..a7b7197abd 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -43,6 +43,8 @@
 #include "../log.h"
 #include "../version_info.h"
 
+#include "ui/last_open_dir.h"
+
 #include "ui/gtk/about_dlg.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index f34abf48dd..cb5ece2f51 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -49,6 +49,7 @@
 #include "../capture_ui_utils.h"
 #include "../ringbuffer.h"
 
+#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/capture_dlg.h b/ui/gtk/capture_dlg.h
index c782596504..70478a3cfd 100644
--- a/ui/gtk/capture_dlg.h
+++ b/ui/gtk/capture_dlg.h
@@ -179,25 +179,6 @@ void
 activate_monitor (GtkTreeViewColumn *tree_column, GtkCellRenderer *renderer,
                   GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data);
 
-#ifdef HAVE_PCAP_REMOTE
-#define RECENT_KEY_REMOTE_HOST "recent.remote_host"
-
-/** Write all remote hosts to the recent file
- *
- * @param rf recent file
- */
-void
-capture_remote_combo_recent_write_all(FILE *rf);
-
-/** Add a new remote host from the recent file
- *
- * @param s string with hostname,port,auth_type
- * @return TRUE if correctly added
- */
-gboolean
-capture_remote_combo_add_recent(gchar *s);
-#endif
-
 gboolean
 dlg_window_present(void);
 
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 019aca7b4e..11b0304757 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -47,6 +47,8 @@
 #include <wsutil/file_util.h>
 
 #include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
 
@@ -60,7 +62,6 @@
 #include "ui/gtk/drag_and_drop.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/color_dlg.h"
 #include "ui/gtk/new_packet_list.h"
 #ifdef HAVE_LIBPCAP
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index a6990954de..e67b57b79e 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -46,6 +46,7 @@
 #include "wsutil/file_util.h"
 #include <wiretap/wtap.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #ifdef _WIN32
@@ -55,7 +56,6 @@
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/cfilter_combo_utils.c b/ui/gtk/cfilter_combo_utils.c
index 67cfcff6bf..9abed9c5c1 100644
--- a/ui/gtk/cfilter_combo_utils.c
+++ b/ui/gtk/cfilter_combo_utils.c
@@ -31,10 +31,12 @@
 
 #include <gtk/gtk.h>
 
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
+
 #include "ui/gtk/main.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/cfilter_combo_utils.h"
-#include "ui/gtk/recent.h"
 
 
 /* XXX: use a preference for this setting! */
diff --git a/ui/gtk/cfilter_combo_utils.h b/ui/gtk/cfilter_combo_utils.h
index f07f770222..88cc07b007 100644
--- a/ui/gtk/cfilter_combo_utils.h
+++ b/ui/gtk/cfilter_combo_utils.h
@@ -29,11 +29,7 @@
  *  Capture filter combo box routines
  */
 
-extern void cfilter_combo_recent_write_all(FILE *rf);
-extern gboolean cfilter_combo_add_recent(gchar *s);
-
 #define E_CFILTER_CM_KEY          "capture_filter_combo"
 #define E_CFILTER_FL_KEY          "capture_filter_list"
-#define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter"
 
 #endif /* __CFILTER_COMBO_UTILS_H__ */
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index 6c8cf92172..bce668a27b 100644
--- a/ui/gtk/drag_and_drop.c
+++ b/ui/gtk/drag_and_drop.c
@@ -42,6 +42,7 @@
 #include "../capture.h"
 #endif
 
+#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index 30e6105d7c..14c214cd16 100644
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -57,9 +57,11 @@
 
 #include "../isprint.h"
 
-#include "ui/simple_dialog.h"
 #include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
 #include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
 
 #include "ui/gtk/keys.h"
@@ -73,7 +75,6 @@
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/export_sslkeys.h"
 
 #ifdef _WIN32
diff --git a/ui/gtk/file_dlg.h b/ui/gtk/file_dlg.h
index 87dd8d4d8d..9303f61958 100644
--- a/ui/gtk/file_dlg.h
+++ b/ui/gtk/file_dlg.h
@@ -99,12 +99,6 @@ extern void file_selection_set_extra_widget(GtkWidget *fs, GtkWidget *extra);
 extern void
 file_selection_browse(GtkWidget *file_bt, GtkWidget *file_te, const char *title, file_selection_action_t action);
 
-/** Get the latest opened directory.
- *
- * @return the dirname
- */
-extern char *get_last_open_dir(void);
-
 /** Set the latest opened directory.
  *  Will already be done when using file_selection_new().
  *
diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index 431a8f0aac..106094350a 100644
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -58,7 +58,9 @@
 #include <epan/dissectors/packet-ipv6.h>
 
 #include <ui/alert_box.h>
+#include <ui/last_open_dir.h>
 #include <ui/simple_dialog.h>
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 32c12ccbfd..5d97ff0b78 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -41,10 +41,13 @@
 #include <epan/prefs.h>
 #include <epan/charsets.h>
 
-#include <ui/alert_box.h>
 #include <../isprint.h>
 #include <../print.h>
+
+#include <ui/alert_box.h>
+#include <ui/last_open_dir.h>
 #include <ui/simple_dialog.h>
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c
index 4af1a8877b..b02bbd965e 100644
--- a/ui/gtk/font_utils.c
+++ b/ui/gtk/font_utils.c
@@ -40,10 +40,10 @@
 #include <wsutil/unicode-utils.h>
 #endif
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/main_proto_draw.h"
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 9d749f16bf..ca890caacd 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -52,8 +52,12 @@
 #include <epan/filesystem.h>
 
 #include "../util.h"
-#include "ui/simple_dialog.h"
+
 #include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
@@ -62,7 +66,6 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/graph_analysis.h"
-#include "ui/gtk/recent.h"
 
 #include "ui/gtk/old-gtk-compat.h"
 
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 5a35348fa9..1c2ce3595d 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -41,13 +41,15 @@
 #include "epan/epan.h"
 
 #include <epan/packet_info.h>
+
+#include "ui/recent.h"
 #include "ui/ui_util.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/font_utils.h"
-#include "ui/gtk/recent.h"
 
 #include "ui/gtk/old-gtk-compat.h"
 
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index 9720a2a0d6..e57b910467 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -25,6 +25,8 @@
 #ifndef __GUI_UTILS_H__
 #define __GUI_UTILS_H__
 
+#include "ui/ui_util.h"
+
 /** @defgroup windows_group Windows
  *
  * There are the following toplevel windows:
@@ -158,20 +160,6 @@ extern void window_cancel_button_cb(GtkWidget *w _U_, gpointer data);
  */
 extern gboolean window_delete_event_cb(GtkWidget *win, GdkEvent *event _U_, gpointer user_data _U_);
 
-/** geometry values for use in window_get_geometry() and window_set_geometry() */
-typedef struct window_geometry_s {
-    gchar       *key;           /**< current key in hashtable (internally used only) */
-    gboolean    set_pos;        /**< set the x and y position values */
-    gint        x;              /**< the windows x position */
-    gint        y;              /**< the windows y position */
-    gboolean    set_size;       /**< set the width and height values */
-    gint        width;          /**< the windows width */
-    gint        height;         /**< the windows height */
-
-    gboolean    set_maximized;  /**< set the maximized state (GTK2 only) */
-    gboolean    maximized;      /**< the windows maximized state (GTK2 only) */
-} window_geometry_t;
-
 /** Get the geometry of a window.
  *
  * @param win the window from window_new()
@@ -187,21 +175,6 @@ extern void window_get_geometry(GtkWidget *win, window_geometry_t *geom);
  */
 extern void window_set_geometry(GtkWidget *win, window_geometry_t *geom);
 
-/** Write all geometry values of all windows to the recent file.
- * Will call write_recent_geom() for every existing window type.
- *
- * @param rf recent file handle from caller
- */
-extern void window_geom_recent_write_all(gpointer rf);
-
-/** Read in a single geometry key value pair from the recent file.
- *
- * @param name the geom_name of the window
- * @param key the subkey of this pair (e.g. "x")
- * @param value the new value (e.g. "123")
- */
-extern void window_geom_recent_read_pair(const char *name, const char *key, const char *value);
-
 /** Raise a top-level window and de-iconify it.
  *  This routine is used if the user has done something to
  *  ask that a window of a certain type be popped up when there can be only
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 814f4673f8..a1908ad4fe 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -66,11 +66,14 @@
 
 #include "../util.h"
 #include "../g711.h"
-#include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
-#include "ui/progress_dlg.h"
 #include "../tempfile.h"
+
+#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/progress_dlg.h"
+#include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index f79d94a4ed..4fc410154e 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -92,20 +92,24 @@
 #include "../color.h"
 #include "../color_filters.h"
 #include "../print.h"
-#include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
 #include "../register.h"
 #include "../ringbuffer.h"
-#include "ui/ui_util.h"
 #include "../util.h"
 #include "../clopts_common.h"
 #include "../console_io.h"
 #include "../cmdarg_err.h"
 #include "../version_info.h"
 #include "../merge.h"
-#include "ui/alert_box.h"
 #include "../log.h"
 #include "../u3.h"
+
+#include "ui/alert_box.h"
+#include "ui/main_statusbar.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
+
 #include <wsutil/file_util.h>
 
 #ifdef HAVE_LIBPCAP
@@ -148,7 +152,6 @@
 #include "ui/gtk/packet_win.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/find_dlg.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/follow_tcp.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/about_dlg.h"
diff --git a/ui/gtk/main.h b/ui/gtk/main.h
index f944ab2bb6..47a6599b06 100644
--- a/ui/gtk/main.h
+++ b/ui/gtk/main.h
@@ -301,22 +301,10 @@ extern void find_next_mark_cb(GtkWidget *widget, gpointer data, int action);
  */
 extern void find_prev_mark_cb(GtkWidget *widget, gpointer data, int action);
 
-/** Add a display filter coming from the user's recent file to the dfilter combo box.
- *
- * @param dftext the filter string
- */
-extern gboolean dfilter_combo_add_recent(gchar *dftext);
-
 #if 0
 /** Empty out the combobox entry field */
 extern void dfilter_combo_add_empty(void);
 #endif
-/** Write all non empty display filters (until maximum count)
- *  of the combo box GList to the user's recent file.
- *
- * @param rf the recent file
- */
-extern void dfilter_recent_combo_write_all(FILE *rf);
 
 /** Quit the program.
  *
diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c
index 43054bdf71..3b0531898a 100644
--- a/ui/gtk/main_filter_toolbar.c
+++ b/ui/gtk/main_filter_toolbar.c
@@ -34,6 +34,9 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+
+#include "ui/recent.h"
+
 #include "ui/gtk/old-gtk-compat.h"
 
 #include "filter_dlg.h"
@@ -44,7 +47,6 @@
 #include "keys.h"
 #include "gtkglobals.h"
 #include "stock_icons.h"
-#include "recent.h"
 
 #include "main.h"
 #include "menus.h"
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 8a702ad0fb..c6729ab5c6 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -47,13 +47,15 @@
 #include <epan/filesystem.h>
 
 #include "../print.h"
-#include "ui/ui_util.h"
-#include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
 #include "../color_filters.h"
 #include "../stat_menu.h"
 #include "../u3.h"
 
+#include "ui/ui_util.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
+
 #include "ui/gtk/about_dlg.h"
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
@@ -80,7 +82,6 @@
 #include "ui/gtk/keys.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/main_proto_draw.h"
 #include "ui/gtk/conversations_table.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/main_proto_draw.c b/ui/gtk/main_proto_draw.c
index 9b9b757f93..788ce29803 100644
--- a/ui/gtk/main_proto_draw.c
+++ b/ui/gtk/main_proto_draw.c
@@ -55,10 +55,14 @@
 #include <epan/filesystem.h>
 
 #include "../isprint.h"
+
 #include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
+#include "ui/last_open_dir.h"
 #include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/keys.h"
@@ -73,7 +77,6 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
 #include "ui/gtk/main_proto_draw.h"
-#include "ui/gtk/recent.h"
 
 #ifdef _WIN32
 #include <gdk/gdkwin32.h>
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index 4937c3a69e..f8dbe9f50d 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -47,8 +47,8 @@
 #endif
 
 #include "ui/main_statusbar.h"
+#include "ui/recent.h"
 
-#include "ui/gtk/recent.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/main_statusbar_private.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c
index 1a0616a72d..a834953ca3 100644
--- a/ui/gtk/main_toolbar.c
+++ b/ui/gtk/main_toolbar.c
@@ -38,6 +38,8 @@
 
 #include "../color_filters.h"
 
+#include "ui/recent.h"
+
 #ifdef HAVE_LIBPCAP
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
@@ -55,7 +57,6 @@
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/keys.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/packet_history.h"
 #include "ui/gtk/new_packet_list.h"
 
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 3b7f0aff99..1983a874b8 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -44,11 +44,11 @@
 
 #include <wsutil/file_util.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/color_utils.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
diff --git a/ui/gtk/menus.h b/ui/gtk/menus.h
index 845cf69d7b..27940cbc06 100644
--- a/ui/gtk/menus.h
+++ b/ui/gtk/menus.h
@@ -29,10 +29,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* Add a new recent capture filename to the "Recent Files" submenu
-   (duplicates will be ignored) */
-extern void add_menu_recent_capture_file(gchar *cf_name);
-
 /* Open a file(name)
    (will not ask to close existing capture file!) */
 extern void menu_open_filename(gchar *cf_name);
@@ -42,11 +38,6 @@ extern void menu_open_filename(gchar *cf_name);
  *  @ingroup main_window_group
  */
 
-/** Write all recent capture filenames to the user's recent file.
- * @param rf recent file
- */
-extern void menu_recent_file_write_all(FILE *rf);
-
 /** User pushed a recent file submenu item.
  *
  * @param widget parent widget
diff --git a/ui/gtk/new_packet_list.c b/ui/gtk/new_packet_list.c
index 3cea65cb54..913127957a 100644
--- a/ui/gtk/new_packet_list.c
+++ b/ui/gtk/new_packet_list.c
@@ -35,25 +35,28 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
-#include "gui_utils.h"
-#include "packet_list_store.h"
-#include "ui/gtk/new_packet_list.h"
-#include "epan/column_info.h"
-#include "epan/prefs.h"
+#include <epan/column_info.h>
+#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
-#include "ui/ui_util.h"
+#include <epan/column.h>
+#include <epan/strutil.h>
+#include <epan/emem.h>
+
+#include "ui/main_statusbar.h"
 #include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
-#include "epan/emem.h"
+#include "ui/ui_util.h"
+
+#include "gui_utils.h"
+#include "packet_list_store.h"
+#include "ui/gtk/new_packet_list.h"
 #include "globals.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/packet_history.h"
-#include "epan/column.h"
-#include "epan/strutil.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/menus.h"
 #include "color.h"
diff --git a/ui/gtk/new_packet_list.h b/ui/gtk/new_packet_list.h
index b25bdf76f9..70cf706b4b 100644
--- a/ui/gtk/new_packet_list.h
+++ b/ui/gtk/new_packet_list.h
@@ -31,8 +31,6 @@
  *  @ingroup main_window_group
  */
 
-#define RECENT_KEY_COL_WIDTH                "column.width"
-
 typedef enum {
   COLUMN_SELECTED_SORT_ASCENDING,
   COLUMN_SELECTED_SORT_DESCENDING,
@@ -135,12 +133,6 @@ typedef enum {
  */
 void new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type);
 
-/** Write all packet list geometry values to the recent file.
- *
- *  @param rf recent file handle from caller
- */
-extern void new_packet_list_recent_write_all(FILE *rf);
-
 GtkWidget * new_packet_list_get_widget(void);
 void new_packet_list_colorize_packets(void);
 
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index f07f9e0d23..9b35d3da17 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -60,9 +60,11 @@
 
 #include "../file.h"
 #include "../print.h"
-#include "ui/ui_util.h"
 #include "../summary.h"
+
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/main.h"
@@ -71,7 +73,6 @@
 #include "ui/gtk/keys.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/recent.h"
 
 #define BV_SIZE 75
 #define TV_SIZE 95
diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c
index b4c0aca5b7..faaf05f43c 100644
--- a/ui/gtk/pixmap_save.c
+++ b/ui/gtk/pixmap_save.c
@@ -33,6 +33,7 @@
 
 #include <epan/filesystem.h>
 
+#include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/pixmap_save.h"
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index c35dd1d09b..953de9c684 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -31,6 +31,7 @@
 
 #include <epan/prefs.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/prefs_gui.h"
@@ -45,7 +46,6 @@
 #include "ui/gtk/main_proto_draw.h"
 #include "ui/gtk/main_toolbar.h"
 #include "ui/gtk/font_utils.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/main_welcome.h"
 
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index 7575a43941..22766e2ab7 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -38,7 +38,9 @@
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/main.h"
@@ -48,8 +50,8 @@
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/help_dlg.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/old-gtk-compat.h"
+
 enum {
   NAME_COLUMN,
   GLOBAL_COLUMN,
diff --git a/ui/gtk/recent.c b/ui/gtk/recent.c
deleted file mode 100644
index c1b62a72f6..0000000000
--- a/ui/gtk/recent.c
+++ /dev/null
@@ -1,1105 +0,0 @@
-/* recent.c
- * Recent "preference" handling routines
- * Copyright 2004, Ulf Lamping <ulf.lamping@web.de>
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef QT_GUI_LIB
-#include <gtk/gtk.h>
-#endif
-
-#include <epan/epan.h>
-#include <epan/filesystem.h>
-#include <epan/emem.h>
-#include <epan/prefs.h>
-#include <epan/prefs-int.h>
-#include <epan/column.h>
-
-#include "ui/simple_dialog.h"
-#include "../u3.h"
-#include <wsutil/file_util.h>
-
-#include "ui/gtk/recent.h"
-#ifndef QT_GUI_LIB
-#include "ui/gtk/main.h"
-#include "ui/gtk/menus.h"
-#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/new_packet_list.h"
-#include "ui/gtk/file_dlg.h"
-#include "ui/gtk/cfilter_combo_utils.h"
-
-#ifdef HAVE_PCAP_REMOTE
-#include "ui/gtk/capture_dlg.h"
-#endif
-#else /* QT_GUI_LIB */
-#include "qt_ui_utils.h"
-#include "../file.h"
-#endif /* QT_GUI_LIB */
-
-#define RECENT_KEY_MAIN_TOOLBAR_SHOW        "gui.toolbar_main_show"
-#define RECENT_KEY_FILTER_TOOLBAR_SHOW      "gui.filter_toolbar_show"
-#define RECENT_KEY_AIRPCAP_TOOLBAR_SHOW     "gui.airpcap_toolbar_show"
-#define RECENT_KEY_DRIVER_CHECK_SHOW        "gui.airpcap_driver_check_show"
-#define RECENT_KEY_PACKET_LIST_SHOW         "gui.packet_list_show"
-#define RECENT_KEY_TREE_VIEW_SHOW           "gui.tree_view_show"
-#define RECENT_KEY_BYTE_VIEW_SHOW           "gui.byte_view_show"
-#define RECENT_KEY_STATUSBAR_SHOW           "gui.statusbar_show"
-#define RECENT_KEY_PACKET_LIST_COLORIZE     "gui.packet_list_colorize"
-#define RECENT_GUI_TIME_FORMAT              "gui.time_format"
-#define RECENT_GUI_TIME_PRECISION           "gui.time_precision"
-#define RECENT_GUI_SECONDS_FORMAT           "gui.seconds_format"
-#define RECENT_GUI_ZOOM_LEVEL               "gui.zoom_level"
-#define RECENT_GUI_BYTES_VIEW               "gui.bytes_view"
-#define RECENT_GUI_GEOMETRY_MAIN_X          "gui.geometry_main_x"
-#define RECENT_GUI_GEOMETRY_MAIN_Y          "gui.geometry_main_y"
-#define RECENT_GUI_GEOMETRY_MAIN_WIDTH      "gui.geometry_main_width"
-#define RECENT_GUI_GEOMETRY_MAIN_HEIGHT     "gui.geometry_main_height"
-#define RECENT_GUI_GEOMETRY_MAIN_MAXIMIZED  "gui.geometry_main_maximized"
-#define RECENT_GUI_GEOMETRY_MAIN_UPPER_PANE "gui.geometry_main_upper_pane"
-#define RECENT_GUI_GEOMETRY_MAIN_LOWER_PANE "gui.geometry_main_lower_pane"
-#define RECENT_GUI_GEOMETRY_STATUS_PANE_LEFT  "gui.geometry_status_pane"
-#define RECENT_GUI_GEOMETRY_STATUS_PANE_RIGHT "gui.geometry_status_pane_right"
-#define RECENT_GUI_GEOMETRY_WLAN_STATS_PANE "gui.geometry_status_wlan_stats_pane"
-#define RECENT_LAST_USED_PROFILE            "gui.last_used_profile"
-#define RECENT_GUI_FILEOPEN_REMEMBERED_DIR  "gui.fileopen_remembered_dir"
-#define RECENT_GUI_GEOMETRY                 "gui.geom."
-#define RECENT_KEY_PRIVS_WARN_IF_ELEVATED   "privs.warn_if_elevated"
-#define RECENT_KEY_PRIVS_WARN_IF_NO_NPF     "privs.warn_if_no_npf"
-
-#define RECENT_FILE_NAME "recent"
-#define RECENT_COMMON_FILE_NAME "recent_common"
-
-recent_settings_t recent;
-
-static const char *ts_type_text[] =
-  { "RELATIVE", "ABSOLUTE", "ABSOLUTE_WITH_DATE", "DELTA", "DELTA_DIS", "EPOCH", "UTC", "UTC_WITH_DATE", NULL };
-
-static const char *ts_precision_text[] =
-	{ "AUTO", "SEC", "DSEC", "CSEC", "MSEC", "USEC", "NSEC", NULL };
-
-static const char *ts_seconds_text[] =
-  { "SECONDS", "HOUR_MIN_SEC", NULL };
-
-/* Takes an string and a pointer to an array of strings, and a default int value.
- * The array must be terminated by a NULL string. If the string is found in the array
- * of strings, the index of that string in the array is returned. Otherwise, the
- * default value that was passed as the third argument is returned.
- */
-static int
-find_index_from_string_array(const char *needle, const char **haystack, int default_value)
-{
-	int i = 0;
-
-	while (haystack[i] != NULL) {
-		if (strcmp(needle, haystack[i]) == 0) {
-			return i;
-		}
-		i++;
-	}
-	return default_value;
-}
-
-static void
-free_col_width_info(recent_settings_t *rs)
-{
-  col_width_data *cfmt;
-
-  while (rs->col_width_list != NULL) {
-    cfmt = rs->col_width_list->data;
-    g_free(cfmt->cfield);
-    g_free(cfmt);
-    rs->col_width_list = g_list_remove_link(rs->col_width_list, rs->col_width_list);
-  }
-  g_list_free(rs->col_width_list);
-  rs->col_width_list = NULL;
-}
-
-/* Attempt to Write out "recent common" to the user's recent common file.
-   If we got an error report it with a dialog box and return FALSE,
-   otherwise return TRUE. */
-gboolean
-write_recent(void)
-{
-  char        *pf_dir_path;
-  char        *rf_path;
-  FILE        *rf;
-
-  /* To do:
-   * - Split output lines longer than MAX_VAL_LEN
-   * - Create a function for the preference directory check/creation
-   *   so that duplication can be avoided with filter.c
-   */
-
-  /* Create the directory that holds personal configuration files, if
-     necessary.  */
-  if (create_persconffile_dir(&pf_dir_path) == -1) {
-     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-      "Can't create directory\n\"%s\"\nfor recent file: %s.", pf_dir_path,
-      g_strerror(errno));
-     g_free(pf_dir_path);
-     return FALSE;
-  }
-
-  rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, TRUE);
-  if ((rf = ws_fopen(rf_path, "w")) == NULL) {
-     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-      "Can't open recent file\n\"%s\": %s.", rf_path,
-      g_strerror(errno));
-    g_free(rf_path);
-    return FALSE;
-  }
-  g_free(rf_path);
-
-  fputs("# Recent settings file for Wireshark " VERSION ".\n"
-    "#\n"
-    "# This file is regenerated each time Wireshark is quit.\n"
-    "# So be careful, if you want to make manual changes here.\n"
-    "\n"
-    "######## Recent capture files (latest last), cannot be altered through command line ########\n"
-    "\n", rf);
-
-  menu_recent_file_write_all(rf);
-
-  fputs("\n"
-    "######## Recent capture filters (latest last), cannot be altered through command line ########\n"
-    "\n", rf);
-
-  cfilter_combo_recent_write_all(rf);
-
-  fputs("\n"
-    "######## Recent display filters (latest last), cannot be altered through command line ########\n"
-    "\n", rf);
-
-  dfilter_recent_combo_write_all(rf);
-
-#ifdef HAVE_PCAP_REMOTE
-  fputs("\n"
-    "######## Recent remote hosts, cannot be altered through command line ########\n"
-    "\n", rf);
-
-  capture_remote_combo_recent_write_all(rf);
-#endif
-
-  fprintf(rf, "\n# Main window geometry.\n");
-  fprintf(rf, "# Decimal numbers.\n");
-  fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_X ": %d\n", recent.gui_geometry_main_x);
-  fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_Y ": %d\n", recent.gui_geometry_main_y);
-  fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_WIDTH ": %d\n",
-  		  recent.gui_geometry_main_width);
-  fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_HEIGHT ": %d\n",
-  		  recent.gui_geometry_main_height);
-
-  fprintf(rf, "\n# Main window maximized.\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_MAXIMIZED ": %s\n",
-		  recent.gui_geometry_main_maximized == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Statusbar left pane size.\n");
-  fprintf(rf, "# Decimal number.\n");
-  if (recent.gui_geometry_status_pane_left != 0) {
-    fprintf(rf, RECENT_GUI_GEOMETRY_STATUS_PANE_LEFT ": %d\n",
-		  recent.gui_geometry_status_pane_left);
-  }
-  fprintf(rf, "\n# Statusbar middle pane size.\n");
-  fprintf(rf, "# Decimal number.\n");
-  if (recent.gui_geometry_status_pane_right != 0) {
-    fprintf(rf, RECENT_GUI_GEOMETRY_STATUS_PANE_RIGHT ": %d\n",
-		  recent.gui_geometry_status_pane_right);
-  }
-
-  fprintf(rf, "\n# Last used Configuration Profile.\n");
-  fprintf(rf, RECENT_LAST_USED_PROFILE ": %s\n", get_profile_name());
-
-  fprintf(rf, "\n# WLAN statistics upper pane size.\n");
-  fprintf(rf, "# Decimal number.\n");
-  fprintf(rf, RECENT_GUI_GEOMETRY_WLAN_STATS_PANE ": %d\n",
-	  recent.gui_geometry_wlan_stats_pane);
-
-  fprintf(rf, "\n# Warn if running with elevated permissions (e.g. as root).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_PRIVS_WARN_IF_ELEVATED ": %s\n",
-		  recent.privs_warn_if_elevated == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Warn if npf.sys isn't loaded on Windows >= 6.0.\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_PRIVS_WARN_IF_NO_NPF ": %s\n",
-		  recent.privs_warn_if_no_npf == TRUE ? "TRUE" : "FALSE");
-
-  window_geom_recent_write_all(rf);
-
-  fclose(rf);
-
-  /* XXX - catch I/O errors (e.g. "ran out of disk space") and return
-     an error indication, or maybe write to a new recent file and
-     rename that file on top of the old one only if there are not I/O
-     errors. */
-  return TRUE;
-}
-
-
-/* Attempt to Write out profile "recent" to the user's profile recent file.
-   If we got an error report it with a dialog box and return FALSE,
-   otherwise return TRUE. */
-gboolean
-write_profile_recent(void)
-{
-  char        *pf_dir_path;
-  char        *rf_path;
-  FILE        *rf;
-
-  /* To do:
-   * - Split output lines longer than MAX_VAL_LEN
-   * - Create a function for the preference directory check/creation
-   *   so that duplication can be avoided with filter.c
-   */
-
-  /* Create the directory that holds personal configuration files, if
-     necessary.  */
-  if (create_persconffile_dir(&pf_dir_path) == -1) {
-     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-      "Can't create directory\n\"%s\"\nfor recent file: %s.", pf_dir_path,
-      g_strerror(errno));
-     g_free(pf_dir_path);
-     return FALSE;
-  }
-
-  rf_path = get_persconffile_path(RECENT_FILE_NAME, TRUE, TRUE);
-  if ((rf = ws_fopen(rf_path, "w")) == NULL) {
-     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-      "Can't open recent file\n\"%s\": %s.", rf_path,
-      g_strerror(errno));
-    g_free(rf_path);
-    return FALSE;
-  }
-  g_free(rf_path);
-
-  fputs("# Recent settings file for Wireshark " VERSION ".\n"
-    "#\n"
-    "# This file is regenerated each time Wireshark is quit\n"
-    "# and when changing configuration profile.\n"
-    "# So be careful, if you want to make manual changes here.\n"
-    "\n", rf);
-
-  fprintf(rf, "\n# Main Toolbar show (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_MAIN_TOOLBAR_SHOW ": %s\n",
-		  recent.main_toolbar_show == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Filter Toolbar show (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_FILTER_TOOLBAR_SHOW ": %s\n",
-		  recent.filter_toolbar_show == TRUE ? "TRUE" : "FALSE");
-
-#ifdef HAVE_AIRPCAP
-  fprintf(rf, "\n# Wireless Settings Toolbar show (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_AIRPCAP_TOOLBAR_SHOW ": %s\n",
-		  recent.airpcap_toolbar_show == TRUE ? "TRUE" : "FALSE");
-#endif
-
-#ifdef HAVE_AIRPCAP
-  fprintf(rf, "\n# Show (hide) old AirPcap driver warning dialog box.\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_DRIVER_CHECK_SHOW ": %s\n",
-		  recent.airpcap_driver_check_show == TRUE ? "TRUE" : "FALSE");
-#endif
-
-  fprintf(rf, "\n# Packet list show (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_PACKET_LIST_SHOW ": %s\n",
-		  recent.packet_list_show == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Tree view show (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_TREE_VIEW_SHOW ": %s\n",
-		  recent.tree_view_show == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Byte view show (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_BYTE_VIEW_SHOW ": %s\n",
-		  recent.byte_view_show == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Statusbar show (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_STATUSBAR_SHOW ": %s\n",
-		  recent.statusbar_show == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Packet list colorize (hide).\n");
-  fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-  fprintf(rf, RECENT_KEY_PACKET_LIST_COLORIZE ": %s\n",
-		  recent.packet_list_colorize == TRUE ? "TRUE" : "FALSE");
-
-  fprintf(rf, "\n# Timestamp display format.\n");
-  fprintf(rf, "# One of: RELATIVE, ABSOLUTE, ABSOLUTE_WITH_DATE, DELTA, DELTA_DIS, EPOCH, UTC, UTC_WITH_DATE\n");
-  fprintf(rf, RECENT_GUI_TIME_FORMAT ": %s\n",
-          ts_type_text[recent.gui_time_format]);
-
-  fprintf(rf, "\n# Timestamp display precision.\n");
-  fprintf(rf, "# One of: AUTO, SEC, DSEC, CSEC, MSEC, USEC, NSEC\n");
-  fprintf(rf, RECENT_GUI_TIME_PRECISION ": %s\n",
-          ts_precision_text[recent.gui_time_precision]);
-
-  fprintf(rf, "\n# Seconds display format.\n");
-  fprintf(rf, "# One of: SECONDS, HOUR_MIN_SEC\n");
-  fprintf(rf, RECENT_GUI_SECONDS_FORMAT ": %s\n",
-          ts_seconds_text[recent.gui_seconds_format]);
-
-  fprintf(rf, "\n# Zoom level.\n");
-  fprintf(rf, "# A decimal number.\n");
-  fprintf(rf, RECENT_GUI_ZOOM_LEVEL ": %d\n",
-		  recent.gui_zoom_level);
-
-  fprintf(rf, "\n# Bytes view.\n");
-  fprintf(rf, "# A decimal number.\n");
-  fprintf(rf, RECENT_GUI_BYTES_VIEW ": %d\n",
-		  recent.gui_bytes_view);
-
-  fprintf(rf, "\n# Main window upper (or leftmost) pane size.\n");
-  fprintf(rf, "# Decimal number.\n");
-  if (recent.gui_geometry_main_upper_pane != 0) {
-    fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_UPPER_PANE ": %d\n",
-		  recent.gui_geometry_main_upper_pane);
-  }
-  fprintf(rf, "\n# Main window middle pane size.\n");
-  fprintf(rf, "# Decimal number.\n");
-  if (recent.gui_geometry_main_lower_pane != 0) {
-    fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_LOWER_PANE ": %d\n",
-		  recent.gui_geometry_main_lower_pane);
-  }
-
-  fprintf(rf, "\n# Packet list column pixel widths.\n");
-  fprintf(rf, "# Each pair of strings consists of a column format and its pixel width.\n");
-  new_packet_list_recent_write_all(rf);
-
-  if (get_last_open_dir() != NULL) {
-    fprintf(rf, "\n# Last directory navigated to in File Open dialog.\n");
-
-    if(u3_active())
-      fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", u3_contract_device_path(get_last_open_dir()));
-    else
-      fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", get_last_open_dir());
-  }
-
-  fclose(rf);
-
-  /* XXX - catch I/O errors (e.g. "ran out of disk space") and return
-     an error indication, or maybe write to a new recent file and
-     rename that file on top of the old one only if there are not I/O
-     errors. */
-  return TRUE;
-}
-
-
-/* write the geometry values of a window to recent file */
-void
-write_recent_geom(gpointer key _U_, gpointer value, gpointer rf)
-{
-    window_geometry_t *geom = value;
-
-    fprintf(rf, "\n# Geometry and maximized state of %s window.\n", geom->key);
-    fprintf(rf, "# Decimal integers.\n");
-    fprintf(rf, RECENT_GUI_GEOMETRY "%s.x: %d\n", geom->key, geom->x);
-    fprintf(rf, RECENT_GUI_GEOMETRY "%s.y: %d\n", geom->key, geom->y);
-    fprintf(rf, RECENT_GUI_GEOMETRY "%s.width: %d\n", geom->key,
-  	      geom->width);
-    fprintf(rf, RECENT_GUI_GEOMETRY "%s.height: %d\n", geom->key,
-  	      geom->height);
-
-    fprintf(rf, "# TRUE or FALSE (case-insensitive).\n");
-    fprintf(rf, RECENT_GUI_GEOMETRY "%s.maximized: %s\n", geom->key,
-	      geom->maximized == TRUE ? "TRUE" : "FALSE");
-
-}
-
-/* set one user's recent common file key/value pair */
-static prefs_set_pref_e
-read_set_recent_common_pair_static(gchar *key, gchar *value,
-				   void *private_data _U_,
-				   gboolean return_range_errors _U_)
-{
-  long num;
-  char *p;
-
-  if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_MAXIMIZED) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.gui_geometry_main_maximized = TRUE;
-    }
-    else {
-        recent.gui_geometry_main_maximized = FALSE;
-    }
-
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_X) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    recent.gui_geometry_main_x = num;
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_Y) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    recent.gui_geometry_main_y = num;
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_WIDTH) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    if (num <= 0)
-      return PREFS_SET_SYNTAX_ERR;	/* number must be positive */
-    recent.gui_geometry_main_width = num;
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_HEIGHT) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    if (num <= 0)
-      return PREFS_SET_SYNTAX_ERR;	/* number must be positive */
-    recent.gui_geometry_main_height = num;
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_STATUS_PANE_RIGHT) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    if (num <= 0)
-      return PREFS_SET_SYNTAX_ERR;	/* number must be positive */
-    recent.gui_geometry_status_pane_right = num;
-    recent.has_gui_geometry_status_pane = TRUE;
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_STATUS_PANE_LEFT) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    if (num <= 0)
-      return PREFS_SET_SYNTAX_ERR;	/* number must be positive */
-    recent.gui_geometry_status_pane_left = num;
-    recent.has_gui_geometry_status_pane = TRUE;
-  } else if (strcmp(key, RECENT_LAST_USED_PROFILE) == 0) {
-    if ((strcmp(value, DEFAULT_PROFILE) != 0) && profile_exists (value, FALSE)) {
-      set_profile_name (value);
-    }
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_WLAN_STATS_PANE) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    if (num <= 0)
-      return PREFS_SET_SYNTAX_ERR;	/* number must be positive */
-    recent.gui_geometry_wlan_stats_pane = num;
-  } else if (strncmp(key, RECENT_GUI_GEOMETRY, sizeof(RECENT_GUI_GEOMETRY)-1) == 0) {
-    /* now have something like "gui.geom.main.x", split it into win and sub_key */
-    char *win = &key[sizeof(RECENT_GUI_GEOMETRY)-1];
-    char *sub_key = strchr(win, '.');
-    if(sub_key) {
-      *sub_key = '\0';
-      sub_key++;
-      window_geom_recent_read_pair(win, sub_key, value);
-    }
-  } else if (strcmp(key, RECENT_KEY_PRIVS_WARN_IF_ELEVATED) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.privs_warn_if_elevated = TRUE;
-    }
-    else {
-        recent.privs_warn_if_elevated = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_PRIVS_WARN_IF_NO_NPF) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.privs_warn_if_no_npf = TRUE;
-    }
-    else {
-        recent.privs_warn_if_no_npf = FALSE;
-    }
-  }
-
-  return PREFS_SET_OK;
-}
-
-/* set one user's recent file key/value pair */
-static prefs_set_pref_e
-read_set_recent_pair_static(gchar *key, gchar *value, void *private_data _U_,
-			    gboolean return_range_errors _U_)
-{
-  long num;
-  char *p;
-  GList *col_l, *col_l_elt;
-  col_width_data *cfmt;
-  const gchar *cust_format = col_format_to_string(COL_CUSTOM);
-  int cust_format_len = (int) strlen(cust_format);
-
-  if (strcmp(key, RECENT_KEY_MAIN_TOOLBAR_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.main_toolbar_show = TRUE;
-    }
-    else {
-        recent.main_toolbar_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_FILTER_TOOLBAR_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.filter_toolbar_show = TRUE;
-    }
-    else {
-        recent.filter_toolbar_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_AIRPCAP_TOOLBAR_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.airpcap_toolbar_show = TRUE;
-    }
-    else {
-        recent.airpcap_toolbar_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_DRIVER_CHECK_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.airpcap_driver_check_show = TRUE;
-    }
-    else {
-        recent.airpcap_driver_check_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_PACKET_LIST_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.packet_list_show = TRUE;
-    }
-    else {
-        recent.packet_list_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_TREE_VIEW_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.tree_view_show = TRUE;
-    }
-    else {
-        recent.tree_view_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_BYTE_VIEW_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.byte_view_show = TRUE;
-    }
-    else {
-        recent.byte_view_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_STATUSBAR_SHOW) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.statusbar_show = TRUE;
-    }
-    else {
-        recent.statusbar_show = FALSE;
-    }
-  } else if (strcmp(key, RECENT_KEY_PACKET_LIST_COLORIZE) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.packet_list_colorize = TRUE;
-    }
-    else {
-        recent.packet_list_colorize = FALSE;
-    }
-  } else if (strcmp(key, RECENT_GUI_TIME_FORMAT) == 0) {
-    recent.gui_time_format =
-	find_index_from_string_array(value, ts_type_text, TS_RELATIVE);
-  } else if (strcmp(key, RECENT_GUI_TIME_PRECISION) == 0) {
-    recent.gui_time_precision =
-	find_index_from_string_array(value, ts_precision_text, TS_PREC_AUTO);
-  } else if (strcmp(key, RECENT_GUI_SECONDS_FORMAT) == 0) {
-    recent.gui_seconds_format =
-	find_index_from_string_array(value, ts_seconds_text, TS_SECONDS_DEFAULT);
-  } else if (strcmp(key, RECENT_GUI_ZOOM_LEVEL) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    recent.gui_zoom_level = num;
-  } else if (strcmp(key, RECENT_GUI_BYTES_VIEW) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    recent.gui_bytes_view = num;
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_MAXIMIZED) == 0) {
-    if (g_ascii_strcasecmp(value, "true") == 0) {
-        recent.gui_geometry_main_maximized = TRUE;
-    }
-    else {
-        recent.gui_geometry_main_maximized = FALSE;
-    }
-
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_UPPER_PANE) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    if (num <= 0)
-      return PREFS_SET_SYNTAX_ERR;	/* number must be positive */
-    recent.gui_geometry_main_upper_pane = num;
-    recent.has_gui_geometry_main_upper_pane = TRUE;
-  } else if (strcmp(key, RECENT_GUI_GEOMETRY_MAIN_LOWER_PANE) == 0) {
-    num = strtol(value, &p, 0);
-    if (p == value || *p != '\0')
-      return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-    if (num <= 0)
-      return PREFS_SET_SYNTAX_ERR;	/* number must be positive */
-    recent.gui_geometry_main_lower_pane = num;
-    recent.has_gui_geometry_main_lower_pane = TRUE;
-  }
-  else if (strcmp(key, RECENT_KEY_COL_WIDTH) == 0) {
-    col_l = prefs_get_string_list(value);
-    if (col_l == NULL)
-      return PREFS_SET_SYNTAX_ERR;
-    if ((g_list_length(col_l) % 2) != 0) {
-      /* A title didn't have a matching width.  */
-      prefs_clear_string_list(col_l);
-      return PREFS_SET_SYNTAX_ERR;
-    }
-    /* Check to make sure all column formats are valid.  */
-    col_l_elt = g_list_first(col_l);
-    while(col_l_elt) {
-      /* Make sure the format isn't empty.  */
-      if (strcmp(col_l_elt->data, "") == 0) {
-      	/* It is.  */
-        prefs_clear_string_list(col_l);
-        return PREFS_SET_SYNTAX_ERR;
-      }
-
-      /* Check the format.  */
-      if (strncmp(col_l_elt->data, cust_format, cust_format_len) != 0) {
-        if (get_column_format_from_str(col_l_elt->data) == -1) {
-          /* It's not a valid column format.  */
-          prefs_clear_string_list(col_l);
-          return PREFS_SET_SYNTAX_ERR;
-        }
-      }
-
-      /* Go past the format.  */
-      col_l_elt = col_l_elt->next;
-
-      /* Go past the width.  */
-      col_l_elt = col_l_elt->next;
-    }
-    free_col_width_info(&recent);
-    recent.col_width_list = NULL;
-    col_l_elt = g_list_first(col_l);
-    while(col_l_elt) {
-      gchar *fmt = g_strdup(col_l_elt->data);
-      cfmt = (col_width_data *) g_malloc(sizeof(col_width_data));
-      if (strncmp(fmt, cust_format, cust_format_len) != 0) {
-	cfmt->cfmt   = get_column_format_from_str(fmt);
-	cfmt->cfield = NULL;
-      } else {
-	cfmt->cfmt   = COL_CUSTOM;
-	cfmt->cfield = g_strdup(&fmt[cust_format_len+1]);  /* add 1 for ':' */
-      }
-      g_free (fmt);
-      if (cfmt->cfmt == -1) {
-        g_free(cfmt->cfield);
-	g_free(cfmt);
-	return PREFS_SET_SYNTAX_ERR;   /* string was bad */
-      }
-
-      col_l_elt      = col_l_elt->next;
-      cfmt->width    = strtol(col_l_elt->data, &p, 0);
-      if (p == col_l_elt->data || (*p != '\0' && *p != ':')) {
-	g_free(cfmt->cfield);
-	g_free(cfmt);
-	return PREFS_SET_SYNTAX_ERR;	/* number was bad */
-      }
-
-      if (*p == ':') {
-        cfmt->xalign = *(++p);
-      } else {
-        cfmt->xalign = COLUMN_XALIGN_DEFAULT;
-      }
-
-      col_l_elt      = col_l_elt->next;
-      recent.col_width_list = g_list_append(recent.col_width_list, cfmt);
-    }
-    prefs_clear_string_list(col_l);
-  } else if (strcmp(key, RECENT_GUI_FILEOPEN_REMEMBERED_DIR) == 0) {
-    if (recent.gui_fileopen_remembered_dir) {
-      g_free (recent.gui_fileopen_remembered_dir);
-    }
-    recent.gui_fileopen_remembered_dir = g_strdup(value);
-  }
-
-  return PREFS_SET_OK;
-}
-
-
-/* set one user's recent file key/value pair */
-static prefs_set_pref_e
-read_set_recent_pair_dynamic(gchar *key, gchar *value, void *private_data _U_,
-			     gboolean return_range_errors _U_)
-{
-  if (strcmp(key, RECENT_KEY_CAPTURE_FILE) == 0) {
-    if(u3_active())
-      add_menu_recent_capture_file(u3_expand_device_path(value));
-    else
-      add_menu_recent_capture_file(value);
-  } else if (strcmp(key, RECENT_KEY_DISPLAY_FILTER) == 0) {
-	dfilter_combo_add_recent(value);
-  } else if (strcmp(key, RECENT_KEY_CAPTURE_FILTER) == 0) {
-	cfilter_combo_add_recent(value);
-#ifdef HAVE_PCAP_REMOTE
-  } else if (strcmp(key, RECENT_KEY_REMOTE_HOST) == 0) {
-	capture_remote_combo_add_recent(value);
-#endif
-  }
-
-  return PREFS_SET_OK;
-}
-
-
-/*
- * Given a string of the form "<recent name>:<recent value>", as might appear
- * as an argument to a "-o" option, parse it and set the recent value in
- * question.  Return an indication of whether it succeeded or failed
- * in some fashion.
- */
-int
-recent_set_arg(char *prefarg)
-{
-	gchar *p, *colonp;
-	int ret;
-
-	colonp = strchr(prefarg, ':');
-	if (colonp == NULL)
-		return PREFS_SET_SYNTAX_ERR;
-
-	p = colonp;
-	*p++ = '\0';
-
-	/*
-	 * Skip over any white space (there probably won't be any, but
-	 * as we allow it in the preferences file, we might as well
-	 * allow it here).
-	 */
-	while (isspace((guchar)*p))
-		p++;
-	if (*p == '\0') {
-		/*
-		 * Put the colon back, so if our caller uses, in an
-		 * error message, the string they passed us, the message
-		 * looks correct.
-		 */
-		*colonp = ':';
-		return PREFS_SET_SYNTAX_ERR;
-	}
-
-	ret = read_set_recent_pair_static(prefarg, p, NULL, TRUE);
-	*colonp = ':';	/* put the colon back */
-	return ret;
-}
-
-
-/* opens the user's recent common file and read the first part */
-void
-recent_read_static(char **rf_path_return, int *rf_errno_return)
-{
-  char       *rf_path;
-  FILE       *rf;
-
-  /* set defaults */
-  recent.gui_geometry_main_x        =        20;
-  recent.gui_geometry_main_y        =        20;
-  recent.gui_geometry_main_width    = DEF_WIDTH;
-  recent.gui_geometry_main_height   = DEF_HEIGHT;
-  recent.gui_geometry_main_maximized=     FALSE;
-
-  recent.gui_geometry_status_pane_left  = (DEF_WIDTH/3);
-  recent.gui_geometry_status_pane_right = (DEF_WIDTH/3);
-  recent.gui_geometry_wlan_stats_pane = 200;
-
-  recent.privs_warn_if_elevated = TRUE;
-  recent.privs_warn_if_no_npf = TRUE;
-
-  recent.col_width_list = NULL;
-  recent.gui_fileopen_remembered_dir = NULL;
-
-  /* Construct the pathname of the user's recent common file. */
-  rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, FALSE);
-
-  /* Read the user's recent common file, if it exists. */
-  *rf_path_return = NULL;
-  if ((rf = ws_fopen(rf_path, "r")) != NULL) {
-    /* We succeeded in opening it; read it. */
-    read_prefs_file(rf_path, rf, read_set_recent_common_pair_static, NULL);
-
-    fclose(rf);
-    g_free(rf_path);
-    rf_path = NULL;
-  } else {
-    /* We failed to open it.  If we failed for some reason other than
-       "it doesn't exist", return the errno and the pathname, so our
-       caller can report the error. */
-    if (errno != ENOENT) {
-      *rf_errno_return = errno;
-      *rf_path_return = rf_path;
-    }
-  }
-}
-
-
-
-/* opens the user's recent file and read the first part */
-void
-recent_read_profile_static(char **rf_path_return, int *rf_errno_return)
-{
-  char       *rf_path, *rf_common_path;
-  FILE       *rf;
-
-  /* set defaults */
-  recent.main_toolbar_show      = TRUE;
-  recent.filter_toolbar_show    = TRUE;
-  recent.airpcap_toolbar_show   = FALSE;
-  recent.airpcap_driver_check_show   = TRUE;
-  recent.packet_list_show       = TRUE;
-  recent.tree_view_show         = TRUE;
-  recent.byte_view_show         = TRUE;
-  recent.statusbar_show         = TRUE;
-  recent.packet_list_colorize   = TRUE;
-  recent.gui_time_format        = TS_RELATIVE;
-  recent.gui_time_precision     = TS_PREC_AUTO;
-  recent.gui_seconds_format     = TS_SECONDS_DEFAULT;
-  recent.gui_zoom_level         = 0;
-  recent.gui_bytes_view         = 0;
-
-  /* pane size of zero will autodetect */
-  recent.gui_geometry_main_upper_pane   = 0;
-  recent.gui_geometry_main_lower_pane   = 0;
-
-  recent.has_gui_geometry_main_upper_pane = TRUE;
-  recent.has_gui_geometry_main_lower_pane = TRUE;
-  recent.has_gui_geometry_status_pane = TRUE;
-
-  if (recent.col_width_list) {
-    free_col_width_info(&recent);
-  }
-
-  if (recent.gui_fileopen_remembered_dir) {
-    g_free (recent.gui_fileopen_remembered_dir);
-    recent.gui_fileopen_remembered_dir = NULL;
-  }
-
-  /* Construct the pathname of the user's profile recent file. */
-  rf_path = get_persconffile_path(RECENT_FILE_NAME, TRUE, FALSE);
-
-  /* Read the user's recent file, if it exists. */
-  *rf_path_return = NULL;
-  if ((rf = ws_fopen(rf_path, "r")) != NULL) {
-    /* We succeeded in opening it; read it. */
-    read_prefs_file(rf_path, rf, read_set_recent_pair_static, NULL);
-    fclose(rf);
-
-    /* XXX: The following code doesn't actually do anything since
-     *  the "recent common file" always exists. Presumably the
-     *  "if (!file_exists())" should actually be "if (file_exists())".
-     *  However, I've left the code as is because this
-     *  behaviour has existed for quite some time and I don't
-     *  know what's supposed to happen at this point.
-     *  ToDo: Determine if the "recent common file" should be read at this point
-     */
-    rf_common_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, FALSE);
-    if (!file_exists(rf_common_path)) {
-      /* Read older common settings from recent file */
-      rf = ws_fopen(rf_path, "r");
-      read_prefs_file(rf_path, rf, read_set_recent_common_pair_static, NULL);
-      fclose(rf);
-    }
-    g_free(rf_common_path);
-    g_free(rf_path);
-    rf_path = NULL;
-  } else {
-    /* We failed to open it.  If we failed for some reason other than
-       "it doesn't exist", return the errno and the pathname, so our
-       caller can report the error. */
-    if (errno != ENOENT) {
-      *rf_errno_return = errno;
-      *rf_path_return = rf_path;
-    }
-  }
-}
-
-/* opens the user's recent file and read it out */
-void
-recent_read_dynamic(char **rf_path_return, int *rf_errno_return)
-{
-  char       *rf_path;
-  FILE       *rf;
-
-
-  /* Construct the pathname of the user's recent common file. */
-  rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, FALSE);
-  if (!file_exists (rf_path)) {
-    /* Recent common file does not exist, read from default recent */
-    g_free (rf_path);
-    rf_path = get_persconffile_path(RECENT_FILE_NAME, FALSE, FALSE);
-  }
-
-  /* Read the user's recent file, if it exists. */
-  *rf_path_return = NULL;
-  if ((rf = ws_fopen(rf_path, "r")) != NULL) {
-    /* We succeeded in opening it; read it. */
-    read_prefs_file(rf_path, rf, read_set_recent_pair_dynamic, NULL);
-#if 0
-    /* set dfilter combobox to have an empty line */
-    dfilter_combo_add_empty();
-#endif
-    fclose(rf);
-    g_free(rf_path);
-    rf_path = NULL;
-  } else {
-    /* We failed to open it.  If we failed for some reason other than
-       "it doesn't exist", return the errno and the pathname, so our
-       caller can report the error. */
-    if (errno != ENOENT) {
-      *rf_errno_return = errno;
-      *rf_path_return = rf_path;
-    }
-  }
-}
-
-gint
-recent_get_column_width(gint col)
-{
-  GList *col_l;
-  col_width_data *col_w;
-  gint cfmt;
-  const gchar *cfield = NULL;
-
-  cfmt = get_column_format(col);
-  if (cfmt == COL_CUSTOM) {
-    cfield = get_column_custom_field(col);
-  }
-
-  col_l = g_list_first(recent.col_width_list);
-  while (col_l) {
-    col_w = (col_width_data *) col_l->data;
-    if (col_w->cfmt == cfmt) {
-      if (cfmt != COL_CUSTOM || strcmp (cfield, col_w->cfield) == 0) {
-	return col_w->width;
-      }
-    }
-    col_l = col_l->next;
-  }
-
-  return -1;
-}
-
-void
-recent_set_column_width(gint col, gint width)
-{
-  GList *col_l;
-  col_width_data *col_w;
-  gint cfmt;
-  const gchar *cfield = NULL;
-  gboolean found = FALSE;
-
-  cfmt = get_column_format(col);
-  if (cfmt == COL_CUSTOM) {
-    cfield = get_column_custom_field(col);
-  }
-
-  col_l = g_list_first(recent.col_width_list);
-  while (col_l) {
-    col_w = (col_width_data *) col_l->data;
-    if (col_w->cfmt == cfmt) {
-      if (cfmt != COL_CUSTOM || strcmp (cfield, col_w->cfield) == 0) {
-	col_w->width = width;
-	found = TRUE;
-	break;
-      }
-    }
-    col_l = col_l->next;
-  }
-
-  if (!found) {
-    col_w = (col_width_data *) g_malloc(sizeof(col_width_data));
-    col_w->cfmt = cfmt;
-    if (cfield) {
-      col_w->cfield = g_strdup(cfield);
-    } else {
-      col_w->cfield = NULL;
-    }
-    col_w->width = width;
-    col_w->xalign = COLUMN_XALIGN_DEFAULT;
-    recent.col_width_list = g_list_append(recent.col_width_list, col_w);
-  }
-}
-
-gchar
-recent_get_column_xalign(gint col)
-{
-  GList *col_l;
-  col_width_data *col_w;
-  gint cfmt;
-  const gchar *cfield = NULL;
-
-  cfmt = get_column_format(col);
-  if (cfmt == COL_CUSTOM) {
-    cfield = get_column_custom_field(col);
-  }
-
-  col_l = g_list_first(recent.col_width_list);
-  while (col_l) {
-    col_w = (col_width_data *) col_l->data;
-    if (col_w->cfmt == cfmt) {
-      if (cfmt != COL_CUSTOM || strcmp (cfield, col_w->cfield) == 0) {
-        return col_w->xalign;
-      }
-    }
-    col_l = col_l->next;
-  }
-
-  return 0;
-}
-
-void
-recent_set_column_xalign(gint col, gchar xalign)
-{
-  GList *col_l;
-  col_width_data *col_w;
-  gint cfmt;
-  const gchar *cfield = NULL;
-  gboolean found = FALSE;
-
-  cfmt = get_column_format(col);
-  if (cfmt == COL_CUSTOM) {
-    cfield = get_column_custom_field(col);
-  }
-
-  col_l = g_list_first(recent.col_width_list);
-  while (col_l) {
-    col_w = (col_width_data *) col_l->data;
-    if (col_w->cfmt == cfmt) {
-      if (cfmt != COL_CUSTOM || strcmp (cfield, col_w->cfield) == 0) {
-        col_w->xalign = xalign;
-        found = TRUE;
-        break;
-      }
-    }
-    col_l = col_l->next;
-  }
-
-  if (!found) {
-    col_w = (col_width_data *) g_malloc(sizeof(col_width_data));
-    col_w->cfmt = cfmt;
-    if (cfield) {
-      col_w->cfield = g_strdup(cfield);
-    } else {
-      col_w->cfield = NULL;
-    }
-    col_w->width = 40;
-    col_w->xalign = xalign;
-    recent.col_width_list = g_list_append(recent.col_width_list, col_w);
-  }
-}
diff --git a/ui/gtk/recent.h b/ui/gtk/recent.h
deleted file mode 100644
index d582573bbf..0000000000
--- a/ui/gtk/recent.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* recent.h
- * Definitions for recent "preference" handling routines
- * Copyright 2004, Ulf Lamping <ulf.lamping@web.de>
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef __RECENT_H__
-#define __RECENT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <glib.h>
-
-/** @file
- *  Recent user interface settings.
- *  @ingroup main_window_group
- */
-
-/** ???. */
-#define RECENT_KEY_CAPTURE_FILE         "recent.capture_file"
-
-/** ???. */
-#define RECENT_KEY_DISPLAY_FILTER       "recent.display_filter"
-
-typedef struct _col_width_data {
-  gint   cfmt;
-  gchar *cfield;
-  gint   width;
-  gchar  xalign;
-} col_width_data;
-
-/** Defines used in col_width_data.xalign */
-#define COLUMN_XALIGN_DEFAULT  0
-#define COLUMN_XALIGN_LEFT    'L'
-#define COLUMN_XALIGN_CENTER  'C'
-#define COLUMN_XALIGN_RIGHT   'R'
-
-/** Recent settings. */
-typedef struct recent_settings_tag {
-    gboolean    main_toolbar_show;
-    gboolean    filter_toolbar_show;
-    gboolean	airpcap_toolbar_show;
-    gboolean    airpcap_driver_check_show;
-    gboolean    packet_list_show;
-    gboolean    tree_view_show;
-    gboolean    byte_view_show;
-    gboolean    statusbar_show;
-    gboolean    packet_list_colorize;
-    gint        gui_time_format;
-    gint        gui_time_precision;
-    gint        gui_seconds_format;
-    gint        gui_zoom_level;
-    gint        gui_bytes_view;
-
-    gint        gui_geometry_main_x;
-    gint        gui_geometry_main_y;
-    gint        gui_geometry_main_width;
-    gint        gui_geometry_main_height;
-
-    gboolean    gui_geometry_main_maximized;
-
-    gboolean    has_gui_geometry_main_upper_pane;   /* gui_geometry_main_upper_pane is valid */
-    gint        gui_geometry_main_upper_pane;
-    gboolean    has_gui_geometry_main_lower_pane;   /* gui_geometry_main_lower_pane is valid */
-    gint        gui_geometry_main_lower_pane;
-    gboolean    has_gui_geometry_status_pane;       /* gui_geometry_status_pane is valid */
-    gint        gui_geometry_status_pane_left;
-    gint        gui_geometry_status_pane_right;
-    gint        gui_geometry_wlan_stats_pane;
-    gboolean    privs_warn_if_elevated;
-    gboolean    privs_warn_if_no_npf;
-    GList      *col_width_list;                     /* column widths */
-    gchar      *gui_fileopen_remembered_dir;        /* folder of last capture loaded in File Open dialog */
-} recent_settings_t;
-
-/** Global recent settings. */
-extern recent_settings_t recent;
-
-/** Write recent settings file.
- *
- * @return TRUE if succeeded, FALSE if failed
- */
-extern gboolean write_recent(void);
-
-/** Write profile recent settings file.
- *
- * @return TRUE if succeeded, FALSE if failed
- */
-extern gboolean write_profile_recent(void);
-
-/** Read recent settings file (static part).
- *
- * @param rf_path_return path to recent file if function failed
- * @param rf_errno_return if failed
- */
-extern void recent_read_static(char **rf_path_return, int *rf_errno_return);
-
-/** Read profile recent settings file (static part).
- *
- * @param rf_path_return path to recent file if function failed
- * @param rf_errno_return if failed
- */
-extern void recent_read_profile_static(char **rf_path_return, int *rf_errno_return);
-
-/** Read recent settings file (dynamic part).
- *
- * @param rf_path_return path to recent file if function failed
- * @param rf_errno_return if failed
- */
-extern void recent_read_dynamic(char **rf_path_return, int *rf_errno_return);
-
-/** Write the geometry values of a single window to the recent file.
- *
- * @param key unused
- * @param value the geometry values
- * @param rf recent file handle (FILE)
- */
-extern void write_recent_geom(gpointer key, gpointer value, gpointer rf);
-
-/**
- * Given a -o command line string, parse it and set the recent value in
- * question.  Return an indication of whether it succeeded or failed
- * in some fashion.
- *
- * @param prefarg a string of the form "<recent name>:<recent value>", as might appear
- * as an argument to a "-o" command line option
- * @return PREFS_SET_OK or PREFS_SET_SYNTAX_ERR
- */
-extern int recent_set_arg(char *prefarg);
-
-/** Get the column width for the given column
- *
- * @param col column number
- */
-extern gint recent_get_column_width(gint col);
-
-/** Set the column width for the given column
- *
- * @param col column number
- * @param width column width
- */
-extern void recent_set_column_width(gint col, gint width);
-
-/** Get the column xalign for the given column
- *
- * @param col column number
- */
-extern gchar recent_get_column_xalign(gint col);
-
-/** Set the column xalign for the given column
- *
- * @param col column number
- * @param xalign column alignment
- */
-extern void recent_set_column_xalign(gint col, gchar xalign);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* recent.h */
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index f64c069ec2..3b584bb1c9 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -64,11 +64,14 @@
 
 #include "../util.h"
 #include "../g711.h"
-#include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
-#include "ui/progress_dlg.h"
 #include "../tempfile.h"
+
+#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/progress_dlg.h"
+#include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index 23217b89a3..e3cbc3bcb6 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -41,6 +41,8 @@
 
 #include "../globals.h"
 #include "../stat_menu.h"
+
+#include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/rtp_stream_dlg.h"
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index eb7aa7f3ec..763951fb30 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -40,7 +40,9 @@
 #include <epan/dissectors/packet-ieee80211.h>
 #include <epan/strutil.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
+
 #include "../stat_menu.h"
 
 #include "ui/gtk/gtkglobals.h"
@@ -48,7 +50,6 @@
 #include "ui/gtk/filter_utils.h"
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/utf8_entities.h"