Skip to content
Snippets Groups Projects
Commit 0a88978c authored by Emmanuel Lepage's avatar Emmanuel Lepage
Browse files

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 96770c32 85ad9736
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 204 deletions
daemon/src/dbus/Makefile.am
+ 0
− 1
View file @ 0a88978c
......@@ -50,7 +50,6 @@ $(service_DATA): $(service_in_files) Makefile
EXTRA_DIST = README $(service_in_files) \
callmanager-introspec.xml \
configurationmanager-introspec.xml \
contactmanager-introspec.xml \
instance-introspec.xml \
org.freedesktop.NetworkManager.xml
......
daemon/src/dbus/contactmanager-introspec.xml deleted 100644 → 0
+ 0
− 38
View file @ 96770c32
<?xml version="1.0" ?>
<node name="/org/sflphone/SFLphone">
<interface name="org.sflphone.SFLphone.ContactManager">
<!-- Contacts related methods -->
<!-- Called by the client to get all saved contacts -->
<method name="getContacts">
<arg type="s" name="accountID" direction="in"/>
<arg type="a{ss}" name="details" direction="out"/>
</method>
<!-- Called by the client to save all local contacts -->
<method name="setContacts">
<arg type="s" name="accountID" direction="in"/>
<arg type="a{ss}" name="details" direction="in"/>
</method>
<!-- /////////////////////// -->
<!-- Presence related methods -->
<!-- Called by the client to set its new presence status -->
<method name="setPresence">
<arg type="s" name="accountID" direction="in"/>
<arg type="s" name="presence" direction="in"/>
<arg type="s" name="additionalInfo" direction="in"/>
</method>
<!-- Called by the daemon when a contact presence changes -->
<method name="setContactPresence">
<arg type="s" name="accountID" direction="in"/>
<arg type="s" name="presence" direction="in"/>
<arg type="s" name="additionalInfo" direction="in"/>
</method>
</interface>
</node>
daemon/src/dbus/contactmanager.cpp deleted 100644 → 0
+ 0
− 60
View file @ 96770c32
/*
* Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#include <contactmanager.h>
#include "../manager.h"
const char* ContactManager::SERVER_PATH = "/org/sflphone/SFLphone/ContactManager";
std::map< std::string, std::string >
ContactManager::getContacts (const std::string& accountID UNUSED)
{
// TODO
std::map< std::string, std::string > ret;
return ret;
}
void
ContactManager::setContacts (const std::string& accountID UNUSED, const std::map< std::string UNUSED, std::string >& details UNUSED)
{
// TODO
}
void
ContactManager::setPresence (const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
{
// TODO
}
void
ContactManager::setContactPresence (const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
{
// TODO
}
daemon/src/dbus/contactmanager.h deleted 100644 → 0
+ 0
− 57
View file @ 96770c32
/*
* Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef CONTACTMANAGER_H
#define CONTACTMANAGER_H
#include "contactmanager-glue.h"
#include <dbus-c++/dbus.h>
class ContactManager
: public org::sflphone::SFLphone::ContactManager_adaptor,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{
public:
ContactManager (DBus::Connection& connection);
static const char* SERVER_PATH;
public:
std::map< std::string, std::string > getContacts (const std::string& accountID);
void setContacts (const std::string& accountID, const std::map< std::string, std::string >& details);
void setPresence (const std::string& accountID, const std::string& presence, const std::string& additionalInfo);
void setContactPresence (const std::string& accountID, const std::string& presence, const std::string& additionalInfo);
};
#endif//CONTACTMANAGER_H
gnome/src/dbus/contactmanager-introspec.xml deleted 100644 → 0
+ 0
− 38
View file @ 96770c32
<?xml version="1.0" ?>
<node name="/org/sflphone/SFLphone">
<interface name="org.sflphone.SFLphone.ContactManager">
<!-- Contacts related methods -->
<!-- Called by the client to get all saved contacts -->
<method name="getContacts">
<arg type="s" name="accountID" direction="in"/>
<arg type="a{ss}" name="details" direction="out"/>
</method>
<!-- Called by the client to save all local contacts -->
<method name="setContacts">
<arg type="s" name="accountID" direction="in"/>
<arg type="a{ss}" name="details" direction="in"/>
</method>
<!-- /////////////////////// -->
<!-- Presence related methods -->
<!-- Called by the client to set its new presence status -->
<method name="setPresence">
<arg type="s" name="accountID" direction="in"/>
<arg type="s" name="presence" direction="in"/>
<arg type="s" name="additionalInfo" direction="in"/>
</method>
<!-- Called by the daemon when a contact presence changes -->
<method name="setContactPresence">
<arg type="s" name="accountID" direction="in"/>
<arg type="s" name="presence" direction="in"/>
<arg type="s" name="additionalInfo" direction="in"/>
</method>
</interface>
</node>
gnome/src/eel-gconf-extensions.c
+ 1
− 2
View file @ 0a88978c
......@@ -28,9 +28,8 @@
#include <gconf/gconf-client.h>
#include <gconf/gconf.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <gtk/gtkmessagedialog.h>
static GConfClient *global_gconf_client = NULL;
......
gnome/src/icons/icon_factory.c
+ 1
− 1
View file @ 0a88978c
......@@ -32,7 +32,7 @@
#include "icons/pixmap_data.h"
#include <gtk/gtkiconfactory.h>
#include <gtk/gtk.h>
#include "icons/pixmap_data.h"
#include "sflphone_const.h"
......
gnome/src/widget/minidialog.c
+ 0
− 2
View file @ 0a88978c
......@@ -23,8 +23,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include <gtk/gtkhbox.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtk.h>
#include "sflphone_const.h"
#include "minidialog.h"
......
gnome/src/widget/minidialog.h
+ 0
− 2
View file @ 0a88978c
......@@ -28,8 +28,6 @@
#define __PIDGIN_MINI_DIALOG_H__
#include <glib-object.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtklabel.h>
G_BEGIN_DECLS
......
tools/build-system/launchpad/sflphone-common/debian/control.lucid
+ 1
− 1
View file @ 0a88978c
......@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-common
Priority: optional
Architecture: any
Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++, libdbus-c++-1.0
Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++, libdbus-c++-1-0
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
......
tools/build-system/launchpad/sflphone-common/debian/control.maverick
+ 1
− 1
View file @ 0a88978c
......@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-common
Priority: optional
Architecture: any
Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1.0
Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1-0
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
......
tools/build-system/launchpad/sflphone-common/debian/control.natty
+ 1
− 1
View file @ 0a88978c
......@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-common
Priority: optional
Architecture: any
Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1.0
Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1-0
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment