GNOME.org
 

[gnome-online-accounts/wip/whitelist: 2/3] Consolidate the provider types and extension point names

commit 91f14fc0fedfdeffcedea9978ceff7d1c8cd8c98
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                            |   11 +++++++++++
 doc/goa-sections.txt                    |    1 -
 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/goapocketprovider.c      |    4 ++--
 src/goabackend/goatelepathyfactory.c    |    2 +-
 src/goabackend/goatelepathyprovider.c   |    2 +-
 src/goabackend/goatelepathyprovider.h   |    3 ---
 src/goabackend/goawindowsliveprovider.c |    4 ++--
 src/goabackend/goayahooprovider.c       |    4 ++--
 15 files changed, 33 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3bbf4f4..b21139d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,6 +149,7 @@ fi
 #
 
 # 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])],
@@ -159,6 +160,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=yes])
 AC_ARG_WITH(flickr-consumer-key,
             [AS_HELP_STRING([--with-flickr-consumer-key],
@@ -183,6 +185,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],
@@ -211,6 +214,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])],
@@ -221,6 +225,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])],
@@ -231,6 +236,7 @@ if test "$enable_owncloud" != "no"; then
 fi
 
 # Yahoo
+AC_DEFINE(GOA_YAHOO_NAME, ["yahoo"], [ProviderType and extension point name])
 AC_ARG_ENABLE([yahoo], [AS_HELP_STRING([--enable-yahoo], [Enable Yahoo provider])], [], [enable_yahoo=no])
 AC_ARG_WITH(yahoo-consumer-key,
             [AS_HELP_STRING([--with-yahoo-consumer-key],
@@ -255,6 +261,7 @@ if test "$enable_yahoo" != "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])],
                                           [],
@@ -276,6 +283,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])],
                                               [],
@@ -296,6 +304,7 @@ if test "$enable_windows_live" != "no"; then
 fi
 
 # Telepathy
+AC_DEFINE(GOA_TELEPATHY_NAME, ["telepathy"], [ProviderType and extension point name])
 AC_ARG_ENABLE([telepathy],
               [AS_HELP_STRING([--enable-telepathy],
               [Enable Telepathy IM provider])],
@@ -308,6 +317,7 @@ fi
 PKG_CHECK_MODULES(TP, telepathy-glib)
 
 # Pocket
+AC_DEFINE(GOA_POCKET_NAME, ["pocket"], [ProviderType and extension point name])
 AC_ARG_ENABLE([pocket], [AS_HELP_STRING([--enable-pocket],
                                               [Enable Pocket provider])],
                                               [],
@@ -328,6 +338,7 @@ if test "$enable_pocket" != "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/doc/goa-sections.txt b/doc/goa-sections.txt
index 12a5293..a718f46 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -608,7 +608,6 @@ goa_telepathy_factory_get_type
 <SECTION>
 <FILE>goatelepathyprovider</FILE>
 GoaTelepathyProvider
-GOA_TELEPATHY_PROVIDER_BASE_TYPE
 goa_telepathy_provider_new_from_protocol_name
 goa_telepathy_provider_new_from_protocol
 <SUBSECTION Standard>
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index abcd6dd..78191e3 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -56,7 +56,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));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -64,7 +64,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 f39c2d6..57ac814 100644
--- a/src/goabackend/goafacebookprovider.c
+++ b/src/goabackend/goafacebookprovider.c
@@ -58,7 +58,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));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -66,7 +66,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 cd0918b..152bdc4 100644
--- a/src/goabackend/goaflickrprovider.c
+++ b/src/goabackend/goaflickrprovider.c
@@ -59,7 +59,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));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -67,7 +67,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 3f33d55..5f499d0 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -58,7 +58,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));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -66,7 +66,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 c111551..eb7b060 100644
--- a/src/goabackend/goaimapsmtpprovider.c
+++ b/src/goabackend/goaimapsmtpprovider.c
@@ -59,7 +59,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));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -67,7 +67,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 101be61..b2958b2 100644
--- a/src/goabackend/goakerberosprovider.c
+++ b/src/goabackend/goakerberosprovider.c
@@ -64,13 +64,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 f8b4872..a1ec642 100644
--- a/src/goabackend/goaowncloudprovider.c
+++ b/src/goabackend/goaowncloudprovider.c
@@ -61,7 +61,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));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -73,7 +73,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/goapocketprovider.c b/src/goabackend/goapocketprovider.c
index dcb8035..13aabb1 100644
--- a/src/goabackend/goapocketprovider.c
+++ b/src/goabackend/goapocketprovider.c
@@ -66,7 +66,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaPocketProvider, goa_pocket_provider, GOA_TYPE_OAUTH2
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                          g_define_type_id,
-                                                         "pocket",
+                                                         GOA_POCKET_NAME,
                                                          0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -74,7 +74,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaPocketProvider, goa_pocket_provider, GOA_TYPE_OAUTH2
 static const gchar *
 get_provider_type (GoaProvider *_provider)
 {
-  return "pocket";
+  return GOA_POCKET_NAME;
 }
 
 static gchar *
diff --git a/src/goabackend/goatelepathyfactory.c b/src/goabackend/goatelepathyfactory.c
index 411c15a..d59fd53 100644
--- a/src/goabackend/goatelepathyfactory.c
+++ b/src/goabackend/goatelepathyfactory.c
@@ -40,7 +40,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaTelepathyFactory, goa_telepathy_factory, GOA_TYPE_PR
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_FACTORY_EXTENSION_POINT_NAME,
                                                          g_define_type_id,
-                                                         GOA_TELEPATHY_PROVIDER_BASE_TYPE,
+                                                         GOA_TELEPATHY_NAME,
                                                          0));
 
 /* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/goabackend/goatelepathyprovider.c b/src/goabackend/goatelepathyprovider.c
index d553e1c..c4842ef 100644
--- a/src/goabackend/goatelepathyprovider.c
+++ b/src/goabackend/goatelepathyprovider.c
@@ -1031,7 +1031,7 @@ goa_telepathy_provider_constructed (GObject *object)
     }
 
   priv->provider_type = g_strdup_printf ("%s/%s",
-      GOA_TELEPATHY_PROVIDER_BASE_TYPE, priv->protocol_name);
+      GOA_TELEPATHY_NAME, priv->protocol_name);
 }
 
 static void
diff --git a/src/goabackend/goatelepathyprovider.h b/src/goabackend/goatelepathyprovider.h
index 610c13c..99093ab 100644
--- a/src/goabackend/goatelepathyprovider.h
+++ b/src/goabackend/goatelepathyprovider.h
@@ -29,9 +29,6 @@
 
 G_BEGIN_DECLS
 
-/* All instances of this provider are in the form "telepathy/SERVICE-NAME". */
-#define GOA_TELEPATHY_PROVIDER_BASE_TYPE "telepathy"
-
 #define GOA_TYPE_TELEPATHY_PROVIDER   (goa_telepathy_provider_get_type ())
 #define GOA_TELEPATHY_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_TELEPATHY_PROVIDER, 
GoaTelepathyProvider))
 #define GOA_IS_TELEPATHY_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_TELEPATHY_PROVIDER))
diff --git a/src/goabackend/goawindowsliveprovider.c b/src/goabackend/goawindowsliveprovider.c
index d3d8ff2..44cd128 100644
--- a/src/goabackend/goawindowsliveprovider.c
+++ b/src/goabackend/goawindowsliveprovider.c
@@ -60,7 +60,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));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -68,7 +68,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 *
diff --git a/src/goabackend/goayahooprovider.c b/src/goabackend/goayahooprovider.c
index 29a684d..203bc51 100644
--- a/src/goabackend/goayahooprovider.c
+++ b/src/goabackend/goayahooprovider.c
@@ -58,7 +58,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaYahooProvider, goa_yahoo_provider, GOA_TYPE_OAUTH_PR
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
                                                         g_define_type_id,
-                                                        "yahoo",
+                                                        GOA_YAHOO_NAME,
                                                         0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -66,7 +66,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaYahooProvider, goa_yahoo_provider, GOA_TYPE_OAUTH_PR
 static const gchar *
 get_provider_type (GoaProvider *_provider)
 {
-  return "yahoo";
+  return GOA_YAHOO_NAME;
 }
 
 static gchar *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]