Pass NULL @custom_icon_name to evolution_storage_new_folder().

* gui/component/addressbook-storage.c (load_source_data): Pass
NULL @custom_icon_name to evolution_storage_new_folder().
(addressbook_storage_add_source): Likewise.  [Note we could be
passing a nice custom here. ;-)]

* subscribe-dialog.c (recursive_add_folder): Pass NULL for
@custom_icon_name to evolution_storage_new_folder().

* mail-folder-cache.c (real_flush_updates): Pass NULL for
@custom_icon_name to evolution_storage_new_folder().

* evolution-test-component.c (setup_custom_storage): Pass NULL for
@custom_icon_name to evolution_storage_new_folder().

* e-local-storage.c (new_folder): Pass the custom_icon_name here
to evolution_storage_new_folder().

* evolution-shell-client.c
(impl_FolderSelectionListener_selected): Set customIconName here
too.

* e-folder.c (e_folder_to_corba): Set customIconName too.

* e-corba-storage-registry.c
(impl_StorageRegistry_getFolderByUri): Set customIconName.  Also,
use e_safe_corba_string() to clean up the code a bit.

* evolution-storage.c (evolution_storage_new_folder): New arg
@custom_icon_name.

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

svn path=/trunk/; revision=17397

1 files changed, 6 insertions, 0 deletions

diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index ebc514f774..bb1d37cd9e 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -965,6 +965,7 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 			      const char *type,
 			      const char *physical_uri,
 			      const char *description,
+			      const char *custom_icon_name,
 			      int         unread_count,
 			      gboolean    can_sync_offline)
 {
@@ -999,6 +1000,11 @@ evolution_storage_new_folder (EvolutionStorage *evolution_storage,
 	corba_folder->physicalUri    = CORBA_string_dup (physical_uri);
 	corba_folder->canSyncOffline = (CORBA_boolean) can_sync_offline;
 
+	if (custom_icon_name != NULL)
+		corba_folder->customIconName = CORBA_string_dup (custom_icon_name);
+	else
+		corba_folder->customIconName = CORBA_string_dup ("");
+
 	evolutionUri = make_full_uri (evolution_storage, path);
 	corba_folder->evolutionUri = CORBA_string_dup (evolutionUri);
 	g_free (evolutionUri);