r1567 - in trunk/src/target/OM-2007/applications/openmoko-today: . src

[dodji at sita.openmoko.org]

Author: dodji
Date: 2007-03-30 13:29:43 +0200 (Fri, 30 Mar 2007)
New Revision: 1567

Modified:
   trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
Log:
Fix a potential crasher when calendar or adressbook could not be open.

	* applications/openmoko-today/src/today-events-area.c:
	  (today_events_area_set_events_auto): don' t g_object_unref() NULL
	   objects.


Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-03-29 22:05:02 UTC (rev 1566)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-03-30 11:29:43 UTC (rev 1567)
@@ -1,3 +1,9 @@
+Fri, 30 Mar 2007 13:18:28 +0200 Dodji Seketeli
+
+	* applications/openmoko-today/src/today-events-area.c:
+	  (today_events_area_set_events_auto): don' t g_object_unref() NULL
+	   objects.
+
 Tue, 27 Mar 2007 16:41:20 +0100 Thomas Wood
 
 	* src/today-events-area.c: (update_paging_info): Set page numbers

Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c	2007-03-29 22:05:02 UTC (rev 1566)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c	2007-03-30 11:29:43 UTC (rev 1567)
@@ -1092,8 +1092,11 @@
     if(!e_cal_open (a_this->priv->events_ecal, FALSE, NULL))
     {
       g_warning ("failed to open calendar") ;
-      g_object_unref (G_OBJECT (a_this->priv->events_ecal)) ;
-      a_this->priv->events_ecal = NULL ;
+      if (a_this->priv->events_ecal)
+      {
+        g_object_unref (G_OBJECT (a_this->priv->events_ecal)) ;
+        a_this->priv->events_ecal = NULL ;
+      }
     }
   }
   g_return_if_fail (a_this->priv->events_ecal) ;
@@ -1104,8 +1107,11 @@
     if (!e_cal_open (a_this->priv->tasks_ecal, FALSE, NULL))
     {
       g_warning ("failed to open tasks") ;
-      g_object_unref (G_OBJECT (a_this->priv->tasks_ecal)) ;
-      a_this->priv->tasks_ecal = NULL ;
+      if (a_this->priv->tasks_ecal)
+      {
+        g_object_unref (G_OBJECT (a_this->priv->tasks_ecal)) ;
+        a_this->priv->tasks_ecal = NULL ;
+      }
     }
   }
   g_return_if_fail (a_this->priv->tasks_ecal) ;