[ekiga/ds-gsettings3: 41/43] Merge branch 'jp-opal-roster' into ds-gsettings3

[Damien Sandras <dsandras src gnome org>]

commit e3c6a1f685046a646b092e6f592d8643b566727c
Merge: 22db27b 179e97c
Author: Damien Sandras <dsandras beip be>
Date:   Sat Dec 14 18:15:47 2013 +0100

    Merge branch 'jp-opal-roster' into ds-gsettings3

 lib/Makefile.am                                |    4 +-
 lib/engine/components/opal/opal-account.cpp    |  651 +++++++++++++++++-------
 lib/engine/components/opal/opal-account.h      |   66 ++-
 lib/engine/components/opal/opal-bank.cpp       |  165 +++++--
 lib/engine/components/opal/opal-bank.h         |   21 +-
 lib/engine/components/opal/opal-main.cpp       |    2 +
 lib/engine/components/opal/opal-presentity.cpp |  433 ++++++++++++++++
 lib/engine/components/opal/opal-presentity.h   |  138 +++++
 org.gnome.ekiga.gschema.xml.in.in              |    4 +-
 plugins/avahi/avahi-heap.cpp                   |    4 +-
 plugins/gstreamer/Makefile.am                  |    1 +
 plugins/loudmouth/loudmouth-bank.cpp           |    4 +-
 12 files changed, 1236 insertions(+), 257 deletions(-)
---
diff --cc plugins/loudmouth/loudmouth-bank.cpp
index 5ee903e,e40df18..09f16eb
--- a/plugins/loudmouth/loudmouth-bank.cpp
+++ b/plugins/loudmouth/loudmouth-bank.cpp
@@@ -89,11 -90,11 +89,11 @@@ voi
  LM::Bank::save () const
  {
    xmlChar* buffer = NULL;
-   int size = 0;
+   int docsize = 0;
  
-   xmlDocDumpMemory (doc, &buffer, &size);
+   xmlDocDumpMemory (doc, &buffer, &docsize);
  
 -  gm_conf_set_string (JABBER_KEY, (const char *)buffer);
 +  contacts_settings->set_string (JABBER_KEY, (const char *)buffer);
  
    xmlFree (buffer);
  }