GNOME.org
 

[gnome-online-accounts/rhel-7.1: 31/34] Consolidate the provider types and extension point names

commit 727bd59cbd0f36124b33d199d511c21a300af91a
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu May 29 16:02:13 2014 +0200

    Consolidate the provider types and extension point names
    
    It makes obvious sense to use the name of the extension point as the
    provider type. So lets define a single macro instead of replicating the
    string literal all over the code.
    
    This will also be useful when we implement the whitelist because the
    same strings can be used in the GSettings key.
    
    Fixes: https://bugzilla.gnome.org/729173

 configure.ac                            |    8 ++++++++
 src/goabackend/goaexchangeprovider.c    |    4 ++--
 src/goabackend/goafacebookprovider.c    |    4 ++--
 src/goabackend/goaflickrprovider.c      |    4 ++--
 src/goabackend/goagoogleprovider.c      |    4 ++--
 src/goabackend/goaimapsmtpprovider.c    |    4 ++--
 src/goabackend/goakerberosprovider.c    |    4 ++--
 src/goabackend/goaowncloudprovider.c    |    4 ++--
 src/goabackend/goawindowsliveprovider.c |    4 ++--
 9 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7fc0cca..db0259e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ GOBJECT_INTROSPECTION_CHECK([0.6.2])
 #
 
 # Microsoft Exchange
+AC_DEFINE(GOA_EXCHANGE_NAME, ["exchange"], [ProviderType and extension point name])
 AC_ARG_ENABLE([exchange],
               [AS_HELP_STRING([--enable-exchange],
               [Enable Microsoft Exchange provider])],
@@ -117,6 +118,7 @@ if test "$enable_exchange" != "no"; then
 fi
 
 # Flickr
+AC_DEFINE(GOA_FLICKR_NAME, ["flickr"], [ProviderType and extension point name])
 AC_ARG_ENABLE([flickr], [AS_HELP_STRING([--enable-flickr], [Enable Flickr provider])], [], 
[enable_flickr=no])
 AC_ARG_WITH(flickr-consumer-key,
             [AS_HELP_STRING([--with-flickr-consumer-key],
@@ -141,6 +143,7 @@ if test "$enable_flickr" != "no"; then
 fi
 
 # Google
+AC_DEFINE(GOA_GOOGLE_NAME, ["google"], [ProviderType and extension point name])
 AC_ARG_ENABLE([google], [AS_HELP_STRING([--enable-google], [Enable Google provider])], [], 
[enable_google=yes])
 AC_ARG_WITH(google-client-id,
             [AS_HELP_STRING([--with-google-client-id],
@@ -169,6 +172,7 @@ if test "$enable_google" != "no"; then
 fi
 
 # IMAP/SMTP
+AC_DEFINE(GOA_IMAP_SMTP_NAME, ["imap_smtp"], [ProviderType and extension point name])
 AC_ARG_ENABLE([imap-smtp],
               [AS_HELP_STRING([--enable-imap-smtp],
               [Enable IMAP/SMTP provider])],
@@ -179,6 +183,7 @@ if test "$enable_imap_smtp" != "no"; then
 fi
 
 # ownCloud
+AC_DEFINE(GOA_OWNCLOUD_NAME, ["owncloud"], [ProviderType and extension point name])
 AC_ARG_ENABLE([owncloud],
               [AS_HELP_STRING([--enable-owncloud],
               [Enable ownCloud provider])],
@@ -189,6 +194,7 @@ if test "$enable_owncloud" != "no"; then
 fi
 
 # Facebook
+AC_DEFINE(GOA_FACEBOOK_NAME, ["facebook"], [ProviderType and extension point name])
 AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook],
                                           [Enable Facebook provider])],
                                           [],
@@ -210,6 +216,7 @@ if test "$enable_facebook" != "no"; then
 fi
 
 # Windows Live
+AC_DEFINE(GOA_WINDOWS_LIVE_NAME, ["windows_live"], [ProviderType and extension point name])
 AC_ARG_ENABLE([windows-live], [AS_HELP_STRING([--enable-windows-live],
                                               [Enable Windows Live provider])],
                                               [],
@@ -230,6 +237,7 @@ if test "$enable_windows_live" != "no"; then
 fi
 
 # Kerberos
+AC_DEFINE(GOA_KERBEROS_NAME, ["kerberos"], [ProviderType and extension point name])
 AC_ARG_ENABLE([kerberos],
               [AS_HELP_STRING([--enable-kerberos],
               [Enable kerberos support])],
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index 7b72d38..1244d70 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -62,7 +62,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaExchangeProvider, goa_exchange_provider, GOA_TYPE_PR
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "exchange",
+                                                        GOA_EXCHANGE_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -70,7 +70,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaExchangeProvider, goa_exchange_provider, GOA_TYPE_PR
 static const gchar *
 get_provider_type (GoaProvider *provider)
 {
-  return "exchange";
+  return GOA_EXCHANGE_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goafacebookprovider.c b/src/goabackend/goafacebookprovider.c
index 21da0e7..37b519a 100644
--- a/src/goabackend/goafacebookprovider.c
+++ b/src/goabackend/goafacebookprovider.c
@@ -64,7 +64,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaFacebookProvider, goa_facebook_provider, GOA_TYPE_OA
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "facebook",
+                                                        GOA_FACEBOOK_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -72,7 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaFacebookProvider, goa_facebook_provider, GOA_TYPE_OA
 static const gchar *
 get_provider_type (GoaProvider *_provider)
 {
-  return "facebook";
+  return GOA_FACEBOOK_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goaflickrprovider.c b/src/goabackend/goaflickrprovider.c
index a472669..c6204a4 100644
--- a/src/goabackend/goaflickrprovider.c
+++ b/src/goabackend/goaflickrprovider.c
@@ -65,7 +65,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaFlickrProvider, goa_flickr_provider, GOA_TYPE_OAUTH_
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "flickr",
+                                                        GOA_FLICKR_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -73,7 +73,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaFlickrProvider, goa_flickr_provider, GOA_TYPE_OAUTH_
 static const gchar *
 get_provider_type (GoaProvider *_provider)
 {
-  return "flickr";
+  return GOA_FLICKR_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index 065845d..6538023 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -64,7 +64,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaGoogleProvider, goa_google_provider, GOA_TYPE_OAUTH2
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "google",
+                                                        GOA_GOOGLE_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -72,7 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaGoogleProvider, goa_google_provider, GOA_TYPE_OAUTH2
 static const gchar *
 get_provider_type (GoaProvider *_provider)
 {
-  return "google";
+  return GOA_GOOGLE_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c
index 841327d..77972f8 100644
--- a/src/goabackend/goaimapsmtpprovider.c
+++ b/src/goabackend/goaimapsmtpprovider.c
@@ -65,7 +65,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaImapSmtpProvider, goa_imap_smtp_provider, GOA_TYPE_P
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "imap_smtp",
+                                                        GOA_IMAP_SMTP_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -73,7 +73,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaImapSmtpProvider, goa_imap_smtp_provider, GOA_TYPE_P
 static const gchar *
 get_provider_type (GoaProvider *provider)
 {
-  return "imap_smtp";
+  return GOA_IMAP_SMTP_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goakerberosprovider.c b/src/goabackend/goakerberosprovider.c
index fbe0364..7fe77f6 100644
--- a/src/goabackend/goakerberosprovider.c
+++ b/src/goabackend/goakerberosprovider.c
@@ -72,13 +72,13 @@ G_DEFINE_TYPE_WITH_CODE (GoaKerberosProvider, goa_kerberos_provider, GOA_TYPE_PR
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                          g_define_type_id,
-                                                         "kerberos",
+                                                         GOA_KERBEROS_NAME,
                                                          0));
 
 static const gchar *
 get_provider_type (GoaProvider *provider)
 {
-  return "kerberos";
+  return GOA_KERBEROS_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goaowncloudprovider.c b/src/goabackend/goaowncloudprovider.c
index b154271..cbc86d8 100644
--- a/src/goabackend/goaowncloudprovider.c
+++ b/src/goabackend/goaowncloudprovider.c
@@ -66,7 +66,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaOwncloudProvider, goa_owncloud_provider, GOA_TYPE_PR
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "owncloud",
+                                                        GOA_OWNCLOUD_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -78,7 +78,7 @@ static const gchar *WEBDAV_ENDPOINT = "remote.php/webdav/";
 static const gchar *
 get_provider_type (GoaProvider *provider)
 {
-  return "owncloud";
+  return GOA_OWNCLOUD_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goawindowsliveprovider.c b/src/goabackend/goawindowsliveprovider.c
index 3d6abf9..bb71a75 100644
--- a/src/goabackend/goawindowsliveprovider.c
+++ b/src/goabackend/goawindowsliveprovider.c
@@ -66,7 +66,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaWindowsLiveProvider, goa_windows_live_provider, GOA_
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "windows_live",
+                                                        GOA_WINDOWS_LIVE_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -74,7 +74,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaWindowsLiveProvider, goa_windows_live_provider, GOA_
 static const gchar *
 get_provider_type (GoaProvider *_provider)
 {
-  return "windows_live";
+  return GOA_WINDOWS_LIVE_NAME;
 }
 
 static gchar *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]