[Pkg-telepathy-commits] [telepathy-mission-control-6] 158/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 9db8b4d408fcab826ea4a3146d0fef53472a577c
Merge: 37365d6 84f1f56
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Jan 29 13:25:00 2014 +0000

    Merge branch 'telepathy-mission-control-5.16'
    
    Conflicts:
    	NEWS
    	configure.ac
    	src/mcd-account-manager-default.c

 NEWS                              | 12 ++++++++++++
 src/connectivity-monitor.c        |  4 ++++
 src/mcd-account-manager-default.c |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --cc NEWS
index 2dd22f4,e83edae..5a66c9c
--- a/NEWS
+++ b/NEWS
@@@ -50,11 -10,18 +50,23 @@@ Enhancements
  
  Fixes:
  
 +• UPower is no longer an optional dependency, since the API we used
 +  has been removed. This version only supports "take accounts offline before
 +  suspending" on systems with either systemd-logind, or a reimplementation
 +  with the same D-Bus API. (fd.o #70458, Simon)
 +
+ • Release logind sleep/shutdown inhibitor correctly, fixing slow
+   sleep/shutdown (fd.o #73599, Michael Kuhn)
+ 
+ • Avoid assertion failure for offline accounts that support power saving
+   (fd.o #72652, John Brooks)
+ 
+ • Fix a crash if unable to create XDG_DATA_HOME/telepathy/mission-control
+   (fd.o #72138, Sebastien Bacher)
+ 
+ • connectivity-monitor: start watching 'use-conn' key in constructed,
+   fixing the ability to switch it off (Guillaume Desmottes)
+ 
  telepathy-mission-control 5.16.0 (2013-10-02)
  =============================================
  
diff --cc src/mcd-account-manager-default.c
index 202e8c4,1403f84..85b5e4e
--- a/src/mcd-account-manager-default.c
+++ b/src/mcd-account-manager-default.c
@@@ -549,13 -229,15 +549,13 @@@ _commit (const McpAccountStorage *self
    if (!amd->save)
      return TRUE;
  
 -  dir = g_path_get_dirname (amd->filename);
 +  DEBUG ("Saving accounts to %s", amd->directory);
  
 -  DEBUG ("Saving accounts to %s", amd->filename);
 -
 -  if (!mcd_ensure_directory (dir, &error))
 +  if (!mcd_ensure_directory (amd->directory, &error))
      {
        g_warning ("%s", error->message);
-       g_error_free (error);
+       g_clear_error (&error);
 -      /* fall through anyway: writing to the file will fail, but it does
 +      /* fall through anyway: writing to the files will fail, but it does
         * give us a chance to commit to the keyring too */
      }
  

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