Changeset 1880

Timestamp:

04/30/07 18:20:27 (6 years ago)

Author:

thomas

Message:

openmoko-dialer: Use MokoJournal? to retrieve call history

Location:

trunk/src/target/OM-2007/applications/openmoko-dialer/src

Files:

• dialer-main.c (modified) (3 diffs)
• dialer-main.h (modified) (1 diff)
• dialer-window-history.c (modified) (6 diffs)
• dialer-window-history.h (modified) (1 diff)
• moko-dialer-includes.h (modified) (1 diff)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c

@@ -181 +181 @@
 
   /* application object */
-//    MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
   g_set_application_name ("OpenMoko Dialer");
 
@@ -189 +188 @@
   g_signal_connect (G_OBJECT (conn), "incoming-call", (GCallback) incoming_call_cb, NULL);
   g_signal_connect (G_OBJECT (conn), "incoming-clip", (GCallback) incoming_clip_cb, NULL);
+
+  /* Set up journal handling */
+  p_dialer_data->journal = moko_journal_open_default ();
 
   signal (SIGUSR1, handle_sigusr1);
@@ -207 +209 @@
 
 
-//release everything    
+  //release everything
   contact_release_contact_list (&(p_dialer_data->g_contactlist));
 
+  /* closes the journal and frees allocated memory */
+  moko_journal_close (p_dialer_data->journal);
+
   return 0;
 }

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h

@@ -18 +18 @@
 #include "moko-dialer-includes.h"
 #include <libmokogsmd/moko-gsmd-connection.h>
-/*
+#include <libmokojournal/moko-journal.h>
 
-typedef struct _window_outgoing
-{
-
-MokoDialerStatus * status_outgoing;
-
-GtkWidget* window_outgoing;
-
-GtkWidget* buttonSpeaker;
-GtkWidget* buttonCancel;
-GtkWidget* buttonRedial;
-}WindowOutgoing;
-*/
 typedef struct _dialer_data
 {
   //the global data area begins here
+
   MokoGsmdConnection *connection;
+  MokoJournal *journal;
+
+  GtkListStore *history;
 
   char str_sim_pin[MOKO_DIALER_MAX_PIN_LEN + 1];

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c

@@ -425 +425 @@
   GtkTreeModel *model;
   GtkTreeSelection *selection;
-  /*HISTORY_ENTRY*/void *p;
-  int hasname;
+  //HISTORY_ENTRY void *p;
+  //int hasname;
   MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
 
@@ -439 +439 @@
   }
 
-  gtk_tree_model_get (model, &iter, COLUMN_ENTRYPOINTER, &p, -1);
+  /*gtk_tree_model_get (model, &iter, COLUMN_ENTRYPOINTER, &p, -1);
 
   //p_dialer_data->g_currentselected = p;
@@ -445 +445 @@
   gtk_tree_model_get (model, &iter, COLUMN_HASNAME, &hasname, -1);
   history_update_counter (p_dialer_data);
+  */
 
 }
@@ -588 +589 @@
   GtkListStore *list_store;
 
-//  GtkTreeIter iter;
-//  HISTORY_ENTRY *entry;
-
-  //copied
   GtkTreeViewColumn *col;
   GtkCellRenderer *renderer;
 
-  //GtkTreeModel        *model;
   GtkWidget *contactview = NULL;
 
@@ -606 +602 @@
   if (contactview == NULL)
     return 0;
-//pack image and label
+
+  /* Create column with icon and text */
   col = gtk_tree_view_column_new ();
-
-  gtk_tree_view_column_set_title (col, ("Title"));
-  gtk_tree_view_column_set_resizable (col, TRUE);
-
-
 
   renderer = gtk_cell_renderer_pixbuf_new ();
   gtk_tree_view_column_pack_start (col, renderer, FALSE);
   gtk_tree_view_column_set_attributes (col, renderer,
-                                       "pixbuf", COLUMN_TYPEICON, NULL);
-
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (col, renderer, FALSE);
-  gtk_tree_view_column_set_attributes (col, renderer,
-                                       "text", COLUMN_TIME, NULL);
-
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (col, renderer, FALSE);
-  gtk_tree_view_column_set_attributes (col, renderer,
-                                       "text", COLUMN_SEPRATE, NULL);
+                                       "icon-name", HISTORY_ICON_NAME_COLUMN, NULL);
 
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_column_pack_start (col, renderer, TRUE);
   gtk_tree_view_column_set_attributes (col, renderer,
-                                       "text", COLUMN_NAME_NUMBER, NULL);
-
+                                       "text", HISTORY_DISPLAY_TEXT_COLUMN, NULL);
 
   gtk_tree_view_append_column (GTK_TREE_VIEW (contactview), col);
 
 
-  //entry = p_dialer_data->g_historylist.first;
-
-  list_store = gtk_list_store_new (N_COLUMN, G_TYPE_INT, GDK_TYPE_PIXBUF,
-                                   G_TYPE_STRING, G_TYPE_STRING,
-                                   G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER,
-                                   G_TYPE_INT, -1);
-  //we will use a filter to facilitate the filtering in treeview without rebuilding the database.                         
+  /* Set up a list store for the history items */
+  /* UID, DSTART, MISSED, DIRECTION */
+  list_store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_INT);
+
+
+  //we will use a filter to facilitate the filtering in treeview without rebuilding the database.
   p_dialer_data->g_list_store_filter =
     gtk_tree_model_filter_new (GTK_TREE_MODEL (list_store), NULL);
@@ -654 +634 @@
 
   //load the three icons to memory.
-
-  // GError *error = NULL;
-  p_dialer_data->g_iconReceived = create_pixbuf ("received.png");
-
-  /* FIXME: error handling hasn't been implemented yet!
-     p_dialer_data->g_iconReceived = create_pixbuf ("received.png", &error);
-     if (error)
-     {
-     DBG_WARN ("Cound not load icon :%s", error->message);
-     g_error_free (error);
-     p_dialer_data->g_iconReceived = NULL;
-     error = NULL;
-     }
-   */
-
-  p_dialer_data->g_iconDialed = create_pixbuf ("dialed.png");
-  /* FIXME: error handling hasn't been implemented yet!
-     p_dialer_data->g_iconDialed = create_pixbuf ("dialed.png", &error);
-     if (error)
-     {
-     DBG_WARN ("Cound not load icon :%s", error->message);
-     g_error_free (error);
-     p_dialer_data->g_iconDialed = NULL;
-     error = NULL;
-     }
-   */
-
-  p_dialer_data->g_iconMissed = create_pixbuf ("missed.png");
-  /* FIXME: error handling hasn't been implemented yet!
-     p_dialer_data->g_iconMissed = create_pixbuf ("missed.png", &error);
-     if (error)
-     {
-     DBG_WARN ("Cound not load icon :%s", error->message);
-     g_error_free (error);
-     p_dialer_data->g_iconMissed = NULL;
-     error = NULL;
-     }
-   */
-#if 0
-  while (entry)
-  {
-    //DBG_MESSAGE(entry->number);
-    gtk_list_store_append (list_store, &iter);
-    gtk_list_store_set (list_store, &iter, COLUMN_TYPE, entry->type,
-                        COLUMN_SEPRATE, "--", COLUMN_TIME, entry->time,
-                        COLUMN_DURATION, entry->durationsec,
-                        COLUMN_ENTRYPOINTER, entry, COLUMN_HASNAME, 0, -1);
-    if (entry->name == 0)
-    {
-      //DBG_MESSAGE(entry->number);
-      gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER,
-                          entry->number, -1);
-      gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 0, -1);
-    }
-    else
-    {
-      gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER,
-                          entry->name, -1);
-      gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 1, -1);
-    }
-    switch (entry->type)
-    {
-    case INCOMING:
-      {
-        gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
-                            p_dialer_data->g_iconReceived, -1);
-        //      icon=gdk_pixbuf_new_from_file("./received.png",&error);
-        break;
-      }
-    case OUTGOING:
-      {                         //     icon=gdk_pixbuf_new_from_file("./dialed.png",&error);
-        gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
-                            p_dialer_data->g_iconDialed, -1);
-        break;
-      }
-    case MISSED:
-      {                         //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
-        gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
-                            p_dialer_data->g_iconMissed, -1);
-        break;
-      }
-
-    default:
-
-      {                         //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
-        gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
-                            p_dialer_data->g_iconMissed, -1);
-        break;
-      }
-    }
-
-
-
-    entry = entry->next;
-  }
-#endif
   gtk_tree_view_set_model (GTK_TREE_VIEW (contactview),
                            GTK_TREE_MODEL (p_dialer_data->
                                            g_list_store_filter));
 
-  g_object_unref (list_store);
+
+  /* add the initial contents of the list store */
+  int i = 0;
+  MokoJournalEntry *j_entry;
+
+  /* if there aren't any entries in the journal, we don't need to do any more
+   * here
+   */
+  if (moko_journal_get_nb_entries (p_dialer_data->journal))
+    return 1;
+
+  j_entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
+
+  while (moko_journal_get_entry_at (p_dialer_data->journal, i, &j_entry))
+  {
+    const gchar *uid, *number;
+    gchar *icon_name, *display_text;
+    int dstart;
+    enum MessageDirection direction;
+    gboolean was_missed;
+    const MokoTime *time;
+
+    uid = moko_journal_entry_get_contact_uid (j_entry);
+    moko_journal_entry_get_direction (j_entry, &direction);
+    time = moko_journal_entry_get_dtstart (j_entry);
+    was_missed = moko_journal_voice_info_get_was_missed ((MokoJournalVoiceInfo*) j_entry);
+    number = moko_journal_voice_info_get_distant_number ((MokoJournalVoiceInfo*)j_entry);
+
+    if (direction == DIRECTION_OUT)
+      icon_name = "call-in";
+    else
+      if (was_missed)
+        icon_name = "call-missed";
+      else
+        icon_name = "call-out";
+
+    /* display text should be either the contact name, or the number if the
+     * contact name is not know */
+    /* FIXME: look up uid */
+    display_text = number;
+
+    gtk_list_store_insert_with_values (list_store, NULL, 0,
+        HISTORY_NUMBER_COLUMN, number,
+        HISTORY_DSTART_COLUMN, dstart,
+        HISTORY_ICON_NAME_COLUMN, icon_name,
+        HISTORY_DISPLAY_TEXT_COLUMN, display_text,
+        -1);
+  }
+
+
 
   return 1;

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.h

@@ -20 +20 @@
 #ifndef _OPENMOKO_DIALER_WINDOW_HISTORY_H
 
+/* columns available in the history list store */
+enum history_columns {
+  HISTORY_NUMBER_COLUMN, /* number for re-dial */
+  HISTORY_DSTART_COLUMN, /* call time, used for sorting */
+  HISTORY_ICON_NAME_COLUMN, /* icon name for display */
+  HISTORY_DISPLAY_TEXT_COLUMN, /* name or number for display */
+};
+
+
 gint window_history_init (MokoDialerData * p_dialer_data);
 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-includes.h

@@ -93 +93 @@
 } TIMER_DATA;
 
-enum
-{
-  COLUMN_TYPE,
-  COLUMN_TYPEICON,
-  COLUMN_SEPRATE,
-  COLUMN_NAME_NUMBER,
-  COLUMN_TIME,
-  COLUMN_DURATION,
-  COLUMN_ENTRYPOINTER,
-  COLUMN_HASNAME,
-  N_COLUMN
-};
 void gsm_incoming_call (gchar * number);
 void gsm_peer_accept ();