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

plugin-base: keep a MMPluginSupportsResult in the async result

Browse Source 
Instead of just a boolean, provide a MMPluginSupportsResult, so that we can pass
it as is during `supports_port_finish()'.
This commit is contained in:
Aleksander Morgado
2011-09-18 22:55:47 +02:00
committed by Aleksander Morgado
parent 2588c17ad3
commit db356bb20b
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mm-plugin-base.c
View File

@@ -486,9 +486,15 @@ port_probe_run_ready (MMPortProbe *probe,
g_simple_async_result_take_error (ctx->result, error); g_simple_async_result_take_error (ctx->result, error);
} else { } else {
/* Probing succeeded */ /* Probing succeeded */
g_simple_async_result_set_op_res_gboolean ( MMPluginSupportsResult supports_result;
ctx->result,
!apply_post_probing_filters (ctx->plugin, probe)); supports_result = (apply_post_probing_filters (ctx->plugin,
probe) ?
MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED :
MM_PLUGIN_SUPPORTS_PORT_SUPPORTED);
g_simple_async_result_set_op_res_gpointer (ctx->result,
GUINT_TO_POINTER (supports_result),
NULL);
} }
/* Complete the async supports port request */ /* Complete the async supports port request */
@@ -516,12 +522,7 @@ supports_port_finish (MMPlugin *self,
return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
} }
if (g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (result))) { return (MMPluginSupportsResult) GPOINTER_TO_UINT (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)));
*level = 10; /* dummy */
return MM_PLUGIN_SUPPORTS_PORT_SUPPORTED;
}
return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
} }
static void static void
@@ -595,7 +596,9 @@ supports_port (MMPlugin *plugin,
&need_vendor_probing, &need_vendor_probing,
&need_product_probing)) { &need_product_probing)) {
/* Filtered! */ /* Filtered! */
g_simple_async_result_set_op_res_gboolean (async_result, FALSE); g_simple_async_result_set_op_res_gpointer (async_result,
GUINT_TO_POINTER (MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED),
NULL);
g_simple_async_result_complete_in_idle (async_result); g_simple_async_result_complete_in_idle (async_result);
goto out; goto out;
} }