r2759 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
chris at sita.openmoko.org
chris at sita.openmoko.org
Tue Aug 21 18:52:02 CEST 2007
Author: chris
Date: 2007-08-21 18:52:00 +0200 (Tue, 21 Aug 2007)
New Revision: 2759
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-events-store.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-tasks-store.c
Log:
- Load calendars asynchronously
- Load dates instead of openmoko-contacts when clicking on events
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2007-08-21 15:14:32 UTC (rev 2758)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2007-08-21 16:52:00 UTC (rev 2759)
@@ -1,3 +1,15 @@
+2007-08-21 Chris Lord,,, <chris at openedhand.com>
+
+ * src/today-events-store.c: (today_events_store_cal_opened_cb),
+ (today_events_store_start):
+ * src/today-tasks-store.c: (today_tasks_store_cal_opened_cb),
+ (today_tasks_store_start):
+ Load calendars asynchronously
+
+ * src/today-pim-summary.c:
+ (today_pim_summary_events_selection_changed_cb):
+ Load dates instead of openmoko-contacts when clicking on events
+
2007-08-20 Chris Lord,,, <chris at openedhand.com>
* src/today-launcher.c: (today_launcher_search_toggle_cb):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-events-store.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-events-store.c 2007-08-21 15:14:32 UTC (rev 2758)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-events-store.c 2007-08-21 16:52:00 UTC (rev 2759)
@@ -205,6 +205,46 @@
}
}
+static void
+today_events_store_cal_opened_cb (ECal *ecal, gint arg1, gpointer user_data)
+{
+ TodayEventsStore *store = TODAY_EVENTS_STORE (user_data);
+ TodayEventsStorePrivate *priv = EVENTS_STORE_PRIVATE (store);
+ GError *error = NULL;
+ gchar *isodate;
+ gchar *query;
+ time_t t;
+
+ time (&t);
+ isodate = isodate_from_time_t (t);
+ query = g_strdup_printf (
+ "(occur-in-time-range? (time-day-begin (make-time \"%s\")) "
+ "(time-add-day (time-day-begin (make-time \"%s\")) 7))",
+ isodate, isodate);
+ if (e_cal_get_query (priv->events_ecal,
+ query, &priv->events_view, &error)) {
+ g_signal_connect (G_OBJECT (priv->events_view),
+ "objects-added",
+ G_CALLBACK (today_events_store_objects_added),
+ store);
+ g_signal_connect (G_OBJECT (priv->events_view),
+ "objects-modified",
+ G_CALLBACK (today_events_store_objects_modified),
+ store);
+ g_signal_connect (G_OBJECT (priv->events_view),
+ "objects-removed",
+ G_CALLBACK (today_events_store_objects_removed),
+ store);
+ e_cal_view_start (priv->events_view);
+ } else {
+ g_warning ("Unable to get calendar query: %s", error->message);
+ g_error_free (error);
+ error = NULL;
+ }
+ g_free (query);
+ g_free (isodate);
+}
+
static gboolean
today_events_store_start (gpointer data)
{
@@ -212,51 +252,9 @@
TodayEventsStorePrivate *priv = EVENTS_STORE_PRIVATE (store);
if ((priv->events_ecal = e_cal_new_system_calendar ())) {
- GError *error = NULL;
- if (e_cal_open (priv->events_ecal, FALSE, &error)) {
- time_t t;
- time (&t);
- gchar *isodate = isodate_from_time_t (t);
- gchar *query = g_strdup_printf (
- "(occur-in-time-range? (time-day-begin "
- "(make-time \"%s\")) "
- "(time-add-day (time-day-begin "
- "(make-time \"%s\")) 7))",
- isodate, isodate);
- if (e_cal_get_query (priv->events_ecal,
- query, &priv->events_view, &error)) {
- g_signal_connect (G_OBJECT (priv->events_view),
- "objects-added",
- G_CALLBACK (
- today_events_store_objects_added),
- store);
- g_signal_connect (G_OBJECT (priv->events_view),
- "objects-modified",
- G_CALLBACK (
- today_events_store_objects_modified
- ),
- store);
- g_signal_connect (G_OBJECT (priv->events_view),
- "objects-removed",
- G_CALLBACK (
- today_events_store_objects_removed
- ),
- store);
- e_cal_view_start (priv->events_view);
- } else {
- g_warning ("Unable to get calendar query: %s",
- error->message);
- g_error_free (error);
- error = NULL;
- }
- g_free (query);
- g_free (isodate);
- } else {
- g_warning ("Unable to open system calendar: %s",
- error->message);
- g_error_free (error);
- error = NULL;
- }
+ g_signal_connect (G_OBJECT (priv->events_ecal), "cal-opened",
+ G_CALLBACK (today_events_store_cal_opened_cb), data);
+ e_cal_open_async (priv->events_ecal, FALSE);
} else {
g_warning ("Unable to retrieve system calendar");
}
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c 2007-08-21 15:14:32 UTC (rev 2758)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c 2007-08-21 16:52:00 UTC (rev 2759)
@@ -119,7 +119,7 @@
if (gtk_tree_selection_count_selected_rows (selection)) {
gtk_tree_selection_unselect_all (selection);
launcher_start (data->window, today_get_launcher (
- "openmoko-contacts", TRUE, TRUE));
+ "dates", TRUE, TRUE));
}
}
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-tasks-store.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-tasks-store.c 2007-08-21 15:14:32 UTC (rev 2758)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-tasks-store.c 2007-08-21 16:52:00 UTC (rev 2759)
@@ -20,6 +20,29 @@
ECal *tasks_ecal;
};
+static void
+today_tasks_store_cal_opened_cb (ECal *ecal, gint arg1, gpointer user_data)
+{
+ TodayTasksStore *store = TODAY_TASKS_STORE (user_data);
+ TodayTasksStorePrivate *priv = TASKS_STORE_PRIVATE (store);
+ const gchar *query = "#t";
+ GError *error = NULL;
+
+ if (e_cal_get_query (priv->tasks_ecal,
+ query, &priv->tasks_view, &error)) {
+ koto_task_store_set_view (
+ KOTO_TASK_STORE (store),
+ priv->tasks_view);
+ e_cal_view_start (priv->tasks_view);
+ } else {
+ g_warning ("Unable to get tasks query\n"
+ "\"%s\"\nError: %s",
+ query, error->message);
+ g_error_free (error);
+ error = NULL;
+ }
+}
+
static gboolean
today_tasks_store_start (gpointer data)
{
@@ -27,29 +50,9 @@
TodayTasksStorePrivate *priv = TASKS_STORE_PRIVATE (store);
if ((priv->tasks_ecal = e_cal_new_system_tasks ())) {
- GError *error = NULL;
- if (e_cal_open (priv->tasks_ecal, FALSE, &error)) {
- gchar *query = g_strdup_printf ("#t");
- if (e_cal_get_query (priv->tasks_ecal,
- query, &priv->tasks_view, &error)) {
- koto_task_store_set_view (
- KOTO_TASK_STORE (store),
- priv->tasks_view);
- e_cal_view_start (priv->tasks_view);
- } else {
- g_warning ("Unable to get tasks query\n"
- "\"%s\"\nError: %s",
- query, error->message);
- g_error_free (error);
- error = NULL;
- }
- g_free (query);
- } else {
- g_warning ("Unable to open system tasks: %s",
- error->message);
- g_error_free (error);
- error = NULL;
- }
+ g_signal_connect (G_OBJECT (priv->tasks_ecal), "cal-opened",
+ G_CALLBACK (today_tasks_store_cal_opened_cb), data);
+ e_cal_open_async (priv->tasks_ecal, FALSE);
} else {
g_warning ("Unable to retrieve system tasks");
}
More information about the commitlog
mailing list