aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2004-02-13 03:23:50 +0800
committerChris Toshok <toshok@src.gnome.org>2004-02-13 03:23:50 +0800
commit02eced6b4c02a498a9a69d3c09d09d1f187a6e30 (patch)
treea405ee7a59a6d187781cfd17966452b70c7bfbf0
parentc271976eeb32f988a81fe23e85d653b49e658cd5 (diff)
downloadgsoc2013-evolution-02eced6b4c02a498a9a69d3c09d09d1f187a6e30.tar.gz
gsoc2013-evolution-02eced6b4c02a498a9a69d3c09d09d1f187a6e30.tar.zst
gsoc2013-evolution-02eced6b4c02a498a9a69d3c09d09d1f187a6e30.zip
rename from CONTACT_BASE_URI, and change to contacts:// to match e-d-s.
2004-02-12 Chris Toshok <toshok@ximian.com> * gui/migration.c (CONTACTS_BASE_URI): rename from CONTACT_BASE_URI, and change to contacts:// to match e-d-s. (create_calendar_contact_source): CONTACT -> CONTACTS. (create_calendar_sources): same. svn path=/trunk/; revision=24726
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/migration.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1e82d7c2ee..3714f581fe 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-12 Chris Toshok <toshok@ximian.com>
+
+ * gui/migration.c (CONTACTS_BASE_URI): rename from
+ CONTACT_BASE_URI, and change to contacts:// to match e-d-s.
+ (create_calendar_contact_source): CONTACT -> CONTACTS.
+ (create_calendar_sources): same.
+
2004-02-13 Bruce Tao <bruce.tao@sun.com>
See #51567
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 5977b726d6..b735460d2e 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -349,7 +349,7 @@ migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name
#define WEBCAL_BASE_URI "webcal://"
-#define CONTACT_BASE_URI "contact://"
+#define CONTACTS_BASE_URI "contacts://"
#define PERSONAL_RELATIVE_URI "system"
static ESourceGroup *
@@ -359,7 +359,7 @@ create_calendar_contact_source (ESourceList *source_list)
ESource *source;
/* Create the contacts group */
- group = e_source_group_new (_("Contacts"), CONTACT_BASE_URI);
+ group = e_source_group_new (_("Contacts"), CONTACTS_BASE_URI);
e_source_list_add_group (source_list, group, -1);
source = e_source_new (_("Birthdays & Anniversaries"), "/");
@@ -403,7 +403,7 @@ create_calendar_sources (CalendarComponent *component,
*on_this_computer = g_object_ref (group);
else if (!*on_the_web && !strcmp (WEBCAL_BASE_URI, e_source_group_peek_base_uri (group)))
*on_the_web = g_object_ref (group);
- else if (!*contacts && !strcmp (CONTACT_BASE_URI, e_source_group_peek_base_uri (group)))
+ else if (!*contacts && !strcmp (CONTACTS_BASE_URI, e_source_group_peek_base_uri (group)))
*contacts = g_object_ref (group);
}
}