From c44079b3126825564ec13923ccb6e09e85ca3162 Mon Sep 17 00:00:00 2001 From: Tambet Ingo Date: Mon, 24 Nov 2008 16:41:23 +0200 Subject: Always print out which plugin created the modem. --- src/mm-manager.c | 8 +++++--- src/mm-plugin.c | 10 +++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mm-manager.c b/src/mm-manager.c index 367053ee..83683dfc 100644 --- a/src/mm-manager.c +++ b/src/mm-manager.c @@ -191,6 +191,11 @@ create_generic_modem (MMManager *manager, const char *udi) g_free (serial_device); g_free (driver); + if (modem) + g_debug ("Created new generic modem (%s)", udi); + else + g_warning ("Failed to create generic modem (%s)", udi); + return modem; } @@ -199,7 +204,6 @@ add_modem (MMManager *manager, const char *udi, MMModem *modem) { MMManagerPrivate *priv = MM_MANAGER_GET_PRIVATE (manager); - g_debug ("Added modem %s", udi); g_hash_table_insert (priv->modems, g_strdup (udi), modem); dbus_g_connection_register_g_object (priv->connection, udi, G_OBJECT (modem)); @@ -239,8 +243,6 @@ create_initial_modems_from_plugins (MMManager *manager) modem = mm_plugin_create_modem (plugin, priv->hal_ctx, udi); if (modem) add_modem (manager, udi, modem); - else - g_warning ("Plugin failed to create modem for UDI %s", udi); } g_strfreev (udis); diff --git a/src/mm-plugin.c b/src/mm-plugin.c index deca9291..e1fd21c1 100644 --- a/src/mm-plugin.c +++ b/src/mm-plugin.c @@ -37,11 +37,19 @@ mm_plugin_create_modem (MMPlugin *plugin, LibHalContext *hal_ctx, const char *udi) { + MMModem *modem; + g_return_val_if_fail (MM_IS_PLUGIN (plugin), NULL); g_return_val_if_fail (hal_ctx != NULL, NULL); g_return_val_if_fail (udi != NULL, NULL); - return MM_PLUGIN_GET_INTERFACE (plugin)->create_modem (plugin, hal_ctx, udi); + modem = MM_PLUGIN_GET_INTERFACE (plugin)->create_modem (plugin, hal_ctx, udi); + if (modem) + g_debug ("Created new %s modem (%s)", mm_plugin_get_name (plugin), udi); + else + g_warning ("Failed to create %s modem (%s)", mm_plugin_get_name (plugin), udi); + + return modem; } -- cgit v1.2.3-70-g09d2