r2869 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-08-31 12:25:53 +0200 (Fri, 31 Aug 2007)
New Revision: 2869

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c
Log:
* src/moko-contacts.c: (moko_contacts_get_photo): Check photo before
g_object_ref. Should prevent segfault on the device when keying in a number
that belongs to a contact.


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-31 10:21:15 UTC (rev 2868)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-31 10:25:53 UTC (rev 2869)
@@ -1,3 +1,9 @@
+2007-08-31  Thomas Wood  <thomas at openedhand.com>
+
+	* src/moko-contacts.c: (moko_contacts_get_photo): Check photo before
+	g_object_ref. Should prevent segfault on the device when keying in a number
+	that belongs to a contact.
+
 2007-08-28  Neil Jagdish Patel  <njp at o-hand.com>
 
 	Patch by: Rod Whitby <rod at whitby.id.au>

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c	2007-08-31 10:21:15 UTC (rev 2868)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c	2007-08-31 10:25:53 UTC (rev 2869)
@@ -160,7 +160,8 @@
   {
     g_warning ("%s\n", err->message);
     m_contact->photo = gdk_pixbuf_new_from_file (PKGDATADIR"/person.png", NULL);
-    g_object_ref (m_contact->photo);
+	if (m_contact->photo)
+      g_object_ref (m_contact->photo); 
     return;
   }
   
@@ -168,7 +169,8 @@
   if (!photo)
   {
     m_contact->photo = gdk_pixbuf_new_from_file (PKGDATADIR"/person.png", NULL);
-    g_object_ref (m_contact->photo);
+	if (m_contact->photo)
+      g_object_ref (m_contact->photo);
     return;
  
   }
@@ -186,7 +188,8 @@
   else 
   {
     m_contact->photo = gdk_pixbuf_new_from_file (PKGDATADIR"/person.png", NULL);
-    g_object_ref (m_contact->photo); 
+	if (m_contact->photo)
+    	g_object_ref (m_contact->photo); 
   }  
   
   g_object_unref (loader);