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

thomas at sita.openmoko.org thomas at sita.openmoko.org
Thu Mar 20 18:06:45 CET 2008


Author: thomas
Date: 2008-03-20 18:06:43 +0100 (Thu, 20 Mar 2008)
New Revision: 4239

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
Log:
2008-03-20  Thomas Wood  <thomas at openedhand.com>

	* Makefile.am:
	* configure.ac:
	* src/dialer/Makefile.am:
	* src/dialer/moko-history.c: (on_btn_save_clicked):

	Display a list of contacts when "Add to contact" is clicked


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-03-20 17:06:43 UTC (rev 4239)
@@ -1,5 +1,14 @@
 2008-03-20  Thomas Wood  <thomas at openedhand.com>
 
+	* Makefile.am:
+	* configure.ac:
+	* src/dialer/Makefile.am:
+	* src/dialer/moko-history.c: (on_btn_save_clicked):
+
+	Display a list of contacts when "Add to contact" is clicked
+
+2008-03-20  Thomas Wood  <thomas at openedhand.com>
+
 	* src/dialer/dialer-main.c: (main): Set a widget name on the dial pad
 					    for theming
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am	2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/Makefile.am	2008-03-20 17:06:43 UTC (rev 4239)
@@ -1,2 +1,2 @@
-SUBDIRS = src data
+SUBDIRS = libhito src data
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac	2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac	2008-03-20 17:06:43 UTC (rev 4239)
@@ -37,6 +37,21 @@
 AC_SUBST(DIALER_CFLAGS)
 AC_SUBST(DIALER_LIBS)
 
+
+# deps for libhito
+PKG_CHECK_MODULES(CONTACTS, glib-2.0 glib-2.0 gtk+-2.0 libebook-1.2)
+
+old_cflags=$CFLAGS
+CFLAGS=$CONTACTS_CFLAGS
+AC_CHECK_TYPE(EContactPhotoType, [], [], [#include <libebook/e-book.h>])
+CFLAGS=$old_cflags
+
+if test $ac_cv_type_EContactPhotoType = yes; then
+	AC_DEFINE(HAVE_PHOTO_TYPE, 1, [Defined if EContactPhotoType exists])
+fi
+
+
+
 dnl ==============================================
 dnl DBUS
 dnl ==============================================
@@ -56,6 +71,7 @@
 # output stuff
 AC_OUTPUT([
 Makefile
+libhito/Makefile
 src/Makefile
 src/common/Makefile
 src/dialer/Makefile

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am	2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am	2008-03-20 17:06:43 UTC (rev 4239)
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@
 
-INCLUDES = -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir)/src/common -I$(top_srcdir)/libhito
 
 bin_PROGRAMS = openmoko-dialer
 
@@ -11,4 +11,7 @@
 	moko-tips.c moko-tips.h \
 	dialer-main.c
 
-openmoko_dialer_LDADD = @DIALER_LIBS@ @JANA_LIBS@ $(top_srcdir)/src/common/libdialer-common.a
+openmoko_dialer_LDADD = @DIALER_LIBS@ @JANA_LIBS@ \
+			$(top_srcdir)/src/common/libdialer-common.a \
+			$(top_srcdir)/libhito/libhito.a
+

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c	2008-03-20 15:21:30 UTC (rev 4238)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c	2008-03-20 17:06:43 UTC (rev 4239)
@@ -30,6 +30,11 @@
 #include <moko-stock.h>
 #include <moko-finger-scroll.h>
 
+#include <libebook/e-book.h>
+
+#include "hito-contact-view.h"
+#include "hito-contact-store.h"
+
 #include "moko-contacts.h"
 #include "moko-history.h"
 
@@ -226,7 +231,47 @@
   if (action == 1)
   { /* create new contact */ }
   else
-  {/* add to contact */ } 
+  {
+    EBook *book;
+    EBookQuery *query;
+    EBookView *view;
+    GtkWidget *window, *contacts_treeview, *scroll;
+    GtkTreeModel *store;
+    GError *err = NULL;
+    
+    window = gtk_dialog_new_with_buttons ("Add to Contact", NULL, 0,
+					  "Cancel", GTK_RESPONSE_CANCEL,
+					  "Add", GTK_RESPONSE_OK,
+					  NULL);
+    
+    book = e_book_new_system_addressbook (&err);
+    if (err)
+      return;
+    e_book_open (book, FALSE, &err);
+    if (err)
+     return;
+    query = e_book_query_any_field_contains (NULL);
+    e_book_get_book_view (book, query, NULL, 0, &view, &err);
+    if (err)
+      return;
+
+    e_book_query_unref (query);  
+    e_book_view_start (view);
+    
+    store = hito_contact_store_new (view);
+    contacts_treeview = hito_contact_view_new (HITO_CONTACT_STORE (store), NULL);
+    
+    scroll = moko_finger_scroll_new ();
+    gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (window)->vbox), scroll);
+    
+    gtk_container_add (GTK_CONTAINER (scroll), contacts_treeview);
+    
+    gtk_widget_show_all (scroll);
+    
+    gtk_dialog_run (GTK_DIALOG (window));
+    gtk_widget_destroy (window);
+    e_book_
+  }
   
   g_free (number);
 }





More information about the commitlog mailing list