[Pkg-telepathy-commits] [telepathy-mission-control-6] 132/280: Merge branch 'telepathy-mission-control-5.16'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 7942b71073f8b4d6243f338d839a8e082de138ad
Merge: 890cb5b 51eb902
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Nov 26 10:30:14 2013 +0100

    Merge branch 'telepathy-mission-control-5.16'

 src/connectivity-monitor.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --cc src/connectivity-monitor.c
index fded50b,682dfa1..286d73e
--- a/src/connectivity-monitor.c
+++ b/src/connectivity-monitor.c
@@@ -503,12 -558,25 +503,23 @@@ mcd_connectivity_monitor_init (McdConne
  }
  
  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) || defined(HAVE_UPOWER)
 +#if defined(HAVE_NM)
    McdConnectivityMonitor *connectivity_monitor = MCD_CONNECTIVITY_MONITOR (object);
    McdConnectivityMonitorPrivate *priv = connectivity_monitor->priv;
 -#endif
  
 -#ifdef HAVE_NM
    if (priv->nm_client != NULL)
      {
        g_signal_handler_disconnect (priv->nm_client,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git