r660 - in trunk/src/target/OM-2007/applications/openmoko-dialer: . src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-02-03 14:08:53 +0100 (Sat, 03 Feb 2007)
New Revision: 660

Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.h
Log:
openmoko-dialer:
- remove bonobo include, we are _not_ using bonobo
- compilation fix for EContactPhoto (changed inline struct)
- update openmoko-dialer.pro re. libebook dependency


Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro	2007-02-03 09:21:05 UTC (rev 659)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro	2007-02-03 13:08:53 UTC (rev 660)
@@ -44,7 +44,7 @@
            src/pin.c
 
 MOKOCONFIG = mokoui
-PKGCONFIG += libgsmd alsa
+PKGCONFIG += libebook-1.2 libgsmd alsa
 
 include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c	2007-02-03 09:21:05 UTC (rev 659)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c	2007-02-03 13:08:53 UTC (rev 660)
@@ -597,7 +597,7 @@
 			   the html */
 
 if(photo)
-gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
+gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL);
 
 gdk_pixbuf_loader_close (loader, NULL);
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.h	2007-02-03 09:21:05 UTC (rev 659)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.h	2007-02-03 13:08:53 UTC (rev 660)
@@ -28,7 +28,6 @@
 
 #include "moko-dialer-declares.h"
 #include "error.h"
-#include <bonobo/bonobo-main.h>
 #include <stdlib.h>
 #include <libebook/e-book.h>
 #include <gtk/gtk.h>