[Pkg-telepathy-commits] [telepathy-mission-control-6] 219/280: McdAccountManager: remove unused timed account storage commit

Simon McVittie smcv at debian.org
Thu Mar 27 20:07:26 UTC 2014


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 762d3c7746146b7d94b3e3c5df7d78c62e78202f
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Nov 15 16:49:04 2013 +0000

    McdAccountManager: remove unused timed account storage commit
    
    Nothing ever sets write_conf_id nonzero, so this can never be called
    any more.
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27727
---
 src/mcd-account-manager.c | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 6616824..a71350c 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -134,8 +134,6 @@ enum
     PROP_CLIENT_FACTORY
 };
 
-static guint write_conf_id = 0;
-
 static void register_dbus_service (McdAccountManager *account_manager);
 static void release_setup_lock (McdAccountManager *account_manager);
 static void setup_account_loaded (McdAccount *account,
@@ -1132,20 +1130,6 @@ properties_iface_init (TpSvcDBusPropertiesClass *iface, gpointer iface_data)
 #undef IMPLEMENT
 }
 
-static gboolean
-write_conf (gpointer userdata)
-{
-    McdStorage *storage = MCD_STORAGE (userdata);
-
-    DEBUG ("called");
-    g_source_remove (write_conf_id);
-    write_conf_id = 0;
-
-    mcd_storage_commit (storage, NULL);
-
-    return TRUE;
-}
-
 static void
 release_setup_lock (McdAccountManager *self)
 {
@@ -1614,12 +1598,6 @@ _mcd_account_manager_finalize (GObject *object)
 {
     McdAccountManagerPrivate *priv = MCD_ACCOUNT_MANAGER_PRIV (object);
 
-    if (write_conf_id)
-    {
-        write_conf (priv->storage);
-        g_assert (write_conf_id == 0);
-    }
-
     tp_clear_object (&priv->storage);
     g_free (priv->account_connections_dir);
     remove (priv->account_connections_file);

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



More information about the Pkg-telepathy-commits mailing list