[Pkg-telepathy-commits] [telepathy-mission-control-6] 273/280: Merge branch 'master' into next

[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 e1f992dc0dbb0b75684e1a8c981316cfb84809e8
Merge: 404f678 f3fef7b
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Mar 19 18:36:26 2014 +0000

    Merge branch 'master' into next
    
    Conflicts:
    	src/mcd-storage.c

 mission-control-plugins/account-storage.c |  74 ++-------
 mission-control-plugins/account-storage.h |   6 -
 src/mcd-account-manager.c                 | 140 +++++++----------
 src/mcd-account.c                         |  10 ++
 src/mcd-storage.c                         | 242 ++++++++++++++++++++++++++----
 tests/twisted/Makefile.am                 |  12 ++
 tests/twisted/dbus-account-plugin.c       | 204 +++++--------------------
 tests/twisted/run-test.sh.in              |  35 +++--
 8 files changed, 356 insertions(+), 367 deletions(-)

diff --cc src/mcd-storage.c
index d5a6486,b2d57dc..9bb14ff
--- a/src/mcd-storage.c
+++ b/src/mcd-storage.c
@@@ -47,9 -47,20 +47,20 @@@ static GList *stores = NULL
  static void sort_and_cache_plugins (void);
  
  enum {
 -  PROP_DBUS_DAEMON = 1,
 +  PROP_CLIENT_FACTORY = 1,
  };
  
+ enum {
+   SIGNAL_CREATED,
+   SIGNAL_TOGGLED,
+   SIGNAL_DELETED,
+   SIGNAL_ALTERED_ONE,
+   SIGNAL_RECONNECT,
+   N_SIGNALS
+ };
+ 
+ static guint signals[N_SIGNALS] = { 0 };
+ 
  struct _McdStorageClass {
      GObjectClass parent;
  };
@@@ -146,7 -157,32 +157,32 @@@ mcd_storage_class_init (McdStorageClas
    object_class->dispose = storage_dispose;
    object_class->finalize = storage_finalize;
  
 -  g_object_class_install_property (object_class, PROP_DBUS_DAEMON, spec);
 +  g_object_class_install_property (object_class, PROP_CLIENT_FACTORY, spec);
+ 
+   signals[SIGNAL_CREATED] = g_signal_new ("created",
+       MCD_TYPE_STORAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+       NULL, G_TYPE_NONE,
+       2, MCP_TYPE_ACCOUNT_STORAGE, G_TYPE_STRING);
+ 
+   signals[SIGNAL_ALTERED_ONE] = g_signal_new ("altered-one",
+       MCD_TYPE_STORAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+       NULL, G_TYPE_NONE,
+       3, MCP_TYPE_ACCOUNT_STORAGE, G_TYPE_STRING, G_TYPE_STRING);
+ 
+   signals[SIGNAL_DELETED] = g_signal_new ("deleted",
+       MCD_TYPE_STORAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+       NULL, G_TYPE_NONE,
+       2, MCP_TYPE_ACCOUNT_STORAGE, G_TYPE_STRING);
+ 
+   signals[SIGNAL_TOGGLED] = g_signal_new ("toggled",
+       MCD_TYPE_STORAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+       NULL, G_TYPE_NONE,
+       3, MCP_TYPE_ACCOUNT_STORAGE, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ 
+   signals[SIGNAL_RECONNECT] = g_signal_new ("reconnect",
+       MCD_TYPE_STORAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+       NULL, G_TYPE_NONE,
+       2, MCP_TYPE_ACCOUNT_STORAGE, G_TYPE_STRING);
  }
  
  McdStorage *

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