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

remove the "addressbook.db.summary" correctly. #48538

Browse Source 
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
This commit is contained in:
Gilbert Fang
2003-09-19 10:26:30 +00:00
committed by Gilbert Fang
parent 2ab6a4ce0b
commit 46608598c6
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/ChangeLog
View File

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

9
addressbook/gui/component/addressbook-component.c
View File

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