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, 5 deletions

diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index 0dd61461df..0fe5bdc3f4 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -102,13 +102,15 @@ impl_StorageListener_notifyFolderCreated (PortableServer_Servant servant,
 	storage_listener_servant = (StorageListenerServant *) servant;
 	storage = storage_listener_servant->storage;
 
-	e_folder = e_folder_new (folder->displayName,
-				 folder->type,
-				 folder->description);
+	e_folder = e_folder_new (folder->displayName, folder->type, folder->description);
 
-	e_folder_set_physical_uri (e_folder, folder->physicalUri);
-	e_folder_set_unread_count (e_folder, folder->unreadCount);
+	e_folder_set_physical_uri     (e_folder, folder->physicalUri);
+	e_folder_set_unread_count     (e_folder, folder->unreadCount);
 	e_folder_set_can_sync_offline (e_folder, folder->canSyncOffline);
+	e_folder_set_sorting_priority (e_folder, folder->sortingPriority);
+
+	if (folder->customIconName[0] != '\0')
+		e_folder_set_custom_icon (e_folder, folder->customIconName);
 
 	if (! e_storage_new_folder (storage, path, e_folder)) {
 		g_warning ("Cannot register folder -- %s %s\n", path, folder->displayName);