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

device,plugin: let the MMPlugin' API know about MMDevice'

Browse Source
This commit is contained in:
Aleksander Morgado
2012-08-06 20:06:46 +02:00
parent 884aa7f2eb
commit bfc3cb27e1
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-plugin-manager.c
+7 -5
View File
@@ -165,19 +165,19 @@ port_probe_context_finished (PortProbeContext *port_probe_ctx)
g_udev_device_get_name (port_probe_ctx->port),
mm_plugin_get_name (port_probe_ctx->best_plugin),
mm_device_get_path (ctx->device));
mm_device_set_plugin (ctx->device, port_probe_ctx->best_plugin);
mm_device_set_plugin (ctx->device, G_OBJECT (port_probe_ctx->best_plugin));
/* Suggest this plugin also to other port probes */
suggest_port_probe_result (ctx, port_probe_ctx->best_plugin);
}
/* Warn if the best plugin found for this port differs from the
* best plugin found for the the first probed port. */
else if (!g_str_equal (mm_plugin_get_name (mm_device_peek_plugin (ctx->device)),
else if (!g_str_equal (mm_plugin_get_name (MM_PLUGIN (mm_device_peek_plugin (ctx->device))),
mm_plugin_get_name (port_probe_ctx->best_plugin))) {
mm_warn ("(%s/%s): plugin mismatch error (expected: '%s', got: '%s')",
g_udev_device_get_subsystem (port_probe_ctx->port),
g_udev_device_get_name (port_probe_ctx->port),
mm_plugin_get_name (mm_device_peek_plugin (ctx->device)),
mm_plugin_get_name (MM_PLUGIN (mm_device_peek_plugin (ctx->device))),
mm_plugin_get_name (port_probe_ctx->best_plugin));
}
}
@@ -392,7 +392,7 @@ port_probe_context_step (PortProbeContext *port_probe_ctx)
/* Ask the current plugin to check support of this port */
mm_plugin_supports_port (MM_PLUGIN (port_probe_ctx->current->data),
G_OBJECT (ctx->device),
ctx->device,
port_probe_ctx->port,
(GAsyncReadyCallback)plugin_supports_port_ready,
port_probe_ctx);
@@ -418,7 +418,9 @@ device_port_grabbed_cb (MMDevice *device,
port_probe_ctx->current = ctx->self->priv->plugins;
/* If we got one suggested, it will be the first one */
port_probe_ctx->suggested_plugin = mm_device_get_plugin (device);
port_probe_ctx->suggested_plugin = (!!mm_device_peek_plugin (device) ?
MM_PLUGIN (mm_device_get_plugin (device)) :
NULL);
if (port_probe_ctx->suggested_plugin)
port_probe_ctx->current = g_list_find (port_probe_ctx->current,
port_probe_ctx->suggested_plugin);