aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-04-22 02:52:23 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-04-22 05:07:15 +0800
commit7950d6a0c6efd6c4d48afd99c138f38952bdd1bb (patch)
tree3a8fd7957dd29441120d2db18ccb1cc23f5935f2 /shell
parent397b15ff4aa5afd1d5c7e0a093a33616624401cf (diff)
downloadgsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.gz
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.bz2
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.lz
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.xz
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.zst
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.zip
Adapt to libedataserver[ui] changes.
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-migrate.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 468d8733b0..69929a14b1 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -837,8 +837,8 @@ merge_duplicate_local_sources (GConfClient *client,
continue;
/* pretty unlikely, but just in case */
- val1 = e_source_peek_uid (dupe_source);
- val2 = e_source_peek_uid (my_source);
+ val1 = e_source_get_uid (dupe_source);
+ val2 = e_source_get_uid (my_source);
if (g_strcmp0 (val1, val2) == 0)
break;
@@ -876,7 +876,7 @@ merge_duplicate_local_sources (GConfClient *client,
relative_uri = e_source_peek_relative_uri (source);
if (!relative_uri || !*relative_uri)
- e_source_set_relative_uri (source, e_source_peek_uid (source));
+ e_source_set_relative_uri (source, e_source_get_uid (source));
}
}