aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-10-31 03:39:57 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-10-31 03:39:57 +0800
commit706b5a442030d53ada851c282411f69c30eb31ac (patch)
tree6b789475e1e63ab7521d19168617baa6b4ef13a5 /shell
parentbc0d5d40ed39c92dcdf62ae891a2e99c25237d74 (diff)
downloadgsoc2013-evolution-706b5a442030d53ada851c282411f69c30eb31ac.tar
gsoc2013-evolution-706b5a442030d53ada851c282411f69c30eb31ac.tar.gz
gsoc2013-evolution-706b5a442030d53ada851c282411f69c30eb31ac.tar.bz2
gsoc2013-evolution-706b5a442030d53ada851c282411f69c30eb31ac.tar.lz
gsoc2013-evolution-706b5a442030d53ada851c282411f69c30eb31ac.tar.xz
gsoc2013-evolution-706b5a442030d53ada851c282411f69c30eb31ac.tar.zst
gsoc2013-evolution-706b5a442030d53ada851c282411f69c30eb31ac.zip
Bug 710489 - Network detection broken at startup
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 93dde1e06d..ee30d5c8d5 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;