Merge branch 'master' into release

INSTALL

 INSTALLATION GUIDE
 
 * CORE INSTALLATION
+
+    # Install dependencies (subject to change):
+      apt-get install gnome-doc-utils build-essential autoconf libtool
+      libasound2-dev libpulse-dev libsamplerate0-dev libcommoncpp2-dev
+      libccrtp-dev libzrtpcpp-dev libdbus-1-dev libdbus-c++-dev libyaml-dev
+      libpcre3-dev libgsm1-dev libspeex-dev libspeexdsp-dev libcelt-dev
+
     # Go to the root of the application core directory
     cd daemon
     # Compile pjsip
@@ -16,6 +23,10 @@ INSTALLATION GUIDE
     You are done with the core !
 
 * GNOME CLIENT INSTALLATION
+
+    # Install dependencies (subject to change):
+    apt-get install libnotify-dev libgtk2.0-dev libwebkit-dev libgnomeui-dev check
+
     # Go to the root of the gnome client directory
     cd gnome
     ./autogen.sh

NEWS

@@ -2,6 +2,8 @@
 # SFLphone
 ################################################
 
+* 2011-11-18: 1.0.1 has been released
+
 * 2011-09-30: 1.0.0 has been released
 
 * 2010-04-09: 0.9.8 rc1 has been released

astylerc

@@ -5,12 +5,14 @@
 #           Savoir-faire Linux Inc
 #          http://www.sflphone.org 
 
-style=k&r                # Kernighan & Ritchie style formatting/indenting uses linux bracket
+style=stroustrup    # stroustrup style http://astyle.sourceforge.net/astyle.html#_style=stroustrup
 indent=spaces=4     # Use spaces instead of tabs for indentation
 indent-classes      # Indent 'class' and 'struct' blocks so that the blocks 'public:', 'protected:' and 'private:' are indented
 indent-switches     # Indent 'switch' blocks so that the 'case X:' statements are indented in the switch block
 break-blocks        # Pad empty lines around header blocks (e.g. 'if', 'while'...).
 brackets=linux
-unpad=paren
-formatted
--d
+unpad-paren         # Remove unwanted space around parentheses
+pad-header          # Insert space padding after paren headers only (e.g. 'if', 'for', 'while'...)
+formatted           # only display files that have changed
+recursive           # recursively enter subdirs
+suffix=none         # don't create backup files (that's what version control is for)

daemon/README

@@ -74,7 +74,7 @@ How to compile
 --------------
 
 # First compile the SIP library
-cd libs/pjproject-1.0.3
+cd libs/pjproject
 ./autogen.sh
 ./configure --disable-ilbc-codec && make clean && make dep && make
 sudo make install

daemon/configure.ac

@@ -3,7 +3,7 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.65])
-AC_INIT([sflphone],[1.0.0],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([sflphone],[1.0.1],[sflphoneteam@savoirfairelinux.com],[sflphone])
 AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011]])
 AC_REVISION([$Revision$])
 
@@ -50,8 +50,6 @@ AC_CONFIG_FILES([src/Makefile \
 		src/audio/codecs/Makefile \
 		src/config/Makefile \
 		src/dbus/Makefile \
-		src/plug-in/Makefile \
-		src/plug-in/test/Makefile \
 		src/hooks/Makefile \
 		src/history/Makefile])
 
@@ -180,7 +178,7 @@ DBUS_CPP_REQUIRED_VERSION=0.6.0-pre1
 PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,,
 	AC_MSG_ERROR([You need the DBus-c++ libraries (version $DBUS_CPP_REQUIRED_VERSION or better)]))
 
-CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor"
+CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Weffc++ -Wfatal-errors"
 
 AC_CHECK_LIB([expat], XML_ParserCreate_MM,
 		[AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false)],

daemon/libs/utilspp/Makefile.am

@@ -3,8 +3,8 @@ SUBDIRS = singleton
 noinst_LTLIBRARIES = libutilspp.la
 
 libutilspp_la_SOURCES = \
-	NullType.hpp \
-	Singleton.hpp \
-	ThreadingSingle.hpp ThreadingSingle.inl
+	null_type.hpp \
+	singleton.hpp \
+	threading_single.hpp threading_single.inl
 
 libutilspp_la_LIBADD = ./singleton/libsingleton.la

daemon/libs/utilspp/Singleton.hpp

-#include "ThreadingSingle.hpp"
-#include "singleton/SingletonHolder.hpp"

daemon/libs/utilspp/singleton.hpp

+#include "threading_single.hpp"
+#include "singleton/singleton_holder.hpp"

daemon/libs/utilspp/singleton/Makefile.am

 noinst_LTLIBRARIES = libsingleton.la
 
 libsingleton_la_SOURCES = \
-	CreationUsingNew.hpp CreationUsingNew.inl \
-	LifetimeDefault.hpp LifetimeDefault.inl \
-	SingletonHolder.hpp SingletonHolder.inl 
-
-
-#pkginclude_HEADERS = \
-#	CreationStatic.hpp CreationStatic.inl \
-#	CreationUsingNew.hpp CreationUsingNew.inl \
-#	LifetimeDefault.hpp LifetimeDefault.inl \
-#	LifetimeLibrary.hpp LifetimeLibrary.inl \
-#	LifetimeWithLongevity.hpp LifetimeWithLongevity.inl \
-#	PrivateMembers.hpp PrivateMembers.inl \
-#	SingletonHolder.hpp SingletonHolder.inl 
-
-#pkgincludedir=$(includedir)/utilspp/singleton
-
+	creation_using_new.hpp creation_using_new.inl \
+	lifetime_default.hpp lifetime_default.inl \
+	singleton_holder.hpp singleton_holder.inl

daemon/libs/utilspp/singleton/CreationUsingNew.hpp → daemon/libs/utilspp/singleton/creation_using_new.hpp

@@ -21,8 +21,8 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef CREATION_USING_NEW_HPP
-#define CREATION_USING_NEW_HPP
+#ifndef __CREATION_USING_NEW_HPP__
+#define __CREATION_USING_NEW_HPP__
 
 /**
  * This class is a creation policy for the utilspp::singleton_holder. The
@@ -38,6 +38,5 @@ namespace utilspp
    };
 }
 
-#include "CreationUsingNew.inl"
-
-#endif
+#include "creation_using_new.inl"
+#endif // __CREATION_USING_NEW_HPP__

daemon/libs/utilspp/singleton/LifetimeDefault.hpp → daemon/libs/utilspp/singleton/lifetime_default.hpp

@@ -24,9 +24,6 @@
 #ifndef LIFETIME_DEFAULT_HPP
 #define LIFETIME_DEFAULT_HPP
 
-#include <stdexcept>
-#include <cstdlib>
-
 namespace utilspp
 {
    template< typename T >
@@ -38,6 +35,6 @@ namespace utilspp
    };
 }
 
-#include "LifetimeDefault.inl"
+#include "lifetime_default.inl"
 
 #endif

daemon/libs/utilspp/singleton/LifetimeDefault.inl → daemon/libs/utilspp/singleton/lifetime_default.inl

@@ -21,8 +21,11 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef LIFETIME_DEFAULT_INL
-#define LIFETIME_DEFAULT_INL
+#ifndef __LIFETIME_DEFAULT_INL__
+#define __LIFETIME_DEFAULT_INL__
+
+#include <cstdlib>
+#include <stdexcept>
 
 template< typename T >
 void 
@@ -38,5 +41,4 @@ utilspp::LifetimeDefault< T >::onDeadReference()
    throw std::logic_error("Dead reference detected");
 }
 
-
-#endif
+#endif // __LIFETIME_DEFAULT_INL__

daemon/libs/utilspp/singleton/SingletonHolder.hpp → daemon/libs/utilspp/singleton/singleton_holder.hpp

@@ -21,14 +21,12 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLETON_HOLDER_HPP
-#define SINGLETON_HOLDER_HPP
+#ifndef __SINGLETON_HOLDER_HPP__
+#define __SINGLETON_HOLDER_HPP__
 
-#include <cassert>
-
-#include "CreationUsingNew.hpp"
-#include "LifetimeDefault.hpp"
-#include "../ThreadingSingle.hpp"
+#include "creation_using_new.hpp"
+#include "lifetime_default.hpp"
+#include "../threading_single.hpp"
 
 namespace utilspp
 {
@@ -60,6 +58,6 @@ namespace utilspp
 
 }
 
-#include "SingletonHolder.inl"
+#include "singleton_holder.inl"
 
 #endif

daemon/libs/utilspp/singleton/SingletonHolder.inl → daemon/libs/utilspp/singleton/singleton_holder.inl

@@ -21,9 +21,10 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLETON_HOLDER_INL
-#define SINGLETON_HOLDER_INL
+#ifndef __SINGLETON_HOLDER_INL__
+#define __SINGLETON_HOLDER_INL__
 
+#include <cassert>
 template
 <
 class T,
@@ -123,4 +124,4 @@ template < class > class M
 >
 bool utilspp::SingletonHolder< T, C, L, M >::mDestroyed;
 
-#endif
+#endif // __SINGLETON_HOLDER_INL__

daemon/libs/utilspp/ThreadingSingle.hpp → daemon/libs/utilspp/threading_single.hpp

@@ -21,10 +21,10 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLE_THREADED_HPP
-#define SINGLE_THREADED_HPP
+#ifndef __THREADING_SINGLE_HPP__
+#define __THREADING_SINGLE_HPP__
 
-#include "NullType.hpp"
+#include "null_type.hpp"
 
 namespace utilspp
 {
@@ -47,6 +47,6 @@ namespace utilspp
       };
 }
 
-#include "ThreadingSingle.inl"
+#include "threading_single.inl"
 
-#endif
+#endif // __THREADING_SINGLE_HPP__

daemon/libs/utilspp/ThreadingSingle.inl → daemon/libs/utilspp/threading_single.inl

@@ -21,8 +21,8 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLE_THREADED_INL
-#define SINGLE_THREADED_INL
+#ifndef __THREADING_SINGLE_INL__
+#define __THREADING_SINGLE_INL__
 
 template< typename T >
 inline
@@ -47,4 +47,4 @@ void
 utilspp::ThreadingSingle< T >::mutex::unlock()
 {}
 
-#endif
+#endif // __THREADING_SINGLE_INL__

daemon/src/Makefile.am

@@ -5,7 +5,7 @@ libexec_PROGRAMS = sflphoned
 
 # all: indent
 
-SUBDIRS = dbus audio config plug-in hooks history sip iax im
+SUBDIRS = dbus audio config hooks history sip iax im
 
 sflphoned_SOURCES = main.cpp
 
@@ -35,7 +35,7 @@ noinst_LTLIBRARIES = libsflphone.la
 
 noinst_HEADERS = \
 		global.h \
-		Codec.h \
+		codec.h \
 		conference.h \
 		voiplink.h \
 		preferences.h \
@@ -47,7 +47,8 @@ noinst_HEADERS = \
 		call.h \
 		logger.h \
 		numbercleaner.h \
-		fileutils.h
+		fileutils.h \
+		noncopyable.h
 
 libsflphone_la_LIBADD = \
 	$(top_builddir)/libs/utilspp/libutilspp.la \
@@ -58,7 +59,6 @@ libsflphone_la_LIBADD = \
 	./audio/libaudio.la \
 	./dbus/libdbus.la \
 	./config/libconfig.la \
-	./plug-in/libplugin.la \
 	./hooks/libhooks.la \
 	./history/libhistory.la
 

daemon/src/account.cpp

@@ -35,16 +35,20 @@
 
 Account::Account(const std::string& accountID, const std::string &type) :
     accountID_(accountID)
+    , username_()
+    , hostname_()
+    , alias_()
     , link_(NULL)
     , enabled_(true)
     , type_(type)
     , registrationState_(Unregistered)
     , codecOrder_()
-    , codecStr_ ("")
+    , codecStr_()
     , ringtonePath_("/usr/share/sflphone/ringtones/konga.ul")
     , ringtoneEnabled_(true)
     , displayName_("")
     , userAgent_("SFLphone")
+    , mailBox_()
 {
     // Initialize the codec order, used when creating a new account
     loadDefaultCodecs();