Send commitlog mailing list submissions to
[email protected]
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. r2939 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
2. r2940 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2:
. libmokogsmd ([EMAIL PROTECTED])
3. r2941 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2:
. libmokogsmd ([EMAIL PROTECTED])
4. r2942 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-09-07 13:18:32 +0200 (Fri, 07 Sep 2007)
New Revision: 2939
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:
* src/moko-dialer.c: (moko_dialer_init):#
- Prevent critical warnings if the journal cannot be loaded.
- Exit if we cannot connect to gsmd
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-07 04:26:34 UTC (rev 2938)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-07 11:18:32 UTC (rev 2939)
@@ -1,3 +1,9 @@
+2007-09-07 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/moko-dialer.c: (moko_dialer_init):#
+ - Prevent critical warnings if the journal cannot be loaded.
+ - Exit if we cannot connect to gsmd
+
2007-09-06 Thomas Wood <[EMAIL PROTECTED]>
* src/moko-dialer-textview.c: (moko_dialer_textview_init): Prevent the
display
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-09-07 04:26:34 UTC (rev 2938)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-09-07 11:18:32 UTC (rev 2939)
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -808,6 +809,8 @@
moko_gsmd_connection_set_antenna_power (conn, TRUE, &err);
dialer_display_error (err);
+ if (err && err->code == MOKO_GSMD_ERROR_CONNECT)
+ exit (1); /* no point continuing if we can't connect to gsmd? */
/* Handle network registration a few seconds after powering up the
* antenna*/
@@ -830,7 +833,7 @@
/* Set up the journal */
priv->journal = moko_journal_open_default ();
- if (!moko_journal_load_from_storage (priv->journal))
+ if (!priv->journal || moko_journal_load_from_storage (priv->journal))
{
g_warning ("Cannot load journal");
priv->journal = NULL;
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-07 15:15:08 +0200 (Fri, 07 Sep 2007)
New Revision: 2940
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
Log:
* libmokogsmd/moko-gsmd-connection.h: Add missing Netreg type
Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-09-07
11:18:32 UTC (rev 2939)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-09-07
13:15:08 UTC (rev 2940)
@@ -1,3 +1,7 @@
+2007-09-07 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokogsmd/moko-gsmd-connection.h: Add missing Netreg type
+
2007-09-06 Thomas Wood <[EMAIL PROTECTED]>
* libmokogsmd/moko-gsmd-connection.c:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
2007-09-07 11:18:32 UTC (rev 2939)
+++
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
2007-09-07 13:15:08 UTC (rev 2940)
@@ -71,6 +71,7 @@
MOKO_GSMD_CONNECTION_NETREG_HOME = 1,
MOKO_GSMD_CONNECTION_NETREG_SEARCHING = 2,
MOKO_GSMD_CONNECTION_NETREG_DENIED = 3,
+ MOKO_GSMD_CONNECTION_NETREG_UNKNOWN = 4,
MOKO_GSMD_CONNECTION_NETREG_ROAMING = 5
} MokoGsmdConnectionNetregType;
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-07 15:24:24 +0200 (Fri, 07 Sep 2007)
New Revision: 2941
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
Log:
* libmokogsmd/moko-gsmd-connection.c:
(_moko_gsmd_connection_eventhandler): Remove work around for bug 454 as it has
now been fixed.
Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-09-07
13:15:08 UTC (rev 2940)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-09-07
13:24:24 UTC (rev 2941)
@@ -1,5 +1,11 @@
2007-09-07 Thomas Wood <[EMAIL PROTECTED]>
+ * libmokogsmd/moko-gsmd-connection.c:
+ (_moko_gsmd_connection_eventhandler): Remove work around for bug 454 as
it has
+ now been fixed.
+
+2007-09-07 Thomas Wood <[EMAIL PROTECTED]>
+
* libmokogsmd/moko-gsmd-connection.h: Add missing Netreg type
2007-09-06 Thomas Wood <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
2007-09-07 13:15:08 UTC (rev 2940)
+++
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
2007-09-07 13:24:24 UTC (rev 2941)
@@ -320,26 +320,12 @@
aux->u.clip.addr.number );
break;
case GSMD_EVT_NETREG:
- /* work around bugzilla.openmoko.org #454 */
- if ( aux->u.netreg.state == MOKO_GSMD_CONNECTION_NETREG_HOME
- || aux->u.netreg.state == MOKO_GSMD_CONNECTION_NETREG_ROAMING
)
- {
- g_signal_emit( G_OBJECT(self),
+ g_signal_emit( G_OBJECT(self),
moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_NETREG],
- 0,
- aux->u.netreg.state,
- aux->u.netreg.lac,
- aux->u.netreg.ci );
- }
- else
- {
- g_signal_emit( G_OBJECT(self),
- moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_NETREG],
- 0,
- aux->u.netreg.state,
- 0,
- 0 );
- }
+ 0,
+ aux->u.netreg.state,
+ aux->u.netreg.lac,
+ aux->u.netreg.ci );
break;
case GSMD_EVT_SIGNAL:
g_signal_emit( G_OBJECT(self),
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-07 16:48:37 +0200 (Fri, 07 Sep 2007)
New Revision: 2942
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c
Log:
* src/moko-contacts.c: (moko_contacts_add_contact): Use fullname for
contact display name
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-07 13:24:24 UTC (rev 2941)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-07 14:48:37 UTC (rev 2942)
@@ -1,5 +1,10 @@
2007-09-07 Thomas Wood <[EMAIL PROTECTED]>
+ * src/moko-contacts.c: (moko_contacts_add_contact): Use fullname for
+ contact display name
+
+2007-09-07 Thomas Wood <[EMAIL PROTECTED]>
+
* src/moko-dialer.c: (moko_dialer_init):#
- Prevent critical warnings if the journal cannot be loaded.
- Exit if we cannot connect to gsmd
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c
2007-09-07 13:24:24 UTC (rev 2941)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c
2007-09-07 14:48:37 UTC (rev 2942)
@@ -19,7 +19,6 @@
*/
#include <glib.h>
-
#include <stdio.h>
#include <string.h>
#include <libebook/e-book.h>
@@ -254,7 +253,7 @@
g_return_if_fail (E_IS_CONTACT (e_contact));
priv = contacts->priv;
- name = e_contact_get_const (e_contact, E_CONTACT_NAME_OR_ORG);
+ name = e_contact_get_const (e_contact, E_CONTACT_FULL_NAME);
if (!name || (g_utf8_strlen (name, -1) <= 0))
name = "Unknown";
@@ -280,8 +279,6 @@
entry->number = normalize (phone);
entry->contact = m_contact;
- g_debug ("%s %s", m_contact->name, entry->number);
-
priv->entries = g_list_append (priv->entries, (gpointer)entry);
g_hash_table_insert (priv->prefixes,
g_strdup (entry->number),
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
