[frogr] Do not use 'oauth' prefixes in FrogrAccount and FrogrConfig

[Mario Sanchez Prada <msanchez src gnome org>]

commit 2aa8ae4cca0beb3f031b5a33f3c2c029ea195694
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Wed Apr 4 20:48:01 2012 +0200

    Do not use 'oauth' prefixes in FrogrAccount and FrogrConfig

 src/frogr-account.c    |   88 ++++++++++++-----------------------------------
 src/frogr-account.h    |   13 ++-----
 src/frogr-config.c     |   18 ++--------
 src/frogr-controller.c |   10 +++---
 4 files changed, 36 insertions(+), 93 deletions(-)
---
diff --git a/src/frogr-account.c b/src/frogr-account.c
index 6eba65b..720bee0 100644
--- a/src/frogr-account.c
+++ b/src/frogr-account.c
@@ -35,8 +35,7 @@ typedef struct _FrogrAccountPrivate FrogrAccountPrivate;
 struct _FrogrAccountPrivate
 {
   gchar *token;
-  gchar *oauth_token;
-  gchar *oauth_token_secret;
+  gchar *token_secret;
   gchar *permissions;
   gchar *id;
   gchar *username;
@@ -55,8 +54,7 @@ struct _FrogrAccountPrivate
 enum {
   PROP_0,
   PROP_TOKEN,
-  PROP_OAUTH_TOKEN,
-  PROP_OAUTH_TOKEN_SECRET,
+  PROP_TOKEN_SECRET,
   PROP_PERMISSIONS,
   PROP_ID,
   PROP_USERNAME,
@@ -85,12 +83,8 @@ _frogr_account_set_property (GObject      *object,
       frogr_account_set_token (self, g_value_get_string (value));
       break;
 
-    case PROP_OAUTH_TOKEN:
-      frogr_account_set_oauth_token (self, g_value_get_string (value));
-      break;
-
-    case PROP_OAUTH_TOKEN_SECRET:
-      frogr_account_set_oauth_token_secret (self, g_value_get_string (value));
+    case PROP_TOKEN_SECRET:
+      frogr_account_set_token_secret (self, g_value_get_string (value));
       break;
 
     case PROP_PERMISSIONS:
@@ -148,12 +142,8 @@ _frogr_account_get_property (GObject    *object,
       g_value_set_string (value, priv->token);
       break;
 
-    case PROP_OAUTH_TOKEN:
-      g_value_set_string (value, priv->oauth_token);
-      break;
-
-    case PROP_OAUTH_TOKEN_SECRET:
-      g_value_set_string (value, priv->oauth_token_secret);
+    case PROP_TOKEN_SECRET:
+      g_value_set_string (value, priv->token_secret);
       break;
 
     case PROP_PERMISSIONS:
@@ -203,8 +193,7 @@ _frogr_account_finalize (GObject *object)
   FrogrAccountPrivate *priv = FROGR_ACCOUNT_GET_PRIVATE (object);
 
   g_free (priv->token);
-  g_free (priv->oauth_token);
-  g_free (priv->oauth_token_secret);
+  g_free (priv->token_secret);
   g_free (priv->permissions);
   g_free (priv->id);
   g_free (priv->username);
@@ -231,19 +220,12 @@ frogr_account_class_init (FrogrAccountClass *klass)
                                G_PARAM_READWRITE);
   g_object_class_install_property (obj_class, PROP_TOKEN, pspec);
 
-  pspec = g_param_spec_string ("oauth-token",
-                               "oauth-token",
-                               "OAuth API authentication token",
+  pspec = g_param_spec_string ("token-secret",
+                               "token-secret",
+                               "Flickr API authentication token secret",
                                "",
                                G_PARAM_READWRITE);
-  g_object_class_install_property (obj_class, PROP_OAUTH_TOKEN, pspec);
-
-  pspec = g_param_spec_string ("oauth-token-secret",
-                               "oauth-token-secret",
-                               "OAuth API authentication token secret",
-                               "",
-                               G_PARAM_READWRITE);
-  g_object_class_install_property (obj_class, PROP_OAUTH_TOKEN_SECRET, pspec);
+  g_object_class_install_property (obj_class, PROP_TOKEN_SECRET, pspec);
 
   pspec = g_param_spec_string ("permissions",
                                "permissions",
@@ -317,8 +299,7 @@ frogr_account_init (FrogrAccount *self)
 {
   FrogrAccountPrivate *priv = FROGR_ACCOUNT_GET_PRIVATE (self);
   priv->token = NULL;
-  priv->oauth_token = NULL;
-  priv->oauth_token_secret = NULL;
+  priv->token_secret = NULL;
   priv->permissions = NULL;
   priv->id = NULL;
   priv->username = NULL;
@@ -347,11 +328,11 @@ frogr_account_new_with_token (const gchar *token)
 }
 
 FrogrAccount*
-frogr_account_new_with_oauth_tokens (const gchar *token, const gchar *token_secret)
+frogr_account_new_full (const gchar *token, const gchar *token_secret)
 {
   return FROGR_ACCOUNT (g_object_new (FROGR_TYPE_ACCOUNT,
-                                      "oauth-token", token,
-                                      "oauth-token-secret", token_secret,
+                                      "token", token,
+                                      "token-secret", token_secret,
                                       NULL));
 }
 
@@ -380,44 +361,18 @@ frogr_account_set_token (FrogrAccount *self,
 }
 
 const gchar*
-frogr_account_get_oauth_token (FrogrAccount *self)
-{
-  FrogrAccountPrivate *priv = NULL;
-
-  g_return_val_if_fail (FROGR_IS_ACCOUNT (self), NULL);
-
-  priv = FROGR_ACCOUNT_GET_PRIVATE (self);
-  return priv->oauth_token;
-}
-
-
-void
-frogr_account_set_oauth_token (FrogrAccount *self,
-                               const gchar *token)
-{
-  FrogrAccountPrivate *priv = NULL;
-
-  g_return_if_fail (FROGR_IS_ACCOUNT (self));
-
-  priv = FROGR_ACCOUNT_GET_PRIVATE (self);
-  g_free (priv->oauth_token);
-  priv->oauth_token = g_strdup (token);
-}
-
-
-const gchar*
-frogr_account_get_oauth_token_secret (FrogrAccount *self)
+frogr_account_get_token_secret (FrogrAccount *self)
 {
   FrogrAccountPrivate *priv = NULL;
 
   g_return_val_if_fail (FROGR_IS_ACCOUNT (self), NULL);
 
   priv = FROGR_ACCOUNT_GET_PRIVATE (self);
-  return priv->oauth_token_secret;
+  return priv->token_secret;
 }
 
 void
-frogr_account_set_oauth_token_secret (FrogrAccount *self,
+frogr_account_set_token_secret (FrogrAccount *self,
                                       const gchar *token_secret)
 {
   FrogrAccountPrivate *priv = NULL;
@@ -425,8 +380,8 @@ frogr_account_set_oauth_token_secret (FrogrAccount *self,
   g_return_if_fail (FROGR_IS_ACCOUNT (self));
 
   priv = FROGR_ACCOUNT_GET_PRIVATE (self);
-  g_free (priv->oauth_token_secret);
-  priv->oauth_token_secret = g_strdup (token_secret);
+  g_free (priv->token_secret);
+  priv->token_secret = g_strdup (token_secret);
 }
 
 const gchar*
@@ -677,6 +632,9 @@ frogr_account_equal (FrogrAccount *self, FrogrAccount *other)
   if (g_strcmp0 (priv_a->token, priv_b->token))
     return FALSE;
 
+  if (g_strcmp0 (priv_a->token_secret, priv_b->token_secret))
+    return FALSE;
+
   if (g_strcmp0 (priv_a->permissions, priv_b->permissions))
     return FALSE;
 
diff --git a/src/frogr-account.h b/src/frogr-account.h
index affbbf4..053d326 100644
--- a/src/frogr-account.h
+++ b/src/frogr-account.h
@@ -57,22 +57,17 @@ FrogrAccount* frogr_account_new (void);
 
 FrogrAccount* frogr_account_new_with_token (const gchar *token);
 
-FrogrAccount* frogr_account_new_with_oauth_tokens (const gchar *token, const gchar *token_secret);
+FrogrAccount* frogr_account_new_full (const gchar *token, const gchar *token_secret);
 
 const gchar* frogr_account_get_token (FrogrAccount *self);
 
 void frogr_account_set_token (FrogrAccount *self,
                               const gchar *token);
 
-const gchar* frogr_account_get_oauth_token (FrogrAccount *self);
+const gchar* frogr_account_get_token_secret (FrogrAccount *self);
 
-void frogr_account_set_oauth_token (FrogrAccount *self,
-                                    const gchar *token);
-
-const gchar* frogr_account_get_oauth_token_secret (FrogrAccount *self);
-
-void frogr_account_set_oauth_token_secret (FrogrAccount *self,
-                                           const gchar *token_secret);
+void frogr_account_set_token_secret (FrogrAccount *self,
+                                     const gchar *token_secret);
 
 const gchar* frogr_account_get_permissions (FrogrAccount *self);
 
diff --git a/src/frogr-config.c b/src/frogr-config.c
index b7ab800..6191c1d 100644
--- a/src/frogr-config.c
+++ b/src/frogr-config.c
@@ -584,18 +584,11 @@ _load_account_xml (FrogrAccount *faccount,
             frogr_account_set_token (faccount, (gchar *)content);
         }
 
-      if (xmlStrcmp (node->name, (const xmlChar*) "oauth-token") == 0)
+      if (xmlStrcmp (node->name, (const xmlChar*) "token-secret") == 0)
         {
           content = xmlNodeGetContent (node);
           if (content != NULL && content[0] != '\0')
-            frogr_account_set_oauth_token (faccount, (gchar *)content);
-        }
-
-      if (xmlStrcmp (node->name, (const xmlChar*) "oauth-token-secret") == 0)
-        {
-          content = xmlNodeGetContent (node);
-          if (content != NULL && content[0] != '\0')
-            frogr_account_set_oauth_token_secret (faccount, (gchar *)content);
+            frogr_account_set_token_secret (faccount, (gchar *)content);
         }
 
       if (xmlStrcmp (node->name, (const xmlChar*) "permissions") == 0)
@@ -765,11 +758,8 @@ _save_account_xml (FrogrAccount *faccount, xmlNodePtr parent)
     if ((token = frogr_account_get_token (faccount)))
       _xml_add_string_child (node, "token", token);
 
-    if ((token = frogr_account_get_oauth_token (faccount)))
-      _xml_add_string_child (node, "oauth-token", token);
-
-    if ((token = frogr_account_get_oauth_token_secret (faccount)))
-      _xml_add_string_child (node, "oauth-token-secret", token);
+    if ((token = frogr_account_get_token_secret (faccount)))
+      _xml_add_string_child (node, "token-secret", token);
 
     _xml_add_string_child (node, "permissions", frogr_account_get_permissions (faccount));
     _xml_add_string_child (node, "id", frogr_account_get_id (faccount));
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 9a8e106..ec4691a 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -500,7 +500,7 @@ _complete_auth_cb (GObject *object, GAsyncResult *result, gpointer data)
           FrogrAccount *account = NULL;
 
           /* Set and save the auth token and the settings to disk */
-          account = frogr_account_new_with_oauth_tokens (auth_token->token, auth_token->token_secret);
+          account = frogr_account_new_full (auth_token->token, auth_token->token_secret);
           frogr_account_set_id (account, auth_token->nsid);
           frogr_account_set_username (account, auth_token->username);
           frogr_account_set_fullname (account, auth_token->fullname);
@@ -2093,11 +2093,11 @@ frogr_controller_init (FrogrController *self)
       g_object_ref (priv->account);
 
       /* If available, set token */
-      token = frogr_account_get_oauth_token (priv->account);
+      token = frogr_account_get_token (priv->account);
       if (token != NULL)
         fsp_session_set_token (priv->session, token);
 
-      token_secret = frogr_account_get_oauth_token_secret (priv->account);
+      token_secret = frogr_account_get_token_secret (priv->account);
       if (token_secret != NULL)
         fsp_session_set_token_secret (priv->session, token_secret);
     }
@@ -2234,8 +2234,8 @@ frogr_controller_set_active_account (FrogrController *self,
         }
 
       /* Get the token for setting it later on */
-      token = frogr_account_get_oauth_token (new_account);
-      token_secret = frogr_account_get_oauth_token_secret (new_account);
+      token = frogr_account_get_token (new_account);
+      token_secret = frogr_account_get_token_secret (new_account);
     }
   else
     {