diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-09-26 23:33:11 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-09-26 23:33:11 +0000 |
commit | 998da54456f675fb7fad7d7ecd52fab4a12d16d8 (patch) | |
tree | d499748e4d57194bcdd2cf42e6f9c435648b2c8f /ui/gtk | |
parent | bf108e8d2355f74d6de00bc5f430867c01a75a47 (diff) |
Add a cf_cb_file_opened callback and use it instead of calling
fileset_file_opened directly from file.c. This makes the code a bit more
consistenent and makes it easier to port the File Set dialog to Qt.
svn path=/trunk/; revision=45162
Diffstat (limited to 'ui/gtk')
-rw-r--r-- | ui/gtk/fileset_dlg.c | 6 | ||||
-rw-r--r-- | ui/gtk/fileset_dlg.h | 6 | ||||
-rw-r--r-- | ui/gtk/main.c | 5 | ||||
-rw-r--r-- | ui/gtk/main_statusbar.c | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index 97b7ce9550..cbe95c88b0 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -32,6 +32,7 @@ #include <gtk/gtk.h> +#include "file.h" #include <epan/filesystem.h> #include "ui/simple_dialog.h" @@ -364,8 +365,8 @@ fileset_previous_cb(GtkWidget *w _U_, gpointer d _U_) /* a new capture file was opened, browse the dir and look for files matching the given file set */ void -fileset_file_opened(const char *fname) { - fileset_add_dir(fname); +fileset_file_opened(const capture_file *cf) { + fileset_add_dir(cf->filename); if(fs_w) { window_present(fs_w); } @@ -396,4 +397,3 @@ fileset_file_closed(void) fileset_get_previous() != NULL, fileset_get_next() != NULL ); } - diff --git a/ui/gtk/fileset_dlg.h b/ui/gtk/fileset_dlg.h index 0da6a66ec9..3d86361eaf 100644 --- a/ui/gtk/fileset_dlg.h +++ b/ui/gtk/fileset_dlg.h @@ -30,6 +30,12 @@ * @ingroup dialog_group */ +/** Enable file set menu items + * + * @param cf Capture file struct + */ +extern void fileset_file_opened(const capture_file *cf); + /** Open the fileset dialog. * * @param w calling widget (unused) diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 5576e98ef6..80fa029e9f 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -140,6 +140,7 @@ #include "ui/gtk/gui_utils.h" #include "ui/gtk/color_dlg.h" #include "ui/gtk/filter_dlg.h" +#include "ui/gtk/fileset_dlg.h" #include "ui/gtk/uat_gui.h" #include "ui/gtk/main.h" #include "ui/gtk/main_80211_toolbar.h" @@ -1810,6 +1811,10 @@ static void main_cf_callback(gint event, gpointer data, gpointer user_data _U_) { switch(event) { + case(cf_cb_file_opened): + g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Opened"); + fileset_file_opened(data); + break; case(cf_cb_file_closing): g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Closing"); main_cf_cb_file_closing(data); diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index f9141e67e4..f579c0c35e 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -988,6 +988,8 @@ void statusbar_cf_callback(gint event, gpointer data, gpointer user_data _U_) { switch(event) { + case(cf_cb_file_opened): + break; case(cf_cb_file_closing): statusbar_cf_file_closing_cb(data); break; |