Merge lp:~mardy/gnome-control-center-signon/invalid-providers-1287640 into lp:gnome-control-center-signon

[Alberto Mardegan]

Filter out invalid plugins

Also fixes a typo which was possibly causing unneeded reauthentications.

Filter out invalid plugins

Also fixes a typo which was possibly causing unneeded reauthentications.

[lp:~mardy/gnome-control-center-signon/invalid-providers-1287640]

182. By Alberto Mardegan on 2015-12-08

On account creation, filter out providers without valid plugins from the
providers list (LP: #1287640)

=== modified file 'configure.ac'
--- configure.ac	2014-01-09 12:11:48 +0000
+++ configure.ac	2015-12-08 10:10:33 +0000
@@ -96,7 +96,7 @@
    $UNITY_CONTROL_CENTER_REQUIRED])
 
 # libaccount-plugin variables.
-AC_SUBST([LIBACCOUNT_PLUGIN_SO_VERSION], [0:0:0])
+AC_SUBST([LIBACCOUNT_PLUGIN_SO_VERSION], [1:0:1])
 AC_SUBST([LIBACCOUNT_PLUGIN_API_VERSION], [1.0])
 LIBACCOUNT_PLUGIN_DIR="$libdir/libaccount-plugin-$LIBACCOUNT_PLUGIN_API_VERSION"
 AC_SUBST(LIBACCOUNT_PLUGIN_DIR)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-14 10:20:07 +0000
+++ debian/changelog	2015-12-08 10:10:33 +0000
@@ -1,3 +1,10 @@
+gnome-control-center-signon (0.1.8-0ubuntu1) UNRELEASED; urgency=medium
+
+  * On account creation, filter out providers without valid plugins from the
+    providers list (LP: #1287640)
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 08 Dec 2015 12:03:07 +0200
+
 gnome-control-center-signon (0.1.7~+14.10.20140814-0ubuntu1) utopic; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/libaccount-plugin-1.0-0.symbols'
--- debian/libaccount-plugin-1.0-0.symbols	2012-11-14 16:12:55 +0000
+++ debian/libaccount-plugin-1.0-0.symbols	2015-12-08 10:10:33 +0000
@@ -6,6 +6,7 @@
  ap_application_plugin_get_error@Base 0.0.2
  ap_application_plugin_get_type@Base 0.0.2
  ap_application_plugin_set_error@Base 0.0.2
+ ap_client_has_plugin@Base 0.1.8
  ap_client_load_application_plugin@Base 0.0.2
  ap_client_load_plugin@Base 0.0.1
  ap_oauth_plugin_get_type@Base 0.0.1

=== modified file 'libaccount-plugin/AccountPlugin.vapi'
--- libaccount-plugin/AccountPlugin.vapi	2012-07-18 08:06:52 +0000
+++ libaccount-plugin/AccountPlugin.vapi	2015-12-08 10:10:33 +0000
@@ -64,6 +64,8 @@
 	[CCode (cheader_filename = "libaccount-plugin/account-plugin.h", cname = "AP_PLUGIN_CREDENTIALS_ID_FIELD")]
 	public const string PLUGIN_CREDENTIALS_ID_FIELD;
 	[CCode (cheader_filename = "libaccount-plugin/account-plugin.h")]
+	public static bool client_has_plugin (Ag.Provider provider);
+	[CCode (cheader_filename = "libaccount-plugin/account-plugin.h")]
 	public static Ap.ApplicationPlugin client_load_application_plugin (Ag.Application application, Ag.Account account);
 	[CCode (cheader_filename = "libaccount-plugin/account-plugin.h")]
 	public static Ap.Plugin client_load_plugin (Ag.Account account);

=== modified file 'libaccount-plugin/client.c'
--- libaccount-plugin/client.c	2013-01-09 11:21:31 +0000
+++ libaccount-plugin/client.c	2015-12-08 10:10:33 +0000
@@ -36,6 +36,23 @@
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-provider.h>
 
+static gchar *
+get_module_path (AgProvider *provider)
+{
+    const gchar *plugin_name;
+    const gchar *plugin_dir;
+
+    plugin_name = ag_provider_get_plugin_name (provider);
+    if (plugin_name == NULL)
+        plugin_name = ag_provider_get_name (provider);
+
+    plugin_dir = g_getenv ("AP_PROVIDER_PLUGIN_DIR");
+    if (plugin_dir == NULL)
+        plugin_dir = LIBACCOUNT_PLUGIN_DIR "/providers";
+
+    return g_module_build_path (plugin_dir, plugin_name);
+}
+
 /**
  * ap_client_load_plugin:
  * @account: the #AgAccount to be created/edited.
@@ -49,8 +66,6 @@
 ap_client_load_plugin (AgAccount *account)
 {
     const gchar *provider_name;
-    const gchar *plugin_name;
-    const gchar *plugin_dir;
     gchar *module_path;
     AgManager *manager;
     AgProvider *provider;
@@ -75,15 +90,7 @@
     provider = ag_manager_get_provider (manager, provider_name);
     g_return_val_if_fail (provider != NULL, NULL);
 
-    plugin_name = ag_provider_get_plugin_name (provider);
-    if (plugin_name == NULL)
-        plugin_name = provider_name;
-
-    plugin_dir = g_getenv ("AP_PROVIDER_PLUGIN_DIR");
-    if (plugin_dir == NULL)
-        plugin_dir = LIBACCOUNT_PLUGIN_DIR "/providers";
-
-    module_path = g_module_build_path (plugin_dir, plugin_name);
+    module_path = get_module_path (provider);
     module = g_module_open (module_path, 0);
     if (G_UNLIKELY (module == NULL))
     {
@@ -133,6 +140,30 @@
 }
 
 /**
+ * ap_client_has_plugin:
+ * @provider: the account provider.
+ *
+ * Checks if there is a valid account plugin for creating accounts having
+ * @provider as provider.
+ *
+ * Returns: %TRUE if a plugin is found, %FALSE otherwise.
+ */
+gboolean
+ap_client_has_plugin (AgProvider *provider)
+{
+    gchar *module_path;
+    gboolean exists;
+
+    module_path = get_module_path (provider);
+    if (!module_path)
+        return FALSE;
+
+    exists = g_file_test (module_path, G_FILE_TEST_EXISTS);
+    g_free (module_path);
+    return exists;
+}
+
+/**
  * ap_client_load_application_plugin:
  * @application: the #AgApplication.
  * @account: the #AgAccount to be edited.

=== modified file 'libaccount-plugin/client.h'
--- libaccount-plugin/client.h	2012-05-14 11:55:10 +0000
+++ libaccount-plugin/client.h	2015-12-08 10:10:33 +0000
@@ -33,6 +33,7 @@
 typedef struct _ApApplicationPlugin ApApplicationPlugin;
 
 ApPlugin *ap_client_load_plugin (AgAccount *account);
+gboolean ap_client_has_plugin (AgProvider *provider);
 
 ApApplicationPlugin *
 ap_client_load_application_plugin (AgApplication *application,

=== modified file 'src/cc-credentials-accounts-model.vala'
--- src/cc-credentials-accounts-model.vala	2013-02-11 11:53:25 +0000
+++ src/cc-credentials-accounts-model.vala	2015-12-08 10:10:33 +0000
@@ -284,7 +284,7 @@
             string property_name;
             change.get ("{sv}", out property_name, null);
 
-            if (property_name == "Failures");
+            if (property_name == "Failures")
             {
                 on_indicator_notify_failures ();
             }

=== modified file 'src/cc-credentials-providers-model.vala'
--- src/cc-credentials-providers-model.vala	2013-06-05 09:00:55 +0000
+++ src/cc-credentials-providers-model.vala	2015-12-08 10:10:33 +0000
@@ -174,6 +174,9 @@
     {
         Icon provider_icon = null;
 
+        if (!Ap.client_has_plugin (provider))
+            return;
+
         try
         {
             provider_icon = Icon.new_for_string (provider.get_icon_name ());