Changeset 2759

Timestamp:

08/21/07 18:52:00 (6 years ago)

Author:

chris

Message:

• Load calendars asynchronously
• Load dates instead of openmoko-contacts when clicking on events

Location:

trunk/src/target/OM-2007.2/applications/openmoko-today2

Files:

• ChangeLog (modified) (1 diff)
• src/today-events-store.c (modified) (2 diffs)
• src/today-pim-summary.c (modified) (1 diff)
• src/today-tasks-store.c (modified) (2 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog

@@ +1 @@
+2007-08-21  Chris Lord,,,  <chris@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@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-events-store.c

@@ -206 +206 @@
 }
 
+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)
@@ -213 +253 @@
         
         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");

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c

@@ -120 +120 @@
                 gtk_tree_selection_unselect_all (selection);
                 launcher_start (data->window, today_get_launcher (
-                        "openmoko-contacts", TRUE, TRUE));
+                        "dates", TRUE, TRUE));
         }
 }

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-tasks-store.c

@@ -21 +21 @@
 };
 
+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)
@@ -28 +51 @@
         
         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");