GNOME.org
 

[gnome-online-accounts] Rename Messenger to WindowsLive

commit 29d851e56aa31ae272fb05863a096d15f4557ee4
Author: Xavier Claessens <xclaesse gmail com>
Date:   Mon Dec 19 15:56:15 2011 +0100

    Rename Messenger to WindowsLive

 configure.ac                                       |   27 +++++++++------
 src/goabackend/Makefile.am                         |    4 +-
 src/goabackend/goabackendtypes.h                   |    4 +-
 src/goabackend/goaprovider.c                       |    6 ++--
 ...essengerprovider.c => goawindowsliveprovider.c} |   34 ++++++++++----------
 ...essengerprovider.h => goawindowsliveprovider.h} |   14 ++++----
 6 files changed, 47 insertions(+), 42 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 53921ca..fa6f57a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,19 +164,24 @@ if test "$enable_facebook" != "no"; then
   AC_DEFINE(GOA_FACEBOOK_ENABLED, 1, [Enable Facebook data provider])
 fi
 
-# Messenger
-AC_ARG_ENABLE([messenger], [AS_HELP_STRING([--enable-messenger], [Enable Messenger provider])], [], [enable_messenger=yes])
-AC_ARG_WITH(messenger-client-id,
-            [AS_HELP_STRING([--with-messenger-client-id],
-                            [Messenger OAuth 2.0 client id])],
+# Windows Live
+AC_ARG_ENABLE([windows-live], [AS_HELP_STRING([--enable-windows-live],
+                                              [Enable Windows Live provider])],
+                                              [],
+                                              [enable_windows_live=yes])
+AC_ARG_WITH(windows-live-client-id,
+            [AS_HELP_STRING([--with-windows-live-client-id],
+                            [Windows Live OAuth 2.0 client id])],
                             [],
                             [])
-if test "$with_messenger_client_id" = ""; then
-  with_messenger_client_id=0000000044067703
+if test "$with_windows_live_client_id" = ""; then
+  with_windows_live_client_id=0000000044067703
 fi
-AC_DEFINE_UNQUOTED(GOA_MESSENGER_CLIENT_ID, ["$with_messenger_client_id"], [Messenger OAuth 2.0 client id])
-if test "$enable_messenger" != "no"; then
-  AC_DEFINE(GOA_MESSENGER_ENABLED, 1, [Enable Messenger data provider])
+AC_DEFINE_UNQUOTED(GOA_WINDOWS_LIVE_CLIENT_ID,
+                   ["$with_windows_live_client_id"],
+                   [Windows Live OAuth 2.0 client id])
+if test "$enable_windows_live" != "no"; then
+  AC_DEFINE(GOA_WINDOWS_LIVE_ENABLED, 1, [Enable Windows Live data provider])
 fi
 
 # Internationalization
@@ -236,7 +241,7 @@ echo "
 	Twitter provider:           ${enable_twitter} (OAuth 1.0, key:${with_twitter_consumer_key} secret:${with_twitter_consumer_secret})
 	Yahoo provider:             ${enable_yahoo} (OAuth 1.0, key:${with_yahoo_consumer_key} secret:${with_yahoo_consumer_secret})
 	Facebook provider:          ${enable_facebook} (OAuth 2.0, id:${with_facebook_client_id} secret:${with_facebook_client_secret})
-	Messenger provider:         ${enable_messenger} (OAuth 2.0, id:${with_messenger_client_id})
+	Windows Live provider:      ${enable_windows_live} (OAuth 2.0, id:${with_windows_live_client_id})
 
         Maintainer mode:            ${USE_MAINTAINER_MODE}
         Building api docs:          ${enable_gtk_doc}
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 0aacafd..f175d38 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -55,7 +55,7 @@ libgoa_backend_1_0_la_HEADERS =						\
 	goafacebookprovider.h						\
 	goayahooprovider.h						\
 	goatwitterprovider.h						\
-	goamessengerprovider.h						\
+	goawindowsliveprovider.h					\
 	$(NULL)
 
 libgoa_backend_1_0_la_SOURCES =						\
@@ -72,7 +72,7 @@ libgoa_backend_1_0_la_SOURCES =						\
 	goafacebookprovider.h		goafacebookprovider.c		\
 	goayahooprovider.h		goayahooprovider.c		\
 	goatwitterprovider.h		goatwitterprovider.c		\
-	goamessengerprovider.h		goamessengerprovider.c		\
+	goawindowsliveprovider.h	goawindowsliveprovider.c	\
 	$(NULL)
 
 libgoa_backend_1_0_la_CPPFLAGS =				\
diff --git a/src/goabackend/goabackendtypes.h b/src/goabackend/goabackendtypes.h
index 53e1171..b69c7c8 100644
--- a/src/goabackend/goabackendtypes.h
+++ b/src/goabackend/goabackendtypes.h
@@ -57,8 +57,8 @@ typedef struct _GoaTwitterProvider GoaTwitterProvider;
 struct _GoaEditableLabel;
 typedef struct _GoaEditableLabel GoaEditableLabel;
 
-struct _GoaMessengerProvider;
-typedef struct _GoaMessengerProvider GoaMessengerProvider;
+struct _GoaWindowsLiveProvider;
+typedef struct _GoaWindowsLiveProvider GoaWindowsLiveProvider;
 
 G_END_DECLS
 
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 468984d..3d08387 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -30,7 +30,7 @@
 #include "goafacebookprovider.h"
 #include "goayahooprovider.h"
 #include "goatwitterprovider.h"
-#include "goamessengerprovider.h"
+#include "goawindowsliveprovider.h"
 
 #include "goaeditablelabel.h"
 
@@ -598,8 +598,8 @@ ensure_ep_and_builtins (void)
       type = GOA_TYPE_FACEBOOK_PROVIDER;
 #endif
 
-#ifdef GOA_MESSENGER_ENABLED
-      type = GOA_TYPE_MESSENGER_PROVIDER;
+#ifdef GOA_WINDOWS_LIVE_ENABLED
+      type = GOA_TYPE_WINDOWS_LIVE_PROVIDER;
 #endif
 
       type = type; /* silence -Wunused-but-set-variable */
diff --git a/src/goabackend/goamessengerprovider.c b/src/goabackend/goawindowsliveprovider.c
similarity index 90%
rename from src/goabackend/goamessengerprovider.c
rename to src/goabackend/goawindowsliveprovider.c
index a637c1d..6605370 100644
--- a/src/goabackend/goamessengerprovider.c
+++ b/src/goabackend/goawindowsliveprovider.c
@@ -32,36 +32,36 @@
 
 #include "goaprovider.h"
 #include "goaoauth2provider.h"
-#include "goamessengerprovider.h"
+#include "goawindowsliveprovider.h"
 
 /**
- * GoaMessengerProvider:
+ * GoaWindowsLiveProvider:
  *
- * The #GoaMessengerProvider structure contains only private data and should
+ * The #GoaWindowsLiveProvider structure contains only private data and should
  * only be accessed using the provided API.
  */
-struct _GoaMessengerProvider
+struct _GoaWindowsLiveProvider
 {
   /*< private >*/
   GoaOAuth2Provider parent_instance;
 };
 
-typedef struct _GoaMessengerProviderClass GoaMessengerProviderClass;
+typedef struct _GoaWindowsLiveProviderClass GoaWindowsLiveProviderClass;
 
-struct _GoaMessengerProviderClass
+struct _GoaWindowsLiveProviderClass
 {
   GoaOAuth2ProviderClass parent_class;
 };
 
 /**
- * SECTION:goamessengerprovider
- * @title: GoaMessengerProvider
- * @short_description: A provider for Messenger
+ * SECTION:goawindows_liveprovider
+ * @title: GoaWindowsLiveProvider
+ * @short_description: A provider for WindowsLive
  *
- * #GoaMessengerProvider is used for handling Messenger accounts.
+ * #GoaWindowsLiveProvider is used for handling WindowsLive accounts.
  */
 
-G_DEFINE_TYPE_WITH_CODE (GoaMessengerProvider, goa_messenger_provider, GOA_TYPE_OAUTH2_PROVIDER,
+G_DEFINE_TYPE_WITH_CODE (GoaWindowsLiveProvider, goa_windows_live_provider, GOA_TYPE_OAUTH2_PROVIDER,
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
 							 g_define_type_id,
 							 "windows_live",
@@ -112,7 +112,7 @@ get_redirect_uri (GoaOAuth2Provider *provider)
 static const gchar *
 get_scope (GoaOAuth2Provider *provider)
 {
-  return "wl.messenger,"
+  return "wl.windows_live,"
          "wl.offline_access,"
          "wl.emails";
 }
@@ -120,7 +120,7 @@ get_scope (GoaOAuth2Provider *provider)
 static const gchar *
 get_client_id (GoaOAuth2Provider *provider)
 {
-  return GOA_MESSENGER_CLIENT_ID;
+  return GOA_WINDOWS_LIVE_CLIENT_ID;
 }
 
 static const gchar *
@@ -238,7 +238,7 @@ build_object (GoaProvider         *provider,
   gboolean ret = FALSE;
 
   /* Chain up */
-  if (!GOA_PROVIDER_CLASS (goa_messenger_provider_parent_class)->build_object (provider,
+  if (!GOA_PROVIDER_CLASS (goa_windows_live_provider_parent_class)->build_object (provider,
                                                                               object,
                                                                               key_file,
                                                                               group,
@@ -287,7 +287,7 @@ show_account (GoaProvider         *provider,
               GtkTable            *table)
 {
   /* Chain up */
-  GOA_PROVIDER_CLASS (goa_messenger_provider_parent_class)->show_account (provider, client, object, vbox, table);
+  GOA_PROVIDER_CLASS (goa_windows_live_provider_parent_class)->show_account (provider, client, object, vbox, table);
 
   goa_util_add_row_editable_label_from_keyfile (table, object, _("User Name"), "PresentationIdentity", FALSE);
   goa_util_add_row_switch_from_keyfile (table, object, _("Chat"), "ChatEnabled");
@@ -305,12 +305,12 @@ add_account_key_values (GoaOAuth2Provider *provider,
 /* ---------------------------------------------------------------------------------------------------- */
 
 static void
-goa_messenger_provider_init (GoaMessengerProvider *client)
+goa_windows_live_provider_init (GoaWindowsLiveProvider *client)
 {
 }
 
 static void
-goa_messenger_provider_class_init (GoaMessengerProviderClass *klass)
+goa_windows_live_provider_class_init (GoaWindowsLiveProviderClass *klass)
 {
   GoaProviderClass *provider_class;
   GoaOAuth2ProviderClass *oauth2_class;
diff --git a/src/goabackend/goamessengerprovider.h b/src/goabackend/goawindowsliveprovider.h
similarity index 70%
rename from src/goabackend/goamessengerprovider.h
rename to src/goabackend/goawindowsliveprovider.h
index 4aa1503..8b846b0 100644
--- a/src/goabackend/goamessengerprovider.h
+++ b/src/goabackend/goawindowsliveprovider.h
@@ -26,19 +26,19 @@
 #error "Only <goabackend/goabackend.h> can be included directly."
 #endif
 
-#ifndef __GOA_MESSENGER_PROVIDER_H__
-#define __GOA_MESSENGER_PROVIDER_H__
+#ifndef __GOA_WINDOWS_LIVE_PROVIDER_H__
+#define __GOA_WINDOWS_LIVE_PROVIDER_H__
 
 #include <goabackend/goabackendtypes.h>
 
 G_BEGIN_DECLS
 
-#define GOA_TYPE_MESSENGER_PROVIDER   (goa_messenger_provider_get_type ())
-#define GOA_MESSENGER_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_MESSENGER_PROVIDER, GoaFacebookProvider))
-#define GOA_IS_MESSENGER_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_MESSENGER_PROVIDER))
+#define GOA_TYPE_WINDOWS_LIVE_PROVIDER   (goa_windows_live_provider_get_type ())
+#define GOA_WINDOWS_LIVE_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_WINDOWS_LIVE_PROVIDER, GoaFacebookProvider))
+#define GOA_IS_WINDOWS_LIVE_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_WINDOWS_LIVE_PROVIDER))
 
-GType goa_messenger_provider_get_type (void) G_GNUC_CONST;
+GType goa_windows_live_provider_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GOA_MESSENGER_PROVIDER_H__ */
+#endif /* __GOA_WINDOWS_LIVE_PROVIDER_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]