Added callbacks for Next/Previous Unread and Next/Previous Flagged

2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>

	* folder-browser-factory.c: Added callbacks for Next/Previous
	Unread and Next/Previous Flagged message.

	* mail-callbacks.c (previous_flagged_msg): Implemented.
	(next_flagged_msg): Implemented.

svn path=/trunk/; revision=10014

4 files changed, 55 insertions, 15 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5a7891e70f..a17cab7072 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* folder-browser-factory.c: Added callbacks for Next/Previous
+	Unread and Next/Previous Flagged message.
+
+	* mail-callbacks.c (previous_flagged_msg): Implemented.
+	(next_flagged_msg): Implemented.
+
 2001-05-26  Dan Winship  <danw@ximian.com>
 
 	* mail-ops.c (mail_send_message, transfer_messages_transfer,
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 558308a6f7..bdcc85e58e 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -57,7 +57,11 @@ BonoboUIVerb verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("MailCompose", compose_msg),
 	BONOBO_UI_UNSAFE_VERB ("MailGetSend", send_receive_mail),
 	BONOBO_UI_UNSAFE_VERB ("MailNext", next_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailNextUnread", next_unread_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailNextFlagged", next_flagged_msg),
 	BONOBO_UI_UNSAFE_VERB ("MailPrevious", previous_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailPreviousUnread", previous_unread_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailPreviousFlagged", previous_flagged_msg),
 	BONOBO_UI_UNSAFE_VERB ("MailStop", stop_threads),
 	BONOBO_UI_UNSAFE_VERB ("MessageApplyFilters", apply_filters),
 	BONOBO_UI_UNSAFE_VERB ("MessageCopy", copy_msg),
@@ -91,10 +95,10 @@ BonoboUIVerb verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("ToolsVFolders", vfolder_edit_vfolders),
 	BONOBO_UI_UNSAFE_VERB ("ToolsVFolderSender", vfolder_sender),
 	BONOBO_UI_UNSAFE_VERB ("ToolsVFolderSubject", vfolder_subject),
-	BONOBO_UI_UNSAFE_VERB ("ViewHideRead", hide_read),
-	BONOBO_UI_UNSAFE_VERB ("ViewHideSelected", hide_selected),
-	BONOBO_UI_UNSAFE_VERB ("ViewLoadImages", load_images),
+	BONOBO_UI_UNSAFE_VERB ("HideRead", hide_read),
+	BONOBO_UI_UNSAFE_VERB ("HideSelected", hide_selected),
 	BONOBO_UI_UNSAFE_VERB ("ViewShowAll", hide_none),
+	BONOBO_UI_UNSAFE_VERB ("ViewLoadImages", load_images),
 	
 	BONOBO_UI_VERB_END
 };
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 80f0affe9c..5f437624e1 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1218,15 +1218,17 @@ delete_msg (GtkWidget *button, gpointer user_data)
 	deleted = flag_messages (fb, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
 				 CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
 	if (deleted == 1) {
-		row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
-		message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_DELETED);
+		row = e_tree_row_of_node (fb->message_list->tree,
+					  e_tree_get_cursor (fb->message_list->tree));
+		message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT,
+				     0, CAMEL_MESSAGE_DELETED);
 	}
 }
 
 void
 undelete_msg (GtkWidget *button, gpointer user_data)
 {
-	flag_messages(FOLDER_BROWSER(user_data), CAMEL_MESSAGE_DELETED, 0);
+	flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_DELETED, 0);
 }
 
 void
@@ -1235,30 +1237,42 @@ next_msg (GtkWidget *button, gpointer user_data)
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
 	int row;
 	
-	row = e_tree_row_of_node(fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
+	row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
 	message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, 0, 0);
 }
 
 void
-previous_msg (GtkWidget *button, gpointer user_data)
+next_unread_msg (GtkWidget *button, gpointer user_data)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
 	int row;
 	
-	row = e_tree_row_of_node(fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
-	message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0);
+	row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
+	message_list_select (fb->message_list, row,
+			     MESSAGE_LIST_SELECT_NEXT,
+			     0, CAMEL_MESSAGE_SEEN);
 }
 
 void
-next_unread_msg (GtkWidget *button, gpointer user_data)
+next_flagged_msg (GtkWidget *button, gpointer user_data)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
 	int row;
 	
-	row = e_tree_row_of_node(fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
+	row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
 	message_list_select (fb->message_list, row,
 			     MESSAGE_LIST_SELECT_NEXT,
-			     0, CAMEL_MESSAGE_SEEN);
+			     CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED);
+}
+
+void
+previous_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	int row;
+	
+	row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
+	message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0);
 }
 
 void
@@ -1267,12 +1281,24 @@ previous_unread_msg (GtkWidget *button, gpointer user_data)
 	FolderBrowser *fb = FOLDER_BROWSER (user_data);
 	int row;
 	
-	row = e_tree_row_of_node(fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
+	row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
 	message_list_select (fb->message_list, row,
 			     MESSAGE_LIST_SELECT_PREVIOUS,
 			     0, CAMEL_MESSAGE_SEEN);
 }
 
+void
+previous_flagged_msg (GtkWidget *button, gpointer user_data)
+{
+	FolderBrowser *fb = FOLDER_BROWSER (user_data);
+	int row;
+	
+	row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
+	message_list_select (fb->message_list, row,
+			     MESSAGE_LIST_SELECT_PREVIOUS,
+			     CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED);
+}
+
 static void
 expunged_folder (CamelFolder *f, void *data)
 {
diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h
index ad3f193737..b3184403e4 100644
--- a/mail/mail-callbacks.h
+++ b/mail/mail-callbacks.h
@@ -62,9 +62,11 @@ void save_msg              (GtkWidget *widget, gpointer user_data);
 void view_msg              (GtkWidget *widget, gpointer user_data);
 void view_source           (GtkWidget *widget, gpointer user_data);
 void next_msg              (GtkWidget *widget, gpointer user_data);
-void previous_msg          (GtkWidget *widget, gpointer user_data);
 void next_unread_msg       (GtkWidget *widget, gpointer user_data);
+void next_flagged_msg      (GtkWidget *widget, gpointer user_data);
+void previous_msg          (GtkWidget *widget, gpointer user_data);
 void previous_unread_msg   (GtkWidget *widget, gpointer user_data);
+void previous_flagged_msg  (GtkWidget *widget, gpointer user_data);
 void resend_msg            (GtkWidget *widget, gpointer user_data);
 void search_msg            (GtkWidget *widget, gpointer user_data);
 void load_images           (GtkWidget *widget, gpointer user_data);