aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-11-02 02:44:23 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2010-11-10 06:33:21 +0800
commit26afa6081c3d9826dbae78236dd712fad8b7c340 (patch)
tree531e8587a88bc408b91341a98e20fbd934cbb344 /calendar
parentf5460f323b2581af28764b96635b2d3a0f1548c9 (diff)
downloadgsoc2013-evolution-26afa6081c3d9826dbae78236dd712fad8b7c340.tar
gsoc2013-evolution-26afa6081c3d9826dbae78236dd712fad8b7c340.tar.gz
gsoc2013-evolution-26afa6081c3d9826dbae78236dd712fad8b7c340.tar.bz2
gsoc2013-evolution-26afa6081c3d9826dbae78236dd712fad8b7c340.tar.lz
gsoc2013-evolution-26afa6081c3d9826dbae78236dd712fad8b7c340.tar.xz
gsoc2013-evolution-26afa6081c3d9826dbae78236dd712fad8b7c340.tar.zst
gsoc2013-evolution-26afa6081c3d9826dbae78236dd712fad8b7c340.zip
Utilize the new ESourceSelector:primary-selection property.
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/apps_evolution_calendar.schemas.in15
-rw-r--r--calendar/importers/icalendar-importer.c4
2 files changed, 14 insertions, 5 deletions
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index 70590ee0ca..c37bbbd1fb 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -10,7 +10,10 @@
<type>string</type>
<locale name="C">
<short>Primary calendar</short>
- <long>URI of the highlighted ("primary") calendar</long>
+ <long>
+ The UID of the selected (or "primary") calendar in the
+ sidebar of the "Calendar" view.
+ </long>
</locale>
</schema>
@@ -512,7 +515,10 @@
<type>string</type>
<locale name="C">
<short>Primary memo list</short>
- <long>URI of the highlighted ("primary") memo list</long>
+ <long>
+ The UID of the selected (or "primary") memo list in the
+ sidebar of the "Memos" view.
+ </long>
</locale>
</schema>
@@ -525,7 +531,10 @@
<type>string</type>
<locale name="C">
<short>Primary task list</short>
- <long>URI of the highlighted ("primary") task list</long>
+ <long>
+ The UID of the selected (or "primary") task list in the
+ sidebar of the "Tasks" view.
+ </long>
</locale>
</schema>
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 45de793778..8e20e19bcf 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -206,7 +206,7 @@ static void
button_toggled_cb (GtkWidget *widget, struct _selector_data *sd)
{
g_datalist_set_data_full(&sd->target->data, "primary-source",
- g_object_ref (e_source_selector_peek_primary_selection ((ESourceSelector *)sd->selector)),
+ g_object_ref (e_source_selector_get_primary_selection ((ESourceSelector *)sd->selector)),
g_object_unref);
g_datalist_set_data(&sd->target->data, "primary-type", GINT_TO_POINTER(import_type_map[sd->page]));
gtk_notebook_set_current_page ((GtkNotebook *)sd->notebook, sd->page);
@@ -216,7 +216,7 @@ static void
primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target)
{
g_datalist_set_data_full(&target->data, "primary-source",
- g_object_ref (e_source_selector_peek_primary_selection (selector)),
+ g_object_ref (e_source_selector_get_primary_selection (selector)),
g_object_unref);
}