aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-09-26 23:40:56 +0000
committerGerald Combs <gerald@wireshark.org>2012-09-26 23:40:56 +0000
commit3994ddc3574b68e2bb75807b13833508cbf3c943 (patch)
tree4666e56a28857047ca16e99bb26fb0919a706faf
parent998da54456f675fb7fad7d7ecd52fab4a12d16d8 (diff)
Call fileset_file_closed from cf_cb_file_closed.
svn path=/trunk/; revision=45163
-rw-r--r--file.c2
-rw-r--r--fileset.h2
-rw-r--r--ui/gtk/fileset_dlg.h9
-rw-r--r--ui/gtk/main.c1
4 files changed, 9 insertions, 5 deletions
diff --git a/file.c b/file.c
index c162d1f9c3..cf7e4a7da1 100644
--- a/file.c
+++ b/file.c
@@ -442,8 +442,6 @@ cf_reset_state(capture_file *cf)
/* We have no file open. */
cf->state = FILE_CLOSED;
-
- fileset_file_closed();
}
/* Reset everything to a pristine state */
diff --git a/fileset.h b/fileset.h
index be4862664f..2be0a688cb 100644
--- a/fileset.h
+++ b/fileset.h
@@ -61,8 +61,6 @@ extern fileset_entry *fileset_get_previous(void);
/* this file is a part of the current file set */
extern void fileset_dlg_add_file(fileset_entry *entry);
-extern void fileset_file_closed(void);
-
extern void fileset_update_dlg(void);
extern void fileset_update_file(const char *path);
diff --git a/ui/gtk/fileset_dlg.h b/ui/gtk/fileset_dlg.h
index 3d86361eaf..8c982153ed 100644
--- a/ui/gtk/fileset_dlg.h
+++ b/ui/gtk/fileset_dlg.h
@@ -30,12 +30,19 @@
* @ingroup dialog_group
*/
-/** Enable file set menu items
+/** Enable file set menu items and look for similar files
*
* @param cf Capture file struct
*/
extern void fileset_file_opened(const capture_file *cf);
+/** Disable file set menu items
+ *
+ * @param cf Capture file struct
+ */
+extern void fileset_file_closed(void);
+
+
/** Open the fileset dialog.
*
* @param w calling widget (unused)
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 80fa029e9f..2548779bc3 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -1822,6 +1822,7 @@ main_cf_callback(gint event, gpointer data, gpointer user_data _U_)
case(cf_cb_file_closed):
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Closed");
main_cf_cb_file_closed(data);
+ fileset_file_closed();
break;
case(cf_cb_file_read_started):
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Read started");