Merge remote branch 'origin/master' into creg

1 files changed, 11 insertions, 2 deletions

diff --git a/src/mm-manager.c b/src/mm-manager.c
index 32b0d2a8..1dd19026 100644
--- a/src/mm-manager.c
+++ b/src/mm-manager.c
@@ -614,8 +614,17 @@ supports_callback (MMPlugin *plugin,
              * supports it.
              */
             next_plugin = existing_plugin;
-        } else
+        } else {
+            g_debug ("(%s/%s): plugin %p (%s) existing %p (%s) info->best %p (%s)",
+                     info->subsys, info->name,
+                     plugin,
+                     plugin ? mm_plugin_get_name (plugin) : "none",
+                     existing_plugin,
+                     existing_plugin ? mm_plugin_get_name (existing_plugin) : "none",
+                     info->best_plugin,
+                     info->best_plugin ? mm_plugin_get_name (info->best_plugin) : "none");
             g_assert_not_reached ();
+        }
     } else {
         info->cur_plugin = g_slist_next (info->cur_plugin);
         if (info->cur_plugin)
@@ -626,7 +635,7 @@ supports_callback (MMPlugin *plugin,
     if (next_plugin) {
         const char *next_name = mm_plugin_get_name (next_plugin);
 
-        if (info->best_plugin && strcmp (next_name, MM_PLUGIN_GENERIC_NAME))
+        if (info->best_plugin && !strcmp (next_name, MM_PLUGIN_GENERIC_NAME))
             next_plugin = NULL;
     }