[frogr] New function to check whether we've actually logged in Flickr
- From: Mario Sanchez Prada <msanchez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] New function to check whether we've actually logged in Flickr
- Date: Thu, 13 Dec 2012 17:36:29 +0000 (UTC)
commit 9c8b7cc75f42ea77fae108994c2adcc03cdd5c84
Author: Mario Sanchez Prada <msanchez gnome org>
Date: Thu Dec 13 11:31:11 2012 +0100
New function to check whether we've actually logged in Flickr
src/frogr-controller.c | 16 ++++++++++++++++
src/frogr-controller.h | 2 ++
src/frogr-main-view.c | 2 +-
3 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index c4e1701..af7753f 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -2720,6 +2720,22 @@ frogr_controller_revoke_authorization (FrogrController *self)
_set_active_account (self, NULL);
}
+gboolean
+frogr_controller_is_connected (FrogrController *self)
+{
+ FrogrControllerPrivate *priv = NULL;
+
+ g_return_val_if_fail(FROGR_IS_CONTROLLER (self), FALSE);
+
+ /* We can't be sure 100% about having connected to flickr until we
+ received the extra information for the current account */
+ priv = FROGR_CONTROLLER_GET_PRIVATE (self);
+ if (priv->account)
+ return frogr_account_has_extra_info (priv->account);
+
+ return FALSE;
+}
+
void
frogr_controller_load_pictures (FrogrController *self,
GSList *fileuris)
diff --git a/src/frogr-controller.h b/src/frogr-controller.h
index 4300eb8..177896b 100644
--- a/src/frogr-controller.h
+++ b/src/frogr-controller.h
@@ -115,6 +115,8 @@ gboolean frogr_controller_is_authorized (FrogrController *self);
void frogr_controller_revoke_authorization (FrogrController *self);
+gboolean frogr_controller_is_connected (FrogrController *self);
+
void frogr_controller_load_pictures (FrogrController *self, GSList *fileuris);
void frogr_controller_upload_pictures (FrogrController *self, GSList *pictures);
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index fd96096..b09b959 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -1914,7 +1914,7 @@ _craft_state_description (FrogrMainView *mainview)
priv = FROGR_MAIN_VIEW_GET_PRIVATE (mainview);
account = frogr_controller_get_active_account (priv->controller);
- if (!FROGR_IS_ACCOUNT (account) || !frogr_account_has_extra_info (account))
+ if (!FROGR_IS_ACCOUNT (account) || !frogr_controller_is_connected (priv->controller))
return g_strdup (_("Not connected to Flickr"));
/* Just use the username here ant not the fullname (when available),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]