diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-29 18:43:01 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-30 00:33:30 +0200 |
| commit | 4114eabaa31bb10ec3af14a7308760f0fbe42608 (patch) | |
| tree | d518cccecfe60b1a1678c4fe776957692797c965 /src/mm-plugin-manager.c | |
| parent | 72602a395105006736ecf5829ba33ffcefce3692 (diff) | |
| download | ModemManager-4114eabaa31bb10ec3af14a7308760f0fbe42608.tar.gz | |
plugin-manager: never suggest result to the probe which generated the suggestion
Diffstat (limited to 'src/mm-plugin-manager.c')
| -rw-r--r-- | src/mm-plugin-manager.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mm-plugin-manager.c b/src/mm-plugin-manager.c index c4ec86490..e5a0bd9e9 100644 --- a/src/mm-plugin-manager.c +++ b/src/mm-plugin-manager.c @@ -74,6 +74,7 @@ typedef struct { static void port_probe_context_step (PortProbeContext *port_probe_ctx); static void suggest_port_probe_result (FindDeviceSupportContext *ctx, + PortProbeContext *origin, MMPlugin *suggested_plugin); static void @@ -157,7 +158,7 @@ port_probe_context_finished (PortProbeContext *port_probe_ctx) if (cancel_remaining) /* Set a NULL suggested plugin, will cancel the probes */ - suggest_port_probe_result (ctx, NULL); + suggest_port_probe_result (ctx, port_probe_ctx, NULL); } else { /* Notify the plugin to the device, if this is the first port probing @@ -171,7 +172,7 @@ port_probe_context_finished (PortProbeContext *port_probe_ctx) 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); + suggest_port_probe_result (ctx, port_probe_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. */ @@ -213,6 +214,7 @@ deferred_support_check_idle (PortProbeContext *port_probe_ctx) static void suggest_port_probe_result (FindDeviceSupportContext *ctx, + PortProbeContext *origin, MMPlugin *suggested_plugin) { GList *l; @@ -220,7 +222,8 @@ suggest_port_probe_result (FindDeviceSupportContext *ctx, for (l = ctx->running_probes; l; l = g_list_next (l)) { PortProbeContext *port_probe_ctx = l->data; - if (!port_probe_ctx->best_plugin && + if (port_probe_ctx != origin && + !port_probe_ctx->best_plugin && !port_probe_ctx->suggested_plugin) { /* TODO: Cancel probing in the port if the plugin being * checked right now is not the one being suggested. |