diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-04 18:44:40 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-04 18:44:57 +0000 |
| commit | b89a27403d632725504c21c6079b936f9c1c6c9c (patch) | |
| tree | 4a3454000cc0ac8b24085efbd498e6a3f0e6e2ed /src | |
| parent | b1970f4371d3efdf4a385cd6b4eebb6731fadd1c (diff) | |
| parent | 6ea034ad022068c581cdbf675a5be54e30d2e2f0 (diff) | |
| download | telepathy-mission-control-b89a27403d632725504c21c6079b936f9c1c6c9c.tar.gz | |
Merge branch 'gsettings'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=42068>
Diffstat (limited to 'src')
| -rw-r--r-- | src/connectivity-monitor.c | 2 | ||||
| -rw-r--r-- | src/kludge-transport.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c index 2c94e3f6..0ab8272e 100644 --- a/src/connectivity-monitor.c +++ b/src/connectivity-monitor.c @@ -485,7 +485,7 @@ mcd_connectivity_monitor_set_use_conn (McdConnectivityMonitor *connectivity_moni if (use_conn == priv->use_conn) return; - DEBUG ("use_conn GSetting key changed; new value = %s", + DEBUG ("use-conn GSettings key changed; new value = %s", use_conn ? "true" : "false"); priv->use_conn = use_conn; diff --git a/src/kludge-transport.c b/src/kludge-transport.c index 67d5b234..bdd80b81 100644 --- a/src/kludge-transport.c +++ b/src/kludge-transport.c @@ -41,6 +41,9 @@ struct _McdKludgeTransportPrivate { /* Hold a set of McdAccounts which would like to go online. */ GHashTable *pending_accounts; + + /* Application settings we steal from under Empathy's nose. */ + GSettings *settings; }; static void transport_iface_init ( @@ -82,6 +85,10 @@ mcd_kludge_transport_constructed (GObject *object) priv->pending_accounts = g_hash_table_new_full (NULL, NULL, g_object_unref, NULL); + + priv->settings = g_settings_new ("im.telepathy.MissionControl.FromEmpathy"); + g_settings_bind (priv->settings, "use-conn", priv->minotaur, "use-conn", + G_SETTINGS_BIND_GET); } static void @@ -92,6 +99,7 @@ mcd_kludge_transport_dispose (GObject *object) GObjectClass *parent_class = mcd_kludge_transport_parent_class; tp_clear_object (&priv->minotaur); + tp_clear_object (&priv->settings); g_list_free (priv->transports); priv->transports = NULL; |