r2941 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2: . libmokogsmd

[thomas at sita.openmoko.org]

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  <thomas at openedhand.com>
 
+	* 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  <thomas at openedhand.com>
+
 	* libmokogsmd/moko-gsmd-connection.h: Add missing Netreg type
 
 2007-09-06  Thomas Wood  <thomas at openedhand.com>

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),