aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-browser.c33
2 files changed, 23 insertions, 17 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 308e2688e5..98c1945e99 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-20 Tobias Mueller <tobiasmue@svn.gnome.org>
+
+ ** Fix for bug #467382
+
+ * em-folder-browser.c: Changing position of emfb_enable_map to
+ be able to compile with -pedantic
+
2007-08-20 Milan Crha <mcrha@redhat.com>
** Fix for bug #367760
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 3778a5f5f4..df97444b3e 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -148,7 +148,22 @@ static void emfb_search_search_cleared(ESearchBar *esb);
static int emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderBrowser *emfb);
static void emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *emfb);
-static const EMFolderViewEnable emfb_enable_map[];
+static const EMFolderViewEnable emfb_enable_map[] = {
+ { "EditInvertSelection", EM_POPUP_SELECT_FOLDER },
+ { "EditSelectAll", EM_POPUP_SELECT_FOLDER },
+ { "EditSelectThread", EM_FOLDER_VIEW_SELECT_THREADED },
+ { "FolderExpunge", EM_POPUP_SELECT_FOLDER },
+ { "FolderCopy", EM_POPUP_SELECT_FOLDER },
+ { "FolderMove", EM_POPUP_SELECT_FOLDER },
+ { "FolderDelete", EM_POPUP_SELECT_FOLDER },
+ { "FolderRename", EM_POPUP_SELECT_FOLDER },
+ { "MailPost", EM_POPUP_SELECT_FOLDER },
+ { "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER },
+ { "ViewHideSelected", EM_POPUP_SELECT_MANY },
+ { "ViewThreadsCollapseAll", EM_FOLDER_VIEW_SELECT_THREADED},
+ { "ViewThreadsExpandAll", EM_FOLDER_VIEW_SELECT_THREADED},
+ { NULL },
+};
enum {
ACCOUNT_SEARCH_ACTIVATED,
@@ -1606,22 +1621,6 @@ static EPixmap emfb_pixmaps[] = {
E_PIXMAP_END
};
-static const EMFolderViewEnable emfb_enable_map[] = {
- { "EditInvertSelection", EM_POPUP_SELECT_FOLDER },
- { "EditSelectAll", EM_POPUP_SELECT_FOLDER },
- { "EditSelectThread", EM_FOLDER_VIEW_SELECT_THREADED },
- { "FolderExpunge", EM_POPUP_SELECT_FOLDER },
- { "FolderCopy", EM_POPUP_SELECT_FOLDER },
- { "FolderMove", EM_POPUP_SELECT_FOLDER },
- { "FolderDelete", EM_POPUP_SELECT_FOLDER },
- { "FolderRename", EM_POPUP_SELECT_FOLDER },
- { "MailPost", EM_POPUP_SELECT_FOLDER },
- { "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER },
- { "ViewHideSelected", EM_POPUP_SELECT_MANY },
- { "ViewThreadsCollapseAll", EM_FOLDER_VIEW_SELECT_THREADED},
- { "ViewThreadsExpandAll", EM_FOLDER_VIEW_SELECT_THREADED},
- { NULL },
-};
static void
emfb_hide_deleted(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)