Merge revisions 37200:3266 from trunk.

svn path=/branches/kill-bonobo/; revision=37270

1 files changed, 17 insertions, 0 deletions

diff --git a/mail/em-event.h b/mail/em-event.h
index 3afc0146bb..eb45050a27 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -27,6 +27,7 @@
 #include <glib-object.h>
 
 #include "e-util/e-event.h"
+#include "mail/em-folder-browser.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,12 +45,18 @@ typedef struct _EMEventClass EMEventClass;
 /* Current target description */
 enum _em_event_target_t {
 	EM_EVENT_TARGET_FOLDER,
+	EM_EVENT_TARGET_FOLDER_BROWSER,
 	EM_EVENT_TARGET_MESSAGE,
 	EM_EVENT_TARGET_COMPOSER,
 	EM_EVENT_TARGET_SEND_RECEIVE,
 	EM_EVENT_TARGET_CUSTOM_ICON,
 };
 
+/* Flags for FOLDER BROWSER Events*/
+enum {
+	EM_EVENT_FOLDER_BROWSER = 1<< 0,
+};
+
 /* Flags that describe TARGET_FOLDER */
 enum {
 	EM_EVENT_FOLDER_NEWMAIL = 1<< 0,
@@ -102,6 +109,15 @@ struct _EMEventTargetComposer {
 	struct _EMsgComposer *composer;
 };
 
+typedef struct _EMEventTargetFolderBrowser EMEventTargetFolderBrowser;
+
+struct _EMEventTargetFolderBrowser {
+	EEventTarget target;
+
+	struct _EMFolderBrowser *emfb;
+};
+
+
 typedef struct _EMEventTargetSendReceive EMEventTargetSendReceive;
 
 struct _EMEventTargetSendReceive {
@@ -139,6 +155,7 @@ GType em_event_get_type(void);
 EMEvent *em_event_peek(void);
 
 EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, guint32 flags);
+EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb);
 EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags);
 EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *uid, guint32 flags);
 EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, int row, guint32 flags);