diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-11-26 10:30:14 +0100 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-11-26 10:30:14 +0100 |
commit | 7942b71073f8b4d6243f338d839a8e082de138ad (patch) | |
tree | 5c6276aebc7756f46190b67f0278adec73563af3 | |
parent | 890cb5b5c2dc40762e28bac39379d9ed8f0f973f (diff) | |
parent | 51eb9027ec1b72591166ecde65793c9f5877ac16 (diff) | |
download | telepathy-mission-control-7942b71073f8b4d6243f338d839a8e082de138ad.tar.gz |
Merge branch 'telepathy-mission-control-5.16'
-rw-r--r-- | src/connectivity-monitor.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c index fded50b9..286d73ee 100644 --- a/src/connectivity-monitor.c +++ b/src/connectivity-monitor.c @@ -477,9 +477,9 @@ mcd_connectivity_monitor_init (McdConnectivityMonitor *connectivity_monitor) #ifdef ENABLE_CONN_SETTING priv->settings = g_settings_new ("im.telepathy.MissionControl.FromEmpathy"); - g_settings_bind (priv->settings, "use-conn", - connectivity_monitor, "use-conn", - G_SETTINGS_BIND_GET); + /* We'll call g_settings_bind() in constructed because default values of + * properties haven't been set yet at this point and we don't want them to + * override the value from GSettings. */ #endif #ifdef HAVE_NM @@ -503,6 +503,17 @@ mcd_connectivity_monitor_init (McdConnectivityMonitor *connectivity_monitor) } static void +connectivity_monitor_constructed (GObject *object) +{ +#ifdef ENABLE_CONN_SETTING + McdConnectivityMonitor *self = MCD_CONNECTIVITY_MONITOR (object); + + g_settings_bind (self->priv->settings, "use-conn", + self, "use-conn", G_SETTINGS_BIND_GET); +#endif +} + +static void connectivity_monitor_finalize (GObject *object) { #if defined(HAVE_NM) @@ -626,6 +637,7 @@ mcd_connectivity_monitor_class_init (McdConnectivityMonitorClass *klass) oclass->finalize = connectivity_monitor_finalize; oclass->dispose = connectivity_monitor_dispose; oclass->constructor = connectivity_monitor_constructor; + oclass->constructed = connectivity_monitor_constructed; oclass->get_property = connectivity_monitor_get_property; oclass->set_property = connectivity_monitor_set_property; |