Pass zero as the @sorting_priority to evolution_storage_new_folder().

* gui/component/addressbook-storage.c (load_source_data): Pass
zero as the @sorting_priority to evolution_storage_new_folder().
(addressbook_storage_add_source): Likewise.

* subscribe-dialog.c (recursive_add_folder): Pass zero as
@sorting_priority to evolution_storage_new_folder().

* mail-folder-cache.c (real_flush_updates): Pass zero as
@sorting_priority to evolution_storage_new_folder().

* evolution-test-component.c (setup_custom_storage): Pass
@sorting_priority to evolution_storage_new_folder() so we test it.
Also make /FirstFolder have an "inbox" custom icon.

* e-local-storage.c (new_folder): Pass zero as @sorting_priority
to evolution_storage_new_folder().

* evolution-storage.c (evolution_storage_new_folder): New arg
@sorting_priority; put it in the CORBA folder struct.

* evolution-shell-client.c
(impl_FolderSelectionListener_selected): Copy the sortingPriority
as well.

* e-folder.c (e_folder_to_corba): Set sortingPriority.

* e-corba-storage-registry.c
(impl_StorageRegistry_getFolderByUri): Set sortingPriority in the
new CORBA Folder struct.

* e-corba-storage.c (impl_StorageListener_notifyFolderCreated):
Set the custom_icon if folder->customIconName is not an empty
string.  Likewise, set the sorting_priority

* Evolution-common.idl: New member sortingPriority in struct
Folder.

* e-storage-set-view.c (folder_sort_callback): Sort according to
the sorting_priorities.

* e-folder.c: New member sorting_priority in EFolderPrivate.
(init): Init to zero.
(e_folder_set_custom_icon): Emit "changed" if required.
(e_folder_set_sorting_priority): New.

svn path=/trunk/; revision=17404

1 files changed, 7 insertions, 2 deletions

diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c
index daeea054b3..9464b44b92 100644
--- a/shell/evolution-test-component.c
+++ b/shell/evolution-test-component.c
@@ -326,10 +326,15 @@ setup_custom_storage (EvolutionShellClient *shell_client)
 		return;
 	}
 
+	/* Test the sorting_priority arg here: if it was just sorting in
+	   alphabetical order, FirstFolder would come before SecondFolder, but
+	   we are specifying -1 sorting priority for SecondFolder and zero for
+	   FirstFolder so the order is reversed.  */
+
 	evolution_storage_new_folder (the_storage, "/FirstFolder", "FirstFolder",
-				      "mail", "file:///tmp/blah", "", NULL, 0, TRUE);
+				      "mail", "file:///tmp/blah", "", "inbox", 0, TRUE, 0);
 	evolution_storage_new_folder (the_storage, "/SecondFolder", "SecondFolder",
-				      "calendar", "file:///tmp/bleh", "", NULL, 0, FALSE);
+				      "calendar", "file:///tmp/bleh", "", NULL, 0, FALSE, -1);
 }