r2969 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Fri Sep 14 15:54:48 CEST 2007
Author: thomas
Date: 2007-09-14 15:54:47 +0200 (Fri, 14 Sep 2007)
New Revision: 2969
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
Log:
* src/today-pim-journal.c: (today_pim_journal_box_new): Don't try to
load the journal if opening it failed. Prevents segfault if d-bus is
not available.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2007-09-14 13:10:13 UTC (rev 2968)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog 2007-09-14 13:54:47 UTC (rev 2969)
@@ -1,5 +1,11 @@
2007-09-14 Thomas Wood <thomas at openedhand.com>
+ * src/today-pim-journal.c: (today_pim_journal_box_new): Don't try to
+ load the journal if opening it failed. Prevents segfault if d-bus is
+ not available.
+
+2007-09-14 Thomas Wood <thomas at openedhand.com>
+
* src/today-main.c: (today_create_home_page): Fix Dates icon (bug 830)
2007-09-13 Chris Lord,,, <chris at openedhand.com>
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c 2007-09-14 13:10:13 UTC (rev 2968)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c 2007-09-14 13:54:47 UTC (rev 2969)
@@ -157,11 +157,19 @@
data->n_missed_calls = 0;
data->n_unread_messages = 0;
data->journal = moko_journal_open_default ();
- g_signal_connect (G_OBJECT (data->journal), "entry_added",
- G_CALLBACK (today_pim_journal_entry_added_cb), data);
- g_signal_connect (G_OBJECT (data->journal), "entry_removed",
- G_CALLBACK (today_pim_journal_entry_removed_cb), data);
- moko_journal_load_from_storage (data->journal);
-
+
+ if (data->journal)
+ {
+ g_signal_connect (G_OBJECT (data->journal), "entry_added",
+ G_CALLBACK (today_pim_journal_entry_added_cb), data);
+ g_signal_connect (G_OBJECT (data->journal), "entry_removed",
+ G_CALLBACK (today_pim_journal_entry_removed_cb), data);
+ moko_journal_load_from_storage (data->journal);
+ }
+ else
+ {
+ g_warning ("Could not load journal");
+ }
+
return treeview;
}
More information about the commitlog
mailing list