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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-10-02 12:47:05 +0200 (Tue, 02 Oct 2007)
New Revision: 3071

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
Patch by: Roman Moravcik <roman.moravcik at gmail.com>

* src/moko-dialer.c: (on_keypad_dial_clicked), (on_incoming_call),
  (on_network_registered): Store network information (LocationAreaCode,
  CellID) in moko journal.


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-02 10:44:07 UTC (rev 3070)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-02 10:47:05 UTC (rev 3071)
@@ -2,6 +2,14 @@
 
 	Patch by: Roman Moravcik <roman.moravcik at gmail.com>
 
+	* src/moko-dialer.c: (on_keypad_dial_clicked), (on_incoming_call),
+	  (on_network_registered): Store network information (LocationAreaCode,
+	  CellID) in moko journal.
+
+2007-10-02  Thomas Wood  <thomas at openedhand.com>
+
+	Patch by: Roman Moravcik <roman.moravcik at gmail.com>
+
 	* src/moko-dialer.c: (moko_dialer_init):
 	  Fix the loading of moko journal
 	(on_talking_reject_call):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-10-02 10:44:07 UTC (rev 3070)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-10-02 10:47:05 UTC (rev 3071)
@@ -71,6 +71,7 @@
   /* Registration variables */
   guint               reg_timeout;
   MokoGsmdConnectionNetregType registered;
+  MokoGSMLocation     gsm_location;
 };
 
 enum
@@ -289,6 +290,7 @@
     moko_journal_entry_set_direction (priv->entry, DIRECTION_OUT);
     moko_journal_entry_set_dtstart (priv->entry, priv->time);
     moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
+    moko_journal_entry_set_gsm_location (priv->entry, &priv->gsm_location);
     moko_journal_voice_info_set_distant_number (priv->entry, number);
     if (entry && entry->contact->uid)
       moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
@@ -479,6 +481,8 @@
     case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
       g_debug ("NetReg: Network registered");
       g_debug ("\tLocationAreaCode = %x\n\tCellID = %x", lac, cell);
+      priv->gsm_location.lac = lac;
+      priv->gsm_location.cid = cell;
       g_source_remove (priv->reg_timeout);
       break;
     default:
@@ -513,6 +517,7 @@
     moko_journal_entry_set_direction (priv->entry, DIRECTION_IN);
     moko_journal_entry_set_dtstart (priv->entry, priv->time);
     moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
+    moko_journal_entry_set_gsm_location (priv->entry, &priv->gsm_location);
   }
   /* Set up the user interface */
   moko_talking_incoming_call (MOKO_TALKING (priv->talking), NULL, NULL);