diff options
| author | Tambet Ingo <tambet@gmail.com> | 2008-09-16 13:03:38 +0300 |
|---|---|---|
| committer | Tambet Ingo <tambet@gmail.com> | 2008-09-16 13:10:44 +0300 |
| commit | da3bbdc893b43c52dec20216945a572632c56806 (patch) | |
| tree | 757e97e6930725231239a130876d18076b63c858 /src | |
| parent | e0c720e19c02c43c56f09be9de09cc90d46543a3 (diff) | |
Add marshallers so that RegistrationInfo signal can be enabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mm-modem-gsm-network.c | 4 | ||||
| -rw-r--r-- | src/mm-serial.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f0204704..8896e47e 100644 --- a/src/Makefile.am +++ b/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 \ diff --git a/src/mm-modem-gsm-network.c b/src/mm-modem-gsm-network.c index 7e170803..d7f52b7f 100644 --- a/src/mm-modem-gsm-network.c +++ b/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", diff --git a/src/mm-serial.c b/src/mm-serial.c index 353c5af5..103ef7f7 100644 --- a/src/mm-serial.c +++ b/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; |