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, 8 insertions, 6 deletions

diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index bb1d37cd9e..88ca1e72da 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -967,7 +967,8 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 			      const char *description,
 			      const char *custom_icon_name,
 			      int         unread_count,
-			      gboolean    can_sync_offline)
+			      gboolean    can_sync_offline,
+			      int         sorting_priority)
 {
 	EvolutionStorageResult   result;
 	EvolutionStoragePrivate *priv;
@@ -994,11 +995,12 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 	CORBA_exception_init (&ev);
 
 	corba_folder = GNOME_Evolution_Folder__alloc ();
-	corba_folder->displayName    = CORBA_string_dup (display_name);
-	corba_folder->description    = CORBA_string_dup (description);
-	corba_folder->type           = CORBA_string_dup (type);
-	corba_folder->physicalUri    = CORBA_string_dup (physical_uri);
-	corba_folder->canSyncOffline = (CORBA_boolean) can_sync_offline;
+	corba_folder->displayName     = CORBA_string_dup (display_name);
+	corba_folder->description     = CORBA_string_dup (description);
+	corba_folder->type            = CORBA_string_dup (type);
+	corba_folder->physicalUri     = CORBA_string_dup (physical_uri);
+	corba_folder->canSyncOffline  = (CORBA_boolean) can_sync_offline;
+	corba_folder->sortingPriority = sorting_priority;
 
 	if (custom_icon_name != NULL)
 		corba_folder->customIconName = CORBA_string_dup (custom_icon_name);