diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-07-10 04:27:17 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-07-10 04:27:17 +0800 |
commit | 6d2b6fa6d25e72aef704f3fefb0d3fa907f2086d (patch) | |
tree | ebf375b1a6a93278f0a70b74b3545061d6f34074 /shell/evolution-shell-client.c | |
parent | dbb4e600dede6660bd4f130a7f21b781146319b7 (diff) | |
download | gsoc2013-evolution-6d2b6fa6d25e72aef704f3fefb0d3fa907f2086d.tar.gz gsoc2013-evolution-6d2b6fa6d25e72aef704f3fefb0d3fa907f2086d.tar.zst gsoc2013-evolution-6d2b6fa6d25e72aef704f3fefb0d3fa907f2086d.zip |
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
Diffstat (limited to 'shell/evolution-shell-client.c')
-rw-r--r-- | shell/evolution-shell-client.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c index 00b5c4548f..3100991384 100644 --- a/shell/evolution-shell-client.c +++ b/shell/evolution-shell-client.c @@ -104,14 +104,16 @@ impl_FolderSelectionListener_selected (PortableServer_Servant servant, listener_servant = (FolderSelectionListenerServant *) servant; if (listener_servant->folder_return != NULL) { - GNOME_Evolution_Folder *ret_folder = - GNOME_Evolution_Folder__alloc (); + GNOME_Evolution_Folder *ret_folder = GNOME_Evolution_Folder__alloc (); + ret_folder->type = CORBA_string_dup (folder->type); - ret_folder->description = CORBA_string_dup (folder->description); - ret_folder->displayName = CORBA_string_dup (folder->displayName); - ret_folder->physicalUri = CORBA_string_dup (folder->physicalUri); - ret_folder->evolutionUri = CORBA_string_dup (folder->evolutionUri); - ret_folder->unreadCount = folder->unreadCount; + ret_folder->description = CORBA_string_dup (folder->description); + ret_folder->displayName = CORBA_string_dup (folder->displayName); + ret_folder->physicalUri = CORBA_string_dup (folder->physicalUri); + ret_folder->customIconName = CORBA_string_dup (folder->customIconName); + ret_folder->evolutionUri = CORBA_string_dup (folder->evolutionUri); + ret_folder->unreadCount = folder->unreadCount; + * (listener_servant->folder_return) = ret_folder; } |