callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass NULL @custom_icon_name to evolution_storage_new_folder().

Browse Source 
* 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
This commit is contained in:
Ettore Perazzoli
2002-07-09 20:27:17 +00:00
parent dbb4e600de
commit 6d2b6fa6d2
14 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/ChangeLog
View File

@ -1,3 +1,10 @@
2002-07-09 Ettore Perazzoli <ettore@ximian.com>
* 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. ;-)]
2002-07-02 Ettore Perazzoli <ettore@ximian.com>
* gui/component/addressbook-component.c (add_creatable_item): New

4
addressbook/gui/component/addressbook-storage.c
View File

@ -460,7 +460,7 @@ load_source_data (const char *file_path)
path = g_strdup_printf ("/%s", source->name);
evolution_storage_new_folder (storage, path, source->name,
"ldap-contacts", source->uri,
source->description, 0, FALSE);
source->description, NULL, 0, FALSE);
sources = g_list_append (sources, source);
@ -579,7 +579,7 @@ addressbook_storage_add_source (AddressbookSource *source)
addressbook_get_other_contact_storage();
path = g_strdup_printf ("/%s", source->name);
evolution_storage_new_folder (storage, path, source->name, "ldap-contacts",
source->uri, source->description, 0, FALSE);
source->uri, source->description, NULL, 0, FALSE);
g_free (path);
}

8
mail/ChangeLog
View File

@ -1,3 +1,11 @@
2002-07-09 Ettore Perazzoli <ettore@ximian.com>
* 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().
2002-07-08 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (redirect): Don't ever use the mail-display's

3
mail/mail-folder-cache.c
View File

@ -191,7 +191,8 @@ real_flush_updates(void *o, void *event_data, void *data)
d(printf("Adding new folder: %s\n", up->path));
evolution_storage_new_folder(storage,
up->path, up->name, type, up->uri, up->name, up->unread,
up->path, up->name, type, up->uri, up->name, NULL,
up->unread,
TRUE);
}

2
mail/subscribe-dialog.c
View File

@ -185,7 +185,7 @@ recursive_add_folder (EvolutionStorage *storage, const char *path, const char *n
g_free (parent);
}
evolution_storage_new_folder (storage, path, name, "mail", url, name, FALSE, TRUE);
evolution_storage_new_folder (storage, path, name, "mail", url, name, NULL, FALSE, TRUE);
}
/* ** Get one level of folderinfo ****************************************** */

24
shell/ChangeLog
View File

@ -1,3 +1,27 @@
2002-07-09 Ettore Perazzoli <ettore@ximian.com>
* 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.
2002-07-09 Ettore Perazzoli <ettore@ximian.com>
* e-shortcuts-view-model.c (get_icon_for_item): If the

1
shell/Evolution-common.idl
View File

@ -16,6 +16,7 @@ module Evolution {
string displayName;
string physicalUri;
string evolutionUri;
string customIconName;
long unreadCount;
boolean canSyncOffline;
};

21
shell/e-corba-storage-registry.c
View File

@ -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;
}

1
shell/e-folder.c
View File

@ -460,6 +460,7 @@ e_folder_to_corba (EFolder *folder,
folder_return->displayName = safe_corba_string_dup (e_folder_get_name (folder));
folder_return->physicalUri = safe_corba_string_dup (e_folder_get_physical_uri (folder));
folder_return->evolutionUri = safe_corba_string_dup (evolution_uri);
folder_return->customIconName = safe_corba_string_dup (e_folder_get_custom_icon_name (folder));
folder_return->unreadCount = e_folder_get_unread_count (folder);
folder_return->canSyncOffline = e_folder_get_can_sync_offline (folder);
}

1
shell/e-local-storage.c
View File

@ -145,6 +145,7 @@ new_folder (ELocalStorage *local_storage,
e_folder_get_type_string (folder),
e_folder_get_physical_uri (folder),
e_folder_get_description (folder),
e_folder_get_custom_icon_name (folder),
e_folder_get_unread_count (folder),
FALSE);
}

16
shell/evolution-shell-client.c
View File

@ -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;
}

6
shell/evolution-storage.c
View File

@ -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);

1
shell/evolution-storage.h
View File

@ -138,6 +138,7 @@ EvolutionStorageResult evolution_storage_new_folder (EvolutionStorage
const char *type,
const char *physical_uri,
const char *description,
const char *custom_icon_name,
int unread_count,
gboolean can_sync_offline);
EvolutionStorageResult evolution_storage_update_folder (EvolutionStorage *evolution_storage,

4
shell/evolution-test-component.c
View File

@ -327,9 +327,9 @@ setup_custom_storage (EvolutionShellClient *shell_client)
}
evolution_storage_new_folder (the_storage, "/FirstFolder", "FirstFolder",
"mail", "file:///tmp/blah", "", 0, TRUE);
"mail", "file:///tmp/blah", "", NULL, 0, TRUE);
evolution_storage_new_folder (the_storage, "/SecondFolder", "SecondFolder",
"calendar", "file:///tmp/bleh", "", 0, FALSE);
"calendar", "file:///tmp/bleh", "", NULL, 0, FALSE);
}