diff options
| author | Gilbert Fang <gilbert.fang@sun.com> | 2003-09-19 18:26:30 +0800 |
|---|---|---|
| committer | Gilbert Fang <gilbertfang@src.gnome.org> | 2003-09-19 18:26:30 +0800 |
| commit | 46608598c6d5e4e51cd709bff2db934557b3628e (patch) | |
| tree | 23dcacb40a71460bc03e3642429a6defaf0afd3d /addressbook | |
| parent | 2ab6a4ce0bd3c96dc7138d0afbcd8781eb566cbc (diff) | |
| download | gsoc2013-evolution-46608598c6d5e4e51cd709bff2db934557b3628e.tar.gz gsoc2013-evolution-46608598c6d5e4e51cd709bff2db934557b3628e.tar.zst gsoc2013-evolution-46608598c6d5e4e51cd709bff2db934557b3628e.zip | |
remove the "addressbook.db.summary" correctly. #48538
2003-09-19 Gilbert Fang <gilbert.fang@sun.com>
* addressbook/gui/component/addressbook-component.c (xfer_folder):
remove the "addressbook.db.summary" correctly. #48538
svn path=/trunk/; revision=22624
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ba573a71eb..ed3992ba42 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2003-09-19 Gilbert Fang <gilbert.fang@sun.com> + + * addressbook/gui/component/addressbook-component.c (xfer_folder): + remove the "addressbook.db.summary" correctly. #48538 + 2003-09-11 Dan Winship <danw@ximian.com> * backend/ebook/Makefile.am (privlib_LTLIBRARIES): Remove diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index b49dec3005..cdfeeb9755 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -299,6 +299,7 @@ xfer_folder (EvolutionShellComponent *shell_component, GnomeVFSURI *src_uri; GnomeVFSURI *dest_uri; GnomeVFSResult result; + GNOME_Evolution_ShellComponentListener_Result e_result; CORBA_exception_init (&ev); @@ -342,17 +343,19 @@ xfer_folder (EvolutionShellComponent *shell_component, return; } - result = xfer_file (src_uri, dest_uri, "addressbook.db", remove_source); + e_result = xfer_file (src_uri, dest_uri, "addressbook.db", remove_source); - if ((result == GNOME_Evolution_ShellComponentListener_OK) && remove_source) { + if ((e_result == GNOME_Evolution_ShellComponentListener_OK) && remove_source) { char *summary_uri; summary_uri = g_strconcat (source_physical_uri, "/addressbook.db.summary", NULL); result = gnome_vfs_unlink (summary_uri); + if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_NOT_FOUND) + e_result = GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED; g_free (summary_uri); } - GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &ev); + GNOME_Evolution_ShellComponentListener_notifyResult (listener, e_result, &ev); gnome_vfs_uri_unref (src_uri); gnome_vfs_uri_unref (dest_uri); |