Commit deda3bae authored by Pierre-Luc Beaudoin's avatar Pierre-Luc Beaudoin
Browse files

Merge commit 'origin/master'

parents 7445eda0 eca3cd02
...@@ -211,11 +211,11 @@ AM_CONDITIONAL(USE_SPEEX, test "x$with_speex" = "xyes" ) ...@@ -211,11 +211,11 @@ AM_CONDITIONAL(USE_SPEEX, test "x$with_speex" = "xyes" )
dnl Check for IAX dnl Check for IAX
AC_ARG_ENABLE(iax2, AC_ARG_ENABLE(iax2,
AS_HELP_STRING( AS_HELP_STRING(
[--enable-iax2], [--disable-iax2],
[compile with iax2 library support @<:@default=no@:>@] [disable iax2 library support @<:@default=no@:>@]
), ),
[with_iax2=$enableval], [with_iax2=$enableval],
[with_iax2=no] [with_iax2=yes]
) )
AM_CONDITIONAL(USE_IAX, test x$with_iax2 = xyes) AM_CONDITIONAL(USE_IAX, test x$with_iax2 = xyes)
......
...@@ -45,17 +45,10 @@ portaudio ...@@ -45,17 +45,10 @@ portaudio
Go to `tools/` and run: Go to `tools/` and run:
------------------------- -------------------------
./portaudio.sh ./portaudio.sh --prefix=/usr
su -c "cd portaudio && make install" su -c "cd portaudio && make install"
cd bindings/cpp
./configure --prefix=/usr
make clean
make
sudo make install
------------------------- -------------------------
The `make clean` is required. We might investigate (or could you ?)
the reason for that sometime.
the daemon the daemon
...@@ -91,6 +84,6 @@ sudo make install ...@@ -91,6 +84,6 @@ sudo make install
------------------------- -------------------------
You'll find `gnome-autogen.sh` in some `gnome-common`-like package of You'll find `gnome-autogen.sh` in some `gnome-common`-like package of
your distribution. You can also replace it by a call to: `autoreconf your distribution. You can also replace it by a call to:
--install`. `autoreconf --install`.
/* /*
* Copyright (C) 2006 Savoir-Faire Linux inc. * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* /*
* Copyright (C) 2006 Savoir-Faire Linux inc. * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -18,9 +19,7 @@ ...@@ -18,9 +19,7 @@
*/ */
#include "accountcreator.h" #include "accountcreator.h"
#include "sipaccount.h" #include "sipaccount.h"
#ifdef USE_IAX
#include "iaxaccount.h" #include "iaxaccount.h"
#endif
AccountCreator::AccountCreator() AccountCreator::AccountCreator()
{ {
...@@ -40,9 +39,7 @@ AccountCreator::createAccount(AccountType type, AccountID accountID) ...@@ -40,9 +39,7 @@ AccountCreator::createAccount(AccountType type, AccountID accountID)
break; break;
case IAX_ACCOUNT: case IAX_ACCOUNT:
#ifdef USE_IAX
return new IAXAccount(accountID); return new IAXAccount(accountID);
#endif
break; break;
} }
return 0; return 0;
......
/* /*
* Copyright (C) 2006 Savoir-Faire Linux inc. * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -43,7 +44,7 @@ public: ...@@ -43,7 +44,7 @@ public:
static Account* createAccount(AccountType type, AccountID accountID); static Account* createAccount(AccountType type, AccountID accountID);
private: private:
/** Hidden creator */ /** Hidden constructor */
AccountCreator(); AccountCreator();
}; };
......
/** /*
* Copyright (C) 2005 Savoir-Faire Linux inc. * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* Inspired by tonegenerator of * Inspired by tonegenerator of
......
/** /*
* Copyright (C) 2005 Savoir-Faire Linux inc. * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* Inspired by tonegenerator of * Inspired by tonegenerator of
......
/* /*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc. * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com> * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* *
......
/* /*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc. * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com> * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* *
......
/** /*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc. * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com> * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
......
/** /*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc. * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com> * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
......
/** /*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc. * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: * Author:
* *
......
/** /*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc. * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com> * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
......
/** /*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc. * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com> * Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
......
/* /*
* Copyright (C) 2005 Savoir-Faire Linux inc. * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* /*
* Copyright (C) 2005-2006 Savoir-Faire Linux inc. * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -64,7 +65,27 @@ public: ...@@ -64,7 +65,27 @@ public:
~ConfigTree(); ~ConfigTree();
void createSection(const std::string& section); void createSection(const std::string& section);
/**
* Return an array of strings, listing the sections of the config file
*
* This will be mainly used to filter which sections are an
* "Account" definition.
*
* @return array Strings of the sections
*/
TokenList getSections();
void addConfigTreeItem(const std::string& section, const ConfigTreeItem item); void addConfigTreeItem(const std::string& section, const ConfigTreeItem item);
/**
* Verify an item is there. If it's not, add it with the provided
* default value
*
* @param section Section
* @param
*/
void verifyConfigTreeItem(const std::string& section, const std::string& itemName,
const std::string& defaultValue, const std::string& type);
bool setConfigTreeItem(const std::string& section, const std::string& itemName, const std::string& value); bool setConfigTreeItem(const std::string& section, const std::string& itemName, const std::string& value);
// throw a ConfigTreeItemException if not found // throw a ConfigTreeItemException if not found
......
/* /*
* Copyright (C) 2007 Savoir-Faire Linux inc. * Copyright (C) 2007 Savoir-Faire Linux inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com> * Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2007 Savoir-Faire Linux inc. * Copyright (C) 2007 Savoir-Faire Linux inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com> * Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
......
/* /*
* Copyright (C) 2006 Savoir-Faire Linux inc. * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* /*
* Copyright (C) 2006 Savoir-Faire Linux inc. * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com> * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment