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, 10 insertions, 11 deletions

diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c
index ed9f1b837c..3a09e3793b 100644
--- a/shell/e-corba-storage-registry.c
+++ b/shell/e-corba-storage-registry.c
@@ -29,6 +29,8 @@
 #include "e-corba-storage-registry.h"
 #include "e-shell-constants.h"
 
+#include "e-util/e-corba-utils.h"
+
 #include <bonobo/bonobo-exception.h>
 #include <gal/util/e-util.h>
 
@@ -393,18 +395,15 @@ impl_StorageRegistry_getFolderByUri (PortableServer_Servant servant,
 	}
 
 	corba_folder = GNOME_Evolution_Folder__alloc ();
+
 	corba_folder->displayName = CORBA_string_dup (e_folder_get_name (folder));
-	if (e_folder_get_description (folder))
-		corba_folder->description = CORBA_string_dup (e_folder_get_description (folder));
-	else
-		corba_folder->description = CORBA_string_dup ("");
-	corba_folder->type = CORBA_string_dup (e_folder_get_type_string (folder));
-	if (e_folder_get_physical_uri (folder))
-		corba_folder->physicalUri = CORBA_string_dup (e_folder_get_physical_uri (folder));
-	else
-		corba_folder->physicalUri = CORBA_string_dup ("");
-	corba_folder->evolutionUri = corba_evolution_uri;
-	corba_folder->unreadCount = e_folder_get_unread_count (folder);
+
+	corba_folder->description    = CORBA_string_dup (e_safe_corba_string (e_folder_get_description (folder)));
+	corba_folder->type           = CORBA_string_dup (e_folder_get_type_string (folder));
+	corba_folder->physicalUri    = CORBA_string_dup (e_safe_corba_string (e_folder_get_physical_uri (folder)));
+	corba_folder->customIconName = CORBA_string_dup (e_safe_corba_string (e_folder_get_custom_icon_name (folder)));
+	corba_folder->evolutionUri   = corba_evolution_uri;
+	corba_folder->unreadCount    = e_folder_get_unread_count (folder);
 
 	return corba_folder;
 }