[evolution/gnome-3-10] Bug 710489 - Network detection broken at startup
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-10] Bug 710489 - Network detection broken at startup
- Date: Wed, 30 Oct 2013 19:41:57 +0000 (UTC)
commit b54c87b893652daac1d973ec64439a52f0470d06
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Oct 30 15:39:57 2013 -0400
Bug 710489 - Network detection broken at startup
(cherry picked from commit 706b5a442030d53ada851c282411f69c30eb31ac)
shell/e-shell.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 93dde1e..ee30d5c 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -70,6 +70,7 @@ struct _EShellPrivate {
guint express_mode : 1;
guint modules_loaded : 1;
guint network_available : 1;
+ guint network_available_set : 1;
guint network_available_locked : 1;
guint online : 1;
guint quit_cancelled : 1;
@@ -1588,7 +1589,12 @@ e_shell_set_network_available (EShell *shell,
if (shell->priv->network_available_locked)
return;
- if (shell->priv->network_available == network_available)
+ /* Network availablity is in an indeterminate state until
+ * the first time this function is called. Don't let our
+ * arbitrary default value block this from being handled. */
+ if (!shell->priv->network_available_set)
+ shell->priv->network_available_set = TRUE;
+ else if (shell->priv->network_available == network_available)
return;
shell->priv->network_available = network_available;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]