Add marshallers so that RegistrationInfo signal can be enabled.

src/Makefile.am

@@ -2,10 +2,12 @@ sbin_PROGRAMS = modem-manager
 
 modem_manager_CPPFLAGS = \
 	$(MM_CFLAGS) \
+	-I${top_builddir}/marshallers \
 	-DPLUGINDIR=\"$(pkglibdir)\"
 
 modem_manager_LDADD = \
-	$(MM_LIBS)
+	$(MM_LIBS) \
+	$(top_builddir)/marshallers/libmarshallers.la
 
 modem_manager_SOURCES = \
 	main.c \

src/mm-modem-gsm-network.c

@@ -6,6 +6,7 @@
 #include "mm-modem-gsm-network.h"
 #include "mm-errors.h"
 #include "mm-callback-info.h"
+#include "mm-marshal.h"
 
 static void impl_gsm_modem_register (MMModemGsmNetwork *modem,
                                      const char *network_id,
@@ -451,8 +452,6 @@ mm_modem_gsm_network_init (gpointer g_iface)
                       G_TYPE_NONE, 1,
                       G_TYPE_UINT);
 
-    /* FIXME */
-#if 0
     signals[REGISTRATION_INFO] =
         g_signal_new ("registration-info",
                       iface_type,
@@ -462,7 +461,6 @@ mm_modem_gsm_network_init (gpointer g_iface)
                       mm_marshal_VOID__UINT_STRING_STRING,
                       G_TYPE_NONE, 3,
                       G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
-#endif
 
     signals[NETWORK_MODE] =
         g_signal_new ("network-mode",

src/mm-serial.c

@@ -387,7 +387,7 @@ mm_serial_timed_out (gpointer data)
                                  "Serial command timed out");
     /* FIXME: This is not completely correct - if the response finally arrives and there's
        some other command waiting for response right now, the other command will
-       get the output of the timed out command. Maybe flashing would help here? */
+       get the output of the timed out command. Not sure what to do here. */
     mm_serial_got_response (self, error);
 
     return FALSE;