aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-04-05 04:03:29 +0800
committerDan Winship <danw@src.gnome.org>2002-04-05 04:03:29 +0800
commitf7e72c281487b2c6251732736ef5b5eccfb4a260 (patch)
tree53174dbcb4816a9ced0d165802d0b7b206b718da /addressbook
parentf99f9d948846af22726a5d8d68617366ab267310 (diff)
downloadgsoc2013-evolution-f7e72c281487b2c6251732736ef5b5eccfb4a260.tar
gsoc2013-evolution-f7e72c281487b2c6251732736ef5b5eccfb4a260.tar.gz
gsoc2013-evolution-f7e72c281487b2c6251732736ef5b5eccfb4a260.tar.bz2
gsoc2013-evolution-f7e72c281487b2c6251732736ef5b5eccfb4a260.tar.lz
gsoc2013-evolution-f7e72c281487b2c6251732736ef5b5eccfb4a260.tar.xz
gsoc2013-evolution-f7e72c281487b2c6251732736ef5b5eccfb4a260.tar.zst
gsoc2013-evolution-f7e72c281487b2c6251732736ef5b5eccfb4a260.zip
Update for evolution_shell_client_user_select_folder API change.
* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards): Update for evolution_shell_client_user_select_folder API change. svn path=/trunk/; revision=16355
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/widgets/e-addressbook-util.c29
2 files changed, 18 insertions, 16 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4084e00a69..2612556a03 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-04 Dan Winship <danw@ximian.com>
+
+ * gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):
+ Update for evolution_shell_client_user_select_folder API change.
+
2002-04-04 Ettore Perazzoli <ettore@ximian.com>
* gui/component/addressbook.c: Remove AddressbookConfig,
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
index ea01e4ec5b..13d219af33 100644
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ b/addressbook/gui/widgets/e-addressbook-util.c
@@ -327,15 +327,16 @@ e_addressbook_transfer_cards (EBook *source, GList *cards /* adopted */, gboolea
{
const char *allowed_types[] = { "contacts", NULL };
extern EvolutionShellClient *global_shell_client;
- char *uri, *physical, *path, *desc;
- static char *last = NULL;
+ GNOME_Evolution_Folder *folder;
+ static char *last_uri = NULL;
CardCopyProcess *process;
+ char *desc;
if (cards == NULL)
return;
- if (last == NULL)
- last = g_strdup ("");
+ if (last_uri == NULL)
+ last_uri = g_strdup ("");
if (cards->next == NULL) {
if (delete_from_source)
@@ -349,21 +350,17 @@ e_addressbook_transfer_cards (EBook *source, GList *cards /* adopted */, gboolea
desc = _("Copy cards to");
}
- uri = NULL;
- physical = NULL;
evolution_shell_client_user_select_folder (global_shell_client,
parent_window,
- desc, last,
- allowed_types, &uri, &physical);
- if (!uri)
+ desc, last_uri, allowed_types,
+ &folder);
+ if (!folder)
return;
- path = strchr (uri, '/');
- if (path && strcmp (last, path) != 0) {
- g_free (last);
- last = g_strdup_printf ("evolution:%s", path);
+ if (strcmp (last_uri, folder->evolutionUri) != 0) {
+ g_free (last_uri);
+ last_uri = g_strdup (folder->evolutionUri);
}
- g_free (uri);
process = g_new (CardCopyProcess, 1);
process->count = 1;
@@ -377,7 +374,7 @@ e_addressbook_transfer_cards (EBook *source, GList *cards /* adopted */, gboolea
else
process->done_cb = NULL;
- e_book_use_address_book_by_uri (physical, got_book_cb, process);
+ e_book_use_address_book_by_uri (folder->physicalUri, got_book_cb, process);
- g_free(physical);
+ CORBA_free (folder);
}