5 files changed, 8 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index aae649db..854166ab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
+#include <signal.h>
 #include <syslog.h>
 #include <dbus/dbus-glib.h>
 #include "mm-manager.h"
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c
index eb9e25b0..de8c916a 100644
--- a/src/mm-generic-cdma.c
+++ b/src/mm-generic-cdma.c
@@ -77,7 +77,7 @@ flash_done (MMSerial *serial, gpointer user_data)
 
 static void
 enable (MMModem *modem,
-        gboolean enable,
+        gboolean do_enable,
         MMModemFn callback,
         gpointer user_data)
 {
@@ -85,7 +85,7 @@ enable (MMModem *modem,
 
     info = mm_callback_info_new (modem, callback, user_data);
 
-    if (!enable) {
+    if (!do_enable) {
         mm_serial_close (MM_SERIAL (modem));
         mm_callback_info_schedule (info);
         return;
diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c
index b4475cdc..a76cd698 100644
--- a/src/mm-generic-gsm.c
+++ b/src/mm-generic-gsm.c
@@ -192,7 +192,7 @@ disable_flash_done (MMSerial *serial, gpointer user_data)
 
 static void
 enable (MMModem *modem,
-        gboolean enable,
+        gboolean do_enable,
         MMModemFn callback,
         gpointer user_data)
 {
@@ -203,7 +203,7 @@ enable (MMModem *modem,
 
     info = mm_callback_info_new (modem, callback, user_data);
 
-    if (!enable) {
+    if (!do_enable) {
         if (mm_serial_is_connected (MM_SERIAL (modem)))
             mm_serial_flash (MM_SERIAL (modem), 1000, disable_flash_done, info);
         else
diff --git a/src/mm-modem-simple.c b/src/mm-modem-simple.c
index 62819cf7..713098f5 100644
--- a/src/mm-modem-simple.c
+++ b/src/mm-modem-simple.c
@@ -85,7 +85,7 @@ impl_modem_simple_connect (MMModemSimple *self,
 }
 
 static void
-get_status_done (MMModem *modem, 
+get_status_done (MMModemSimple *modem,
                  GHashTable *properties,
                  GError *error,
                  gpointer user_data)
diff --git a/src/mm-serial-parsers.c b/src/mm-serial-parsers.c
index 5f0da7ce..2f4e2a96 100644
--- a/src/mm-serial-parsers.c
+++ b/src/mm-serial-parsers.c
@@ -93,7 +93,8 @@ mm_serial_parser_v0_parse (gpointer data,
         if (str) {
             code = atoi (str);
             g_free (str);
-        }
+        } else
+            code = MM_MOBILE_ERROR_UNKNOWN;
 
         g_match_info_free (match_info);