Send commitlog mailing list submissions to
        commitlog@lists.openmoko.org

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.asu.dev'
      ([EMAIL PROTECTED])
   2. r4611 -
      trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit
      ([EMAIL PROTECTED])
   3. Openmoko's OpenEmbedded repository. This is used to build the
      Openmoko distribution: Changes to 'org.openmoko.asu.dev'
      ([EMAIL PROTECTED])
   4. r4612 -
      trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal
      ([EMAIL PROTECTED])
   5. Locations: Changes to 'master' ([EMAIL PROTECTED])
--- Begin Message ---
 conf/distro/include/sane-srcrevs.inc            |    5 +-
 packages/e17/e-wm_svn.bb                        |    1 +
 packages/e17/illume_svn.bb                      |   59 +++++++++++++++++++++++
 packages/openmoko-projects/illume-config_svn.bb |    2 +-
 packages/openmoko-projects/illume-theme_svn.bb  |    2 +-
 packages/openmoko-projects/illume_svn.bb        |   27 ----------
 packages/tasks/task-openmoko-asu.bb             |    5 ++
 7 files changed, 70 insertions(+), 31 deletions(-)

New commits:
commit 92bb877811acae82e07e5a13a8b6aeaf68e64a1b
Author: Carsten Haitzler <[EMAIL PROTECTED]>
Date:   Tue Aug 26 13:48:04 2008 +1000

    and update to fix slight focus problems with e/illume. working now (tested).

commit 0b8407073d0224723b421393fc755759665638a0
Author: Carsten Haitzler <[EMAIL PROTECTED]>
Date:   Mon Aug 25 20:44:23 2008 +1000

    update efl and e to latest - fix segv on startup, gsm  now doesnt use gsmget
    but dbus inlined into illume (thus e) saves a process. 1 problem with focus
    not going back to windows when shown sometimes - qpe ones specifically. need
    to look at that tomorrow. did enough today.

commit e9defc1dd96ceb9c259942c18b7a4a2dfdeb63bf
Merge: 46c79a398b8c7e5faa5e45fce50a5079a32829db 
ae4b6a30a4d0687d018c213122765c0b0868c6cc
Author: Carsten Haitzler <[EMAIL PROTECTED]>
Date:   Mon Aug 25 14:42:41 2008 +1000

    Merge branch 'org.openmoko.asu.dev' of git+ssh://[EMAIL 
PROTECTED]/var/cache/git/openmoko into org.openmoko.asu.dev

commit 46c79a398b8c7e5faa5e45fce50a5079a32829db
Author: Carsten Haitzler <[EMAIL PROTECTED]>
Date:   Mon Aug 25 14:41:50 2008 +1000

    movw illume to upstream svn version. now use "asu" profile - illume-theme
    provides this (and config.. tho these packages clash no with upstream OE).




--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-08-26 06:20:29 +0200 (Tue, 26 Aug 2008)
New Revision: 4611

Modified:
   
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
Log:
apply patch from LeRoutier for trac ticket #1839 (Erin Yueh)


Modified: 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
--- 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
        2008-08-26 02:54:54 UTC (rev 4610)
+++ 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
        2008-08-26 04:20:29 UTC (rev 4611)
@@ -223,16 +223,23 @@
     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);
   }
   moko_talking_outgoing_call (MOKO_TALKING (priv->talking), number, entry);
 
-  /* TODO: No idea where '129' comes from, taken from libmokogsmd - refer to 
-   * libgsmd.h in gsmd - It says "Refer to GSM 04.08 [8] subclause 10.5.4.7"
+  /* <type>: integer type; Type of address octet. (refer GSM 04.08 section 
10.5.4.7)
+   * 129        ISDN / telephony numbering plan, national / international 
unknown
+   * 145        ISDN / telephony numbering plan, international number
+   * 161        ISDN / telephony numbering plan, national number
+   * 128 - 255 Other values refer GSM 04.08 section 10.5.4.7
+   * <type>: type of address octet in integer format (refer GSM 04.08 [8] 
subclause 10.5.4.7); default 145 when dialling
+   * string includes international access code character "+", otherwise 129
    */
-  addr.type = 129;
+
+  if ( number[0] != '+' ) { addr.type = 129; } else { addr.type = 145; };
   g_stpcpy (&addr.addr[0], number);
   lgsm_voice_out_init (handle, &addr);
 




--- End Message ---
--- Begin Message ---
 conf/distro/include/sane-srcrevs.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

New commits:
commit ef100b6f74a59ffb7e9eaf12ebf8b2d1ff25fb7e
Author: Carsten Haitzler <[EMAIL PROTECTED]>
Date:   Tue Aug 26 14:15:03 2008 +1000

    move to version with less debugging




--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-08-26 10:31:26 +0200 (Tue, 26 Aug 2008)
New Revision: 4612

Modified:
   
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
Log:
apply the patch from LeRoutier for trac ticket #1840 (Erin Yueh)


Modified: 
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
===================================================================
--- 
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c 
    2008-08-26 04:20:29 UTC (rev 4611)
+++ 
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c 
    2008-08-26 08:31:26 UTC (rev 4612)
@@ -672,11 +672,14 @@
   icalcomponent_add_property (comp, prop) ;
 
   /*add location start*/
-  struct icalgeotype geo;
-  if (moko_journal_entry_get_start_location (a_entry, 
(MokoLocation*)(void*)&geo))
+  if ( ( a_entry->start_longitude != 0.0 ) && ( a_entry->start_latitude != 0.0 
) )
   {
-    prop = icalproperty_new_geo (geo) ;
-    icalcomponent_add_property (comp, prop) ;
+    struct icalgeotype geo;
+    if (moko_journal_entry_get_start_location (a_entry, 
(MokoLocation*)(void*)&geo))
+    {
+      prop = icalproperty_new_geo (geo) ;
+      icalcomponent_add_property (comp, prop) ;
+    }
   }
 
   /*add source*/
@@ -693,15 +696,19 @@
    * x-property named X-OPENMOKO-ENTRY-GSM-LOCATION that has the form:
    * X-OPENMOKO-GSMLOCATION;LAC="<int16>";CID=<int 16>: dummy
    */
-  prop = icalproperty_new_x ("dummy") ;
-  icalproperty_set_x_name (prop, "X-OPENMOKO-ENTRY-GSM-LOCATION") ;
-  str = g_strdup_printf ("%d", a_entry->gsm_loc.lac);
-  icalproperty_set_parameter_from_string (prop, "X-LAC", str) ;
-  g_free (str) ;
-  str = g_strdup_printf ("%d", a_entry->gsm_loc.cid);
-  icalproperty_set_parameter_from_string (prop, "X-CID", str) ;
-  g_free (str) ;
-  icalcomponent_add_property (comp, prop) ;
+  if ( ( a_entry->gsm_loc.lac > 0 ) && ( a_entry->gsm_loc.cid > 0 ) )
+  {
+    prop = icalproperty_new_x ("dummy") ;
+    icalproperty_set_x_name (prop, "X-OPENMOKO-ENTRY-GSM-LOCATION") ;
+    str = g_strdup_printf ("%d", a_entry->gsm_loc.lac);
+    icalproperty_set_parameter_from_string (prop, "X-LAC", str) ;
+    g_free (str) ;
+    str = g_strdup_printf ("%d", a_entry->gsm_loc.cid);
+    icalproperty_set_parameter_from_string (prop, "X-CID", str) ;
+    g_free (str) ;
+    icalcomponent_add_property (comp, prop) ;
+  }
+
   /*add entry type*/
   prop = icalproperty_new_x
                 (entry_type_to_string (moko_journal_entry_get_entry_type 
(a_entry))) ;
@@ -727,19 +734,37 @@
          * serialize caller number
          */
         if (moko_journal_voice_info_get_distant_number (a_entry))
+        {
           number = (gchar*)moko_journal_voice_info_get_distant_number 
(a_entry) ;
-        prop = icalproperty_new_x (number) ;
-        icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLER-NUMBER") ;
-        icalcomponent_add_property (comp, prop) ;
+          prop = icalproperty_new_x (number) ;
+          if (dir == DIRECTION_OUT)
+          {
+               icalproperty_set_x_name (prop, 
"X-OPENMOKO-VOICE-CALLEE-NUMBER") ;
+          }
+          else
+          {
+            icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLER-NUMBER") ;
+          }
+          icalcomponent_add_property (comp, prop) ;
+        }
 
         /*
          * serialize the local_number property
          */
         if (moko_journal_voice_info_get_local_number (a_entry))
-          number = (gchar*)moko_journal_voice_info_get_distant_number 
(a_entry) ;
-        prop = icalproperty_new_x (number) ;
-        icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLEE-NUMBER") ;
-        icalcomponent_add_property (comp, prop) ;
+        {
+          number = (gchar*)moko_journal_voice_info_get_local_number (a_entry) ;
+          prop = icalproperty_new_x (number) ;
+          if (dir == DIRECTION_OUT)
+          {
+            icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLER-NUMBER") ;
+          }
+          else
+          {
+            icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLEE-NUMBER") ;
+          }
+          icalcomponent_add_property (comp, prop) ;
+        }
 
         /*
          * serialize the "was-missed" property
@@ -790,6 +815,7 @@
                         FALSE) ;
 
   entry = moko_journal_entry_alloc () ;
+  MessageDirection direction = DIRECTION_OUT;
 
   /*get the type*/
   if (icalcomponent_find_property_as_string (a_comp, "X-OPENMOKO-ENTRY-TYPE",
@@ -822,10 +848,11 @@
                                      &prop_value))
   {
     if (prop_value && !strcmp (prop_value, "IN"))
-      moko_journal_entry_set_direction (entry, DIRECTION_IN) ;
+      direction = DIRECTION_IN;
     else
-      moko_journal_entry_set_direction (entry, DIRECTION_OUT) ;
+      direction = DIRECTION_OUT;
   }
+  moko_journal_entry_set_direction (entry, direction);
   if (icalcomponent_find_property_as_string
                                     (a_comp, "X-OPENMOKO-ENTRY-SOURCE",
                                      &prop_value))
@@ -920,7 +947,14 @@
         {
           if (prop_value)
           {
-            moko_journal_voice_info_set_distant_number (entry, prop_value) ;
+            if ( direction == DIRECTION_OUT)
+            {
+              moko_journal_voice_info_set_local_number (entry, prop_value);
+            }
+            else
+            {
+              moko_journal_voice_info_set_distant_number (entry, prop_value);
+            }
           }
         }
 
@@ -934,7 +968,14 @@
         {
           if (prop_value)
           {
-            moko_journal_voice_info_set_local_number (entry, prop_value) ;
+            if ( direction == DIRECTION_OUT)
+            {
+              moko_journal_voice_info_set_distant_number (entry, prop_value);
+            }
+            else
+            {
+              moko_journal_voice_info_set_local_number (entry, prop_value);
+            }
           }
         }
         prop_value = NULL ;




--- End Message ---
--- Begin Message ---
 data/themes/diversity_nav.edc      |  135 ++++++----
 src/e_nav_item_location.c          |    1 -
 src/widgets/e_nav_contact_editor.c |  522 +++++++++++++-----------------------
 src/widgets/e_nav_contact_editor.h |   12 +-
 src/widgets/e_nav_list.c           |   20 +-
 5 files changed, 286 insertions(+), 404 deletions(-)

New commits:
commit 04dfcc392dbaf343c9ae12092bb9949a37078c48
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date:   Tue Aug 26 16:31:31 2008 +0800

    Make more use of edje in e_nav_contact_editor.
    
    The layout is now done by edje.  I haven't tested it on neo, but more
    work is expected, especially when the virtual keyboard is shown.

commit 07e809649cda3723cb74f0bfeb62b7a68e5cec27
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date:   Tue Aug 26 12:37:33 2008 +0800

    The background of e_nav_list should not ignore events.

commit 0bb3ac818feb2a565ccadb411c1185c88581e51f
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date:   Tue Aug 26 11:42:01 2008 +0800

    Better namings of struct and function.

commit 233d49ee3d739864e553b8c09ea6aadd704e3b32
Author: Chia-I Wu <[EMAIL PROTECTED]>
Date:   Tue Aug 26 11:30:58 2008 +0800

    Fixed a leak in e_nav_list.




--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to