Lots of random fixes:

Rework the MMCallbackInfo callback invocation.
Always use g_error_literal() where it makes sense.
Replace sleep() calls, with timeouts to not block the whole MM.

12 files changed, 199 insertions, 182 deletions

diff --git a/plugins/mm-modem-hso.c b/plugins/mm-modem-hso.c
index 28108ffd..880a4edb 100644
--- a/plugins/mm-modem-hso.c
+++ b/plugins/mm-modem-hso.c
@@ -223,19 +223,14 @@ free_dns_array (gpointer data)
 }
 
 static void
-ip4_callback_wrapper (MMModem *modem,
-                      GError *error,
-                      gpointer user_data)
+ip4_config_invoke (MMCallbackInfo *info)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemHsoIp4Fn callback;
+    MMModemHsoIp4Fn callback = (MMModemHsoIp4Fn) info->callback;
 
-    callback = mm_callback_info_get_data (info, "callback");
-    callback (MM_MODEM_HSO (modem),
+    callback (MM_MODEM_HSO (info->modem),
               GPOINTER_TO_UINT (mm_callback_info_get_data (info, "ip4-address")),
-              mm_callback_info_get_data (info, "ip4-dns"),
-              error,
-              mm_callback_info_get_data (info, "user-data"));
+              (GArray *) mm_callback_info_get_data (info, "ip4-dns"),
+              info->error, info->user_data);
 }
 
 static void
@@ -305,11 +300,7 @@ mm_hso_modem_get_ip4_config (MMModemHso *self,
     g_return_if_fail (MM_IS_MODEM_HSO (self));
     g_return_if_fail (callback != NULL);
 
-    info = mm_callback_info_new (MM_MODEM (self), ip4_callback_wrapper, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "callback", callback, NULL);
-    mm_callback_info_set_data (info, "user-data", user_data, NULL);
-
+    info = mm_callback_info_new_full (MM_MODEM (self), ip4_config_invoke, G_CALLBACK (callback), user_data);
     command = g_strdup_printf ("AT_OWANDATA=%d", hso_get_cid (self));
     mm_serial_queue_command (MM_SERIAL (self), command, 3, get_ip4_config_done, info);
     g_free (command);
diff --git a/plugins/mm-modem-huawei.c b/plugins/mm-modem-huawei.c
index efcae1bd..cb4791b6 100644
--- a/plugins/mm-modem-huawei.c
+++ b/plugins/mm-modem-huawei.c
@@ -41,14 +41,14 @@ static void
 parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
 {
     MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemFn cb = (MMModemFn) mm_callback_info_get_data (info, "callback");
 
-    if (!error) {
+    if (error)
+        info->error = g_error_copy (error);
+    else
         /* Enable unsolicited registration state changes */
         mm_serial_queue_command (MM_SERIAL (modem), "+CREG=1", 5, NULL, NULL);
-    }
 
-    cb (modem, error, mm_callback_info_get_data (info, "user-data"));
+    mm_callback_info_schedule (info);
 }
 
 static void
@@ -64,10 +64,7 @@ enable (MMModem *modem,
     if (enable) {
         MMCallbackInfo *info;
 
-        info = mm_callback_info_new (modem, parent_enable_done, NULL);
-        info->user_data = info;
-        mm_callback_info_set_data (info, "callback", callback, NULL);
-        mm_callback_info_set_data (info, "user-data", user_data, NULL);
+        info = mm_callback_info_new (modem, callback, user_data);
         parent_modem_iface->enable (modem, enable, parent_enable_done, info);
     } else
         parent_modem_iface->enable (modem, enable, callback, user_data);
@@ -161,7 +158,7 @@ set_network_mode (MMModemGsmNetwork *modem,
         mm_callback_info_set_data (info, "mode-b", GINT_TO_POINTER (2), NULL);
         break;
     default:
-        info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "%s", "Invalid mode.");
+        info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Invalid mode.");
         mm_callback_info_schedule (info);
         return;
         break;
@@ -197,8 +194,8 @@ get_network_mode_done (MMSerial *serial,
         }
 
         if (result == 0)
-            info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
-                                       "%s", "Could not parse network mode results");
+            info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
+                                               "Could not parse network mode results");
         else
             mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
     }
@@ -280,7 +277,7 @@ set_band (MMModemGsmNetwork *modem,
         mm_callback_info_set_data (info, "band", GUINT_TO_POINTER (0x200000), NULL);
         break;
     default:
-        info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "%s", "Invalid band.");
+        info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Invalid band.");
         mm_callback_info_schedule (info);
         return;
         break;
@@ -314,8 +311,8 @@ get_band_done (MMSerial *serial,
         }
 
         if (result == 0xdeadbeaf)
-            info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
-                                       "%s", "Could not parse band results");
+            info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
+                                               "Could not parse band results");
         else
             mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
     }
diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c
index 74e9bc25..10415bcc 100644
--- a/plugins/mm-modem-mbm.c
+++ b/plugins/mm-modem-mbm.c
@@ -308,8 +308,8 @@ get_network_mode_done (MMSerial *serial,
         }
 
         if (result == 0)
-            info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
-                                       "%s", "Could not parse network mode results");
+            info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
+                                               "Could not parse network mode results");
         else
             mm_callback_info_set_result (info, GUINT_TO_POINTER (result), NULL);
     }
diff --git a/plugins/mm-modem-option.c b/plugins/mm-modem-option.c
index a45bc36e..f5bf4fc9 100644
--- a/plugins/mm-modem-option.c
+++ b/plugins/mm-modem-option.c
@@ -33,6 +33,18 @@ pin_check_done (MMModem *modem, GError *error, gpointer user_data)
     mm_callback_info_schedule (info);
 }
 
+static gboolean
+option_enabled (gpointer data)
+{
+    MMCallbackInfo *info = (MMCallbackInfo *) data;
+
+    /* Now check the PIN explicitly, option doesn't seem to report
+       that it needs it otherwise */
+    mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
+
+    return FALSE;
+}
+
 static void
 parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
 {
@@ -43,11 +55,7 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
     else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "option-enable"))) {
         /* Option returns OK on +CFUN=1 right away but needs some time
            to finish initialization */
-        sleep (10);
-
-        /* Now check the PIN explicitly, option doesn't seem to report
-           that it needs it otherwise */
-        mm_generic_gsm_check_pin (MM_GENERIC_GSM (modem), pin_check_done, info);
+        g_timeout_add_seconds (10, option_enabled, info);
         return;
     }
 
@@ -110,8 +118,8 @@ get_network_mode_done (MMSerial *serial,
     }
 
     if (!error && !parsed)
-        info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
-                                   "%s", "Could not parse network mode results");
+        info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
+                                           "Could not parse network mode results");
 
     mm_callback_info_schedule (info);
 }
diff --git a/plugins/mm-modem-sierra.c b/plugins/mm-modem-sierra.c
index 5018525a..95ffe779 100644
--- a/plugins/mm-modem-sierra.c
+++ b/plugins/mm-modem-sierra.c
@@ -24,6 +24,28 @@ mm_modem_sierra_new (const char *data_device,
 }
 
 static void
+pin_check_done (MMModem *modem, GError *error, gpointer user_data)
+{
+    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
+
+    if (error)
+        info->error = g_error_copy (error);
+    mm_callback_info_schedule (info);
+}
+
+static gboolean
+sierra_enabled (gpointer data)
+{
+    MMCallbackInfo *info = (MMCallbackInfo *) data;
+
+    /* Now check the PIN explicitly, sierra doesn't seem to report
+       that it needs it otherwise */
+    mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
+
+    return FALSE;
+}
+
+static void
 parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
 {
     MMCallbackInfo *info = (MMCallbackInfo *) user_data;
@@ -33,7 +55,8 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
     else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "sierra-enable"))) {
         /* Sierra returns OK on +CFUN=1 right away but needs some time
            to finish initialization */
-        sleep (10);
+        g_timeout_add_seconds (10, sierra_enabled, info);
+        return;
     }
 
     mm_callback_info_schedule (info);
diff --git a/src/mm-callback-info.c b/src/mm-callback-info.c
index 61283b26..ba76b18f 100644
--- a/src/mm-callback-info.c
+++ b/src/mm-callback-info.c
@@ -3,22 +3,45 @@
 #include "mm-callback-info.h"
 #include "mm-errors.h"
 
+#define CALLBACK_INFO_RESULT "callback-info-result"
+
+static void
+invoke_mm_modem_fn (MMCallbackInfo *info)
+{
+    MMModemFn callback = (MMModemFn) info->callback;
+
+    callback (info->modem, info->error, info->user_data);
+}
+
+static void
+invoke_mm_modem_uint_fn (MMCallbackInfo *info)
+{
+    MMModemUIntFn callback = (MMModemUIntFn) info->callback;
+
+    callback (info->modem,
+              GPOINTER_TO_UINT (mm_callback_info_get_data (info, CALLBACK_INFO_RESULT)),
+              info->error, info->user_data);
+}
+
+static void
+invoke_mm_modem_string_fn (MMCallbackInfo *info)
+{
+    MMModemStringFn callback = (MMModemStringFn) info->callback;
+
+    callback (info->modem,
+              (const char *) mm_callback_info_get_data (info, CALLBACK_INFO_RESULT),
+              info->error, info->user_data);
+}
+
 static void
 callback_info_done (gpointer user_data)
 {
     MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    gpointer result;
 
     info->pending_id = 0;
 
-    result = mm_callback_info_get_data (info, "callback-info-result");
-
-    if (info->async_callback)
-        info->async_callback (info->modem, info->error, info->user_data);
-    else if (info->uint_callback)
-        info->uint_callback (info->modem, GPOINTER_TO_UINT (result), info->error, info->user_data);
-    else if (info->str_callback)
-        info->str_callback (info->modem, (const char *) result, info->error, info->user_data);
+    if (info->invoke_fn && info->callback)
+        info->invoke_fn (info);
 
     if (info->error)
         g_error_free (info->error);
@@ -45,33 +68,41 @@ mm_callback_info_schedule (MMCallbackInfo *info)
 }
 
 MMCallbackInfo *
-mm_callback_info_new (MMModem *modem, MMModemFn callback, gpointer user_data)
+mm_callback_info_new_full (MMModem *modem,
+                           MMCallbackInfoInvokeFn invoke_fn,
+                           GCallback callback,
+                           gpointer user_data)
 {
     MMCallbackInfo *info;
 
+    g_return_val_if_fail (modem != NULL, NULL);
+
     info = g_slice_new0 (MMCallbackInfo);
     g_datalist_init (&info->qdata);
     info->modem = g_object_ref (modem);
-    info->async_callback = callback;
+    info->invoke_fn = invoke_fn;
+    info->callback = callback;
     info->user_data = user_data;
 
     return info;
 }
 
 MMCallbackInfo *
+mm_callback_info_new (MMModem *modem, MMModemFn callback, gpointer user_data)
+{
+    g_return_val_if_fail (modem != NULL, NULL);
+
+    return mm_callback_info_new_full (modem, invoke_mm_modem_fn, (GCallback) callback, user_data);
+}
+
+MMCallbackInfo *
 mm_callback_info_uint_new (MMModem *modem,
                            MMModemUIntFn callback,
                            gpointer user_data)
 {
-    MMCallbackInfo *info;
+    g_return_val_if_fail (modem != NULL, NULL);
 
-    info = g_slice_new0 (MMCallbackInfo);
-    g_datalist_init (&info->qdata);
-    info->modem = g_object_ref (modem);
-    info->uint_callback = callback;
-    info->user_data = user_data;
-
-    return info;
+    return mm_callback_info_new_full (modem, invoke_mm_modem_uint_fn, (GCallback) callback, user_data);
 }
 
 MMCallbackInfo *
@@ -79,15 +110,9 @@ mm_callback_info_string_new (MMModem *modem,
                              MMModemStringFn callback,
                              gpointer user_data)
 {
-    MMCallbackInfo *info;
-
-    info = g_slice_new0 (MMCallbackInfo);
-    g_datalist_init (&info->qdata);
-    info->modem = g_object_ref (modem);
-    info->str_callback = callback;
-    info->user_data = user_data;
+    g_return_val_if_fail (modem != NULL, NULL);
 
-    return info;
+    return mm_callback_info_new_full (modem, invoke_mm_modem_string_fn, (GCallback) callback, user_data);
 }
 
 void
@@ -95,7 +120,9 @@ mm_callback_info_set_result (MMCallbackInfo *info,
                              gpointer data,
                              GDestroyNotify destroy)
 {
-    mm_callback_info_set_data (info, "callback-info-result", data, destroy);
+    g_return_if_fail (info != NULL);
+
+    mm_callback_info_set_data (info, CALLBACK_INFO_RESULT, data, destroy);
 }
 
 void
@@ -104,6 +131,9 @@ mm_callback_info_set_data (MMCallbackInfo *info,
                            gpointer data,
                            GDestroyNotify destroy)
 {
+    g_return_if_fail (info != NULL);
+    g_return_if_fail (key != NULL);
+
     g_datalist_id_set_data_full (&info->qdata, g_quark_from_string (key), data,
                                  data ? destroy : (GDestroyNotify) NULL);
 }
@@ -113,6 +143,9 @@ mm_callback_info_get_data (MMCallbackInfo *info, const char *key)
 {
     GQuark quark;
 
+    g_return_val_if_fail (info != NULL, NULL);
+    g_return_val_if_fail (key != NULL, NULL);
+
     quark = g_quark_try_string (key);
 
     return quark ? g_datalist_id_get_data (&info->qdata, quark) : NULL;
diff --git a/src/mm-callback-info.h b/src/mm-callback-info.h
index 5c461c58..c6c6c73a 100644
--- a/src/mm-callback-info.h
+++ b/src/mm-callback-info.h
@@ -5,18 +5,26 @@
 
 #include "mm-modem.h"
 
-typedef struct {
+typedef struct _MMCallbackInfo MMCallbackInfo;
+
+typedef void (*MMCallbackInfoInvokeFn) (MMCallbackInfo *info);
+
+struct _MMCallbackInfo {
     GData *qdata;
     MMModem *modem;
 
-    MMModemFn async_callback;
-    MMModemUIntFn uint_callback;
-    MMModemStringFn str_callback;
+    MMCallbackInfoInvokeFn invoke_fn;
+    GCallback callback;
 
     gpointer user_data;
     GError *error;
     guint pending_id;
-} MMCallbackInfo;
+};
+
+MMCallbackInfo *mm_callback_info_new_full (MMModem *modem,
+                                           MMCallbackInfoInvokeFn invoke_fn,
+                                           GCallback callback,
+                                           gpointer user_data);
 
 MMCallbackInfo *mm_callback_info_new      (MMModem *modem,
                                            MMModemFn callback,
diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c
index b08ad3bf..c5349046 100644
--- a/src/mm-generic-gsm.c
+++ b/src/mm-generic-gsm.c
@@ -109,8 +109,8 @@ pin_check_done (MMSerial *serial,
     }
 
     if (!info->error && !parsed)
-        info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
-                                   "%s", "Could not parse PIN request results");
+        info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
+                                           "Could not parse PIN request results");
 
     mm_callback_info_schedule (info);
 }
@@ -247,22 +247,15 @@ get_imsi (MMModemGsmCard *modem,
 }
 
 static void
-card_info_wrapper (MMModem *modem,
-                   GError *error,
-                   gpointer user_data)
+gsm_card_info_invoke (MMCallbackInfo *info)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemGsmCardInfoFn info_cb;
-    gpointer data;
+    MMModemGsmCardInfoFn callback = (MMModemGsmCardInfoFn) info->callback;
 
-    info_cb = (MMModemGsmCardInfoFn) mm_callback_info_get_data (info, "card-info-callback");
-    data = mm_callback_info_get_data (info, "card-info-data");
-    
-    info_cb (MM_MODEM_GSM_CARD (modem),
-             (char *) mm_callback_info_get_data (info, "card-info-manufacturer"),
-             (char *) mm_callback_info_get_data (info, "card-info-model"),
-             (char *) mm_callback_info_get_data (info, "card-info-version"),
-             error, data);
+    callback (MM_MODEM_GSM_CARD (info->modem),
+              (char *) mm_callback_info_get_data (info, "card-info-manufacturer"),
+              (char *) mm_callback_info_get_data (info, "card-info-model"),
+              (char *) mm_callback_info_get_data (info, "card-info-version"),
+              info->error, info->user_data);
 }
 
 static void
@@ -316,10 +309,10 @@ get_card_info (MMModemGsmCard *modem,
 {
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (MM_MODEM (modem), card_info_wrapper, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "card-info-callback", callback, NULL);
-    mm_callback_info_set_data (info, "card-info-data", user_data, NULL);
+    info = mm_callback_info_new_full (MM_MODEM (modem),
+                                      gsm_card_info_invoke,
+                                      G_CALLBACK (callback),
+                                      user_data);
 
     mm_serial_queue_command (MM_SERIAL (modem), "+CGMI", 3, get_manufacturer_done, info);
     mm_serial_queue_command (MM_SERIAL (modem), "+CGMM", 3, get_model_done, info);
@@ -685,19 +678,17 @@ do_register (MMModemGsmNetwork *modem,
 }
 
 static void
-get_registration_info_done (MMModem *modem, GError *error, gpointer user_data)
+gsm_network_reg_info_invoke (MMCallbackInfo *info)
 {
-    MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemGsmNetworkRegInfoFn reg_info_fn;
+    MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (info->modem);
+    MMModemGsmNetworkRegInfoFn callback = (MMModemGsmNetworkRegInfoFn) info->callback;
 
-    reg_info_fn = (MMModemGsmNetworkRegInfoFn) mm_callback_info_get_data (info, "reg-info-callback");
-    reg_info_fn (MM_MODEM_GSM_NETWORK (modem),
-                 priv->reg_status,
-                 priv->oper_code,
-                 priv->oper_name,
-                 NULL,
-                 mm_callback_info_get_data (info, "reg-info-data"));
+    callback (MM_MODEM_GSM_NETWORK (info->modem),
+              priv->reg_status,
+              priv->oper_code,
+              priv->oper_name,
+              info->error,
+              info->user_data);
 }
 
 static void
@@ -707,10 +698,10 @@ get_registration_info (MMModemGsmNetwork *self,
 {
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (MM_MODEM (self), get_registration_info_done, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "reg-info-callback", callback, NULL);
-    mm_callback_info_set_data (info, "reg-info-data", user_data, NULL);
+    info = mm_callback_info_new_full (MM_MODEM (self),
+                                      gsm_network_reg_info_invoke,
+                                      G_CALLBACK (callback),
+                                      user_data);
 
     mm_callback_info_schedule (info);
 }
@@ -799,20 +790,14 @@ disconnect (MMModem *modem,
 }
 
 static void
-scan_callback_wrapper (MMModem *modem,
-                       GError *error,
-                       gpointer user_data)
+gsm_network_scan_invoke (MMCallbackInfo *info)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemGsmNetworkScanFn scan_fn;
-    GPtrArray *results;
-    gpointer data;
-
-    scan_fn = (MMModemGsmNetworkScanFn) mm_callback_info_get_data (info, "scan-callback");
-    results = (GPtrArray *) mm_callback_info_get_data (info, "scan-results");
-    data = mm_callback_info_get_data (info, "scan-data");
+    MMModemGsmNetworkScanFn callback = (MMModemGsmNetworkScanFn) info->callback;
 
-    scan_fn (MM_MODEM_GSM_NETWORK (modem), results, error, data);
+    callback (MM_MODEM_GSM_NETWORK (info->modem),
+              (GPtrArray *) mm_callback_info_get_data (info, "scan-results"),
+              info->error,
+              info->user_data);
 }
 
 static void
@@ -888,10 +873,10 @@ scan (MMModemGsmNetwork *modem,
 {
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (MM_MODEM (modem), scan_callback_wrapper, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "scan-callback", callback, NULL);
-    mm_callback_info_set_data (info, "scan-data", user_data, NULL);
+    info = mm_callback_info_new_full (MM_MODEM (modem),
+                                      gsm_network_scan_invoke,
+                                      G_CALLBACK (callback),
+                                      user_data);
 
     mm_serial_queue_command (MM_SERIAL (modem), "+COPS=?", 60, scan_done, info);
 }
diff --git a/src/mm-modem-cdma.c b/src/mm-modem-cdma.c
index f58122a8..5d921c99 100644
--- a/src/mm-modem-cdma.c
+++ b/src/mm-modem-cdma.c
@@ -26,8 +26,8 @@ uint_op_not_supported (MMModem *self,
     MMCallbackInfo *info;
 
     info = mm_callback_info_uint_new (self, callback, user_data);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
     mm_callback_info_schedule (info);
 }
 
diff --git a/src/mm-modem-gsm-card.c b/src/mm-modem-gsm-card.c
index 18f4aba0..ffe4f2eb 100644
--- a/src/mm-modem-gsm-card.c
+++ b/src/mm-modem-gsm-card.c
@@ -50,28 +50,15 @@ str_call_done (MMModem *modem, const char *result, GError *error, gpointer user_
 }
 
 static void
-str_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data)
-{
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemStringFn callback;
-
-    callback = (MMModemStringFn) mm_callback_info_get_data (info, "str-callback");
-    callback (MM_MODEM (modem), NULL, error, mm_callback_info_get_data (info, "str-data"));
-}
-
-static void
 str_call_not_supported (MMModemGsmCard *self,
                         MMModemStringFn callback,
                         gpointer user_data)
 {
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (MM_MODEM (self), str_not_supported_wrapper, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "str-callback", callback, NULL);
-    mm_callback_info_set_data (info, "str-data", user_data, NULL);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info = mm_callback_info_string_new (MM_MODEM (self), callback, user_data);
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
 
     mm_callback_info_schedule (info);
 }
@@ -93,13 +80,11 @@ info_call_done (MMModemGsmCard *self,
 }
 
 static void
-info_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data)
+info_invoke (MMCallbackInfo *info)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemGsmCardInfoFn callback;
+    MMModemGsmCardInfoFn callback = (MMModemGsmCardInfoFn) info->callback;
 
-    callback = (MMModemGsmCardInfoFn) mm_callback_info_get_data (info, "info-callback");
-    callback (MM_MODEM_GSM_CARD (modem), NULL, NULL, NULL, error, mm_callback_info_get_data (info, "info-data"));
+    callback (MM_MODEM_GSM_CARD (info->modem), NULL, NULL, NULL, info->error, info->user_data);
 }
 
 static void
@@ -109,12 +94,9 @@ info_call_not_supported (MMModemGsmCard *self,
 {
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (MM_MODEM (self), info_not_supported_wrapper, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "info-callback", callback, NULL);
-    mm_callback_info_set_data (info, "info-data", user_data, NULL);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info = mm_callback_info_new_full (MM_MODEM (self), info_invoke, G_CALLBACK (callback), user_data);
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
 
     mm_callback_info_schedule (info);
 }
@@ -138,8 +120,8 @@ async_call_not_supported (MMModemGsmCard *self,
     MMCallbackInfo *info;
 
     info = mm_callback_info_new (MM_MODEM (self), callback, user_data);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
     mm_callback_info_schedule (info);
 }
 
diff --git a/src/mm-modem-gsm-network.c b/src/mm-modem-gsm-network.c
index d7f52b7f..c49aff4b 100644
--- a/src/mm-modem-gsm-network.c
+++ b/src/mm-modem-gsm-network.c
@@ -74,8 +74,8 @@ async_call_not_supported (MMModemGsmNetwork *self,
     MMCallbackInfo *info;
 
     info = mm_callback_info_new (MM_MODEM (self), callback, user_data);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
     mm_callback_info_schedule (info);
 }
 
@@ -98,8 +98,8 @@ uint_call_not_supported (MMModemGsmNetwork *self,
     MMCallbackInfo *info;
 
     info = mm_callback_info_uint_new (MM_MODEM (self), callback, user_data);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
     mm_callback_info_schedule (info);
 }
 
@@ -123,13 +123,11 @@ reg_info_call_done (MMModemGsmNetwork *self,
 }
 
 static void
-reg_info_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data)
+reg_info_invoke (MMCallbackInfo *info)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemGsmNetworkRegInfoFn callback;
+    MMModemGsmNetworkRegInfoFn callback = (MMModemGsmNetworkRegInfoFn) info->callback;
 
-    callback = (MMModemGsmNetworkRegInfoFn) mm_callback_info_get_data (info, "reg-info-callback");
-    callback (MM_MODEM_GSM_NETWORK (modem), 0, NULL, NULL, error, mm_callback_info_get_data (info, "reg-info-data"));
+    callback (MM_MODEM_GSM_NETWORK (info->modem), 0, NULL, NULL, info->error, info->user_data);
 }
 
 static void
@@ -139,12 +137,9 @@ reg_info_call_not_supported (MMModemGsmNetwork *self,
 {
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (MM_MODEM (self), reg_info_not_supported_wrapper, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "reg-info-callback", callback, NULL);
-    mm_callback_info_set_data (info, "reg-info-data", user_data, NULL);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info = mm_callback_info_new_full (MM_MODEM (self), reg_info_invoke, G_CALLBACK (callback), user_data);
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
 
     mm_callback_info_schedule (info);
 }
@@ -164,13 +159,11 @@ scan_call_done (MMModemGsmNetwork *self,
 }
 
 static void
-scan_not_supported_wrapper (MMModem *modem, GError *error, gpointer user_data)
+gsm_network_scan_invoke (MMCallbackInfo *info)
 {
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMModemGsmNetworkScanFn callback;
+    MMModemGsmNetworkScanFn callback = (MMModemGsmNetworkScanFn) info->callback;
 
-    callback = (MMModemGsmNetworkScanFn) mm_callback_info_get_data (info, "scan-callback");
-    callback (MM_MODEM_GSM_NETWORK (modem), NULL, error, mm_callback_info_get_data (info, "scan-data"));
+    callback (MM_MODEM_GSM_NETWORK (info->modem), NULL, info->error, info->user_data);
 }
 
 static void
@@ -180,12 +173,9 @@ scan_call_not_supported (MMModemGsmNetwork *self,
 {
     MMCallbackInfo *info;
 
-    info = mm_callback_info_new (MM_MODEM (self), scan_not_supported_wrapper, NULL);
-    info->user_data = info;
-    mm_callback_info_set_data (info, "scan-callback", callback, NULL);
-    mm_callback_info_set_data (info, "scan-data", user_data, NULL);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info = mm_callback_info_new_full (MM_MODEM (self), gsm_network_scan_invoke, G_CALLBACK (callback), user_data);
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
 
     mm_callback_info_schedule (info);
 }
diff --git a/src/mm-modem.c b/src/mm-modem.c
index a1fbd1c3..88afd9c2 100644
--- a/src/mm-modem.c
+++ b/src/mm-modem.c
@@ -20,8 +20,8 @@ async_op_not_supported (MMModem *self,
     MMCallbackInfo *info;
 
     info = mm_callback_info_new (self, callback, user_data);
-    info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
-                               "%s", "Operation not supported");
+    info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED,
+                                       "Operation not supported");
     mm_callback_info_schedule (info);
 }