colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always print out which plugin created the modem.

Browse Source
This commit is contained in:
Tambet Ingo
2008-11-24 16:41:23 +02:00
parent 157da2be75
commit c44079b312
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mm-manager.c
View File

@@ -191,6 +191,11 @@ create_generic_modem (MMManager *manager, const char *udi)
g_free (serial_device); g_free (serial_device);
g_free (driver); 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; return modem;
} }
@@ -199,7 +204,6 @@ add_modem (MMManager *manager, const char *udi, MMModem *modem)
{ {
MMManagerPrivate *priv = MM_MANAGER_GET_PRIVATE (manager); MMManagerPrivate *priv = MM_MANAGER_GET_PRIVATE (manager);
g_debug ("Added modem %s", udi);
g_hash_table_insert (priv->modems, g_strdup (udi), modem); g_hash_table_insert (priv->modems, g_strdup (udi), modem);
dbus_g_connection_register_g_object (priv->connection, udi, G_OBJECT (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); modem = mm_plugin_create_modem (plugin, priv->hal_ctx, udi);
if (modem) if (modem)
add_modem (manager, udi, modem); add_modem (manager, udi, modem);
else
g_warning ("Plugin failed to create modem for UDI %s", udi);
} }
g_strfreev (udis); g_strfreev (udis);

10
src/mm-plugin.c
View File

@@ -37,11 +37,19 @@ mm_plugin_create_modem (MMPlugin *plugin,
LibHalContext *hal_ctx, LibHalContext *hal_ctx,
const char *udi) const char *udi)
{ {
MMModem *modem;
g_return_val_if_fail (MM_IS_PLUGIN (plugin), NULL); g_return_val_if_fail (MM_IS_PLUGIN (plugin), NULL);
g_return_val_if_fail (hal_ctx != NULL, NULL); g_return_val_if_fail (hal_ctx != NULL, NULL);
g_return_val_if_fail (udi != 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;
} }