diff options
author | Milan Crha <mcrha@redhat.com> | 2009-04-25 01:40:31 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2009-04-25 01:40:31 +0800 |
commit | 2403bbcdd196745314786af3b6318de56ef3948e (patch) | |
tree | a40b172dec814a8f7c214979c7735a46d2c73c08 /calendar/gui/memos-component.c | |
parent | 23df769955ea54f756a579c19964df87ae6fd5c8 (diff) | |
download | gsoc2013-evolution-2403bbcdd196745314786af3b6318de56ef3948e.tar gsoc2013-evolution-2403bbcdd196745314786af3b6318de56ef3948e.tar.gz gsoc2013-evolution-2403bbcdd196745314786af3b6318de56ef3948e.tar.bz2 gsoc2013-evolution-2403bbcdd196745314786af3b6318de56ef3948e.tar.lz gsoc2013-evolution-2403bbcdd196745314786af3b6318de56ef3948e.tar.xz gsoc2013-evolution-2403bbcdd196745314786af3b6318de56ef3948e.tar.zst gsoc2013-evolution-2403bbcdd196745314786af3b6318de56ef3948e.zip |
Use new ESourceList API (simplifies code)
** Part of fix for bug #569652
Diffstat (limited to 'calendar/gui/memos-component.c')
-rw-r--r-- | calendar/gui/memos-component.c | 58 |
1 files changed, 15 insertions, 43 deletions
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 3fbebd7e3e..0e422d548d 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -123,17 +123,12 @@ struct _MemosComponentPrivate { static void ensure_sources (MemosComponent *component) { - GSList *groups; ESourceList *source_list; - ESourceGroup *group; ESourceGroup *on_this_computer; - ESourceGroup *on_the_web; ESource *personal_source; - char *base_uri, *base_uri_proto; + char *base_uri, *base_uri_proto, base_uri_proto_seventh; const gchar *base_dir; - on_this_computer = NULL; - on_the_web = NULL; personal_source = NULL; if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL)) { @@ -145,24 +140,20 @@ ensure_sources (MemosComponent *component) base_uri = g_build_filename (base_dir, "local", NULL); base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL); + if (strlen (base_uri_proto) > 7) { + /* compare only file:// part. If user home dir name changes we do not want to create + one more group */ + base_uri_proto_seventh = base_uri_proto[7]; + base_uri_proto[7] = 0; + } else { + base_uri_proto_seventh = -1; + } - groups = e_source_list_peek_groups (source_list); - if (groups) { - /* groups are already there, we need to search for things... */ - GSList *g; - - for (g = groups; g; g = g->next) { - - group = E_SOURCE_GROUP (g->data); - - /* compare only file:// part. If user home dir name changes we do not want to create - one more group */ + on_this_computer = e_source_list_ensure_group (source_list, _("On This Computer"), base_uri_proto, TRUE); + e_source_list_ensure_group (source_list, _("On The Web"), WEB_BASE_URI, FALSE); - if (!on_this_computer && !strncmp (base_uri_proto, e_source_group_peek_base_uri (group), 7)) - on_this_computer = group; - else if (!on_the_web && !strcmp (WEB_BASE_URI, e_source_group_peek_base_uri (group))) - on_the_web = group; - } + if (base_uri_proto_seventh != -1) { + base_uri_proto[7] = base_uri_proto_seventh; } if (on_this_computer) { @@ -192,16 +183,6 @@ ensure_sources (MemosComponent *component) and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/ e_source_list_sync (source_list,NULL); } - - /* ensure the group name is in current locale, not read from configuration */ - e_source_group_set_name (on_this_computer, _("On This Computer")); - } - else { - /* create the local source group */ - group = e_source_group_new (_("On This Computer"), base_uri_proto); - e_source_list_add_group (source_list, group, -1); - - on_this_computer = group; } if (personal_source) { @@ -235,18 +216,9 @@ ensure_sources (MemosComponent *component) personal_source = source; } - if (on_the_web) { - /* ensure the group name is in current locale, not read from configuration */ - e_source_group_set_name (on_the_web, _("On The Web")); - } else { - /* Create the source group */ - group = e_source_group_new (_("On The Web"), WEB_BASE_URI); - e_source_list_add_group (source_list, group, -1); - - on_the_web = group; - } - component->priv->source_list = source_list; + + g_object_unref (on_this_computer); g_free (base_uri_proto); g_free (base_uri); } |