Commit 37add9be authored by Alexandre Savard's avatar Alexandre Savard

Merge branch 'master' of...

Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone
parents e6c71d13 1582b152
#!/bin/bash
#
# Script to build the source tarball for distribution on sflphone.org
#
# Author: Francois Marier <francois@debian.org>
if [ ! -e sflphone-common/configure.ac ] ; then
echo "This script must be run in the root directory of the sflphone repository"
exit 1
fi
if [ "z$1" = "z" ] ; then
echo "Usage: $0 VERSION_NUMBER"
exit 2
fi
VERSION=$1
BUILDDIR=sflphone-$VERSION
if [ -e $BUILDDIR ] ; then
echo "The build directory ($BUILDDIR) already exists. Delete it first."
exit 3
fi
mkdir $BUILDDIR
cp -r * $BUILDDIR/
pushd $BUILDDIR
rm -rf $BUILDDIR
rm -f *.tar.gz
rm -rf lang/
rm -rf tools/build-system/
rm -f tools/pysflphone/*.pyc
rm -f tools/build-package.sh tools/bleach.sh tools/autotoolize.sh
rm -rf sflphone-client-kde/build
find -name .project -type f -exec rm {} \;
find -name .cproject -type f -exec rm {} \;
find -name .settings -type d -exec rm -rf {} \;
pushd sflphone-common
./autogen.sh
popd
pushd sflphone-common/libs/pjproject
find -name os-auto.mak -type f -exec rm {} \;
# Remove pre-built binaries
rm -f pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu
rm -f pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu
rm -f pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu
rm -f pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu
rm -f pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu
rm -f pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu
rm -f pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu
rm -f pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu
# Put actual files in the tarball
rm -f config.guess config.sub
cp /usr/share/misc/config.guess .
cp /usr/share/misc/config.sub .
rm -f config.log config.status build.mak
rm -f pjlib/include/pj/compat/m_auto.h
rm -f pjlib/include/pj/compat/os_auto.h
rm -f pjmedia/include/pjmedia-codec/config_auto.h
rm -f pjmedia/include/pjmedia/config_auto.h
rm -f pjsip/include/pjsip/sip_autoconf.h
# Remove non-GPL compatible code
sed -e 's/ milenage / /' third_party/build/Makefile > third_party/build/Makefile.new
mv third_party/build/Makefile.new third_party/build/Makefile
sed -e 's/ -lmilenage-$(TARGET_NAME) / /' build.mak.in > build.mak.in.new
mv build.mak.in.new build.mak.in
sed -e 's/ $(PJ_DIR)\/third_party\/lib\/libmilenage-$(LIB_SUFFIX) / /' build.mak.in > build.mak.in.new
mv build.mak.in.new build.mak.in
rm -rf third_party/build/ilbc/
rm -rf third_party/build/milenage/
rm -rf third_party/ilbc/
rm -rf third_party/milenage/
aclocal --force
popd
pushd sflphone-client-gnome
./autogen.sh
popd
find -name autom4te.cache -type d -exec rm -rf {} \;
find -name *.in~ -type f -exec rm {} \;
popd # builddir
rm -f sflphone-$VERSION.tar.gz
tar zcf sflphone-$VERSION.tar.gz sflphone-$VERSION
rm -rf $BUILDDIR
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -3,13 +3,12 @@
# This file is distributed under the same license as the sflphone package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
#
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-10-14 11:18-0400\n"
"PO-Revision-Date: 2009-10-07 16:31+0000\n"
"PO-Revision-Date: 2009-10-14 17:24+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
......@@ -17,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Launchpad-Export-Date: 2009-10-14 15:20+0000\n"
"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
......@@ -100,8 +99,8 @@ msgstr ""
msgid ""
"<b>Error: No audio codecs found.\n"
"\n"
"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
"b> directory in your home( <i>%s</i> )"
"</b> SFL audio codecs have to be placed in <i>%s</i> or in the "
"<b>.sflphone</b> directory in your home( <i>%s</i> )"
msgstr ""
#: ../sflphone-client-gnome/src/errors.c:29
......@@ -998,9 +997,11 @@ msgstr ""
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
#~ ",Launchpad Contributions:,Maxime Chambreuil, ,Launchpad Contributions:,"
#~ "Maxime Chambreuil"
#~ ",Launchpad Contributions:,Maxime Chambreuil, ,Launchpad "
#~ "Contributions:,Maxime Chambreuil, ,Launchpad Contributions:,Maxime Chambreuil"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ",,maxime.chambreuil@gmail.com,,,maxime.chambreuil@gmail.com"
#~ msgstr ""
#~ ",,maxime.chambreuil@gmail.com,,,maxime.chambreuil@gmail.com,,,maxime.chambreu"
#~ "il@gmail.com"
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
xml2po -o sflphone-usermanual.pot sflphone.xml
This diff is collapsed.
......@@ -4,20 +4,24 @@ DOMAIN=sflphone-client-gnome
POFILES=\
fr/sflphone-client-gnome.po \
es/sflphone-client-gnome.po \
de/sflphone-client-gnome.po \
zh_CN/sflphone-client-gnome.po \
zh_HK/sflphone-client-gnome.po \
ru/sflphone-client-gnome.po
fr/fr.po \
es/es.po \
de/de.po \
zh_CN/zh_CN.po \
zh_HK/zh_HK.po \
ru/ru.po \
it/it.po \
pt_BR/pt_BR.po
MOFILES=\
fr/sflphone-client-gnome.mo \
es/sflphone-client-gnome.mo \
de/sflphone-client-gnome.mo \
zh_CN/sflphone-client-gnome.mo \
zh_HK/sflphone-client-gnome.mo \
ru/sflphone-client-gnome.mo
fr/fr.mo \
es/es.mo \
de/de.mo \
zh_CN/zh_CN.mo \
zh_HK/zh_HK.mo \
ru/ru.mo \
it/it.mo \
pt_BR/pt_BR.mo
MSGFMT=msgfmt
......
This diff is collapsed.
This diff is collapsed.
......@@ -815,7 +815,7 @@ GtkWidget* create_audio_configuration()
pa_mute_widget = gtk_check_button_new_with_mnemonic(_("_Mute other applications during a call"));
gtk_widget_set_sensitive(pa_mute_widget, pulse_audio);
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(pa_mute_widget), dbus_get_pulse_app_volume_control() );
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pa_mute_widget), (g_strcasecmp (dbus_get_pulse_app_volume_control(), "true") == 0)? TRUE: FALSE);
g_signal_connect(G_OBJECT( pa_mute_widget ) , "clicked" , G_CALLBACK( dbus_set_pulse_app_volume_control ) , NULL);
gtk_table_attach( GTK_TABLE(table), pa_mute_widget, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
......
......@@ -292,7 +292,7 @@
</method>
<method name="getPulseAppVolumeControl">
<arg type="i" name="state" direction="out"/>
<arg type="s" name="state" direction="out"/>
</method>
<method name="setSipPort">
......@@ -303,21 +303,6 @@
<arg type="i" name="port" direction="out"/>
</method>
<method name="setStunServer">
<arg type="s" name="server" direction="in"/>
</method>
<method name="getStunServer">
<arg type="s" name="server" direction="out"/>
</method>
<method name="enableStun">
</method>
<method name="isStunEnabled">
<arg type="i" name="state" direction="out"/>
</method>
<!-- Addressbook configuration -->
<method name="getAddressbookSettings">
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/>
......
......@@ -2090,10 +2090,10 @@ dbus_set_pulse_app_volume_control( void )
}
}
int
gchar*
dbus_get_pulse_app_volume_control( void )
{
int state;
gchar* state;
GError* error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_pulse_app_volume_control(
configurationManagerProxy,
......@@ -2132,62 +2132,6 @@ dbus_get_sip_port( void )
return (guint)portNum;
}
gchar* dbus_get_stun_server (void)
{
GError* error = NULL;
gchar* server;
org_sflphone_SFLphone_ConfigurationManager_get_stun_server(
configurationManagerProxy,
&server,
&error);
if(error)
{
g_error_free(error);
}
return server;
}
void dbus_set_stun_server( gchar* server)
{
GError* error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_stun_server(
configurationManagerProxy,
server,
&error);
if(error)
{
g_error_free(error);
}
}
gint dbus_stun_is_enabled (void)
{
GError* error = NULL;
gint stun;
org_sflphone_SFLphone_ConfigurationManager_is_stun_enabled(
configurationManagerProxy,
&stun,
&error);
if(error)
{
g_error_free(error);
}
return stun;
}
void dbus_enable_stun (void)
{
GError* error = NULL;
org_sflphone_SFLphone_ConfigurationManager_enable_stun(
configurationManagerProxy,
&error);
if(error)
{
g_error_free(error);
}
}
GHashTable* dbus_get_addressbook_settings (void) {
GError *error = NULL;
......
......@@ -357,7 +357,7 @@ void dbus_set_pulse_app_volume_control( void );
/**
* ConfigurationManager - Get PA behaviour for the other sound streams
*/
int dbus_get_pulse_app_volume_control( void );
gchar* dbus_get_pulse_app_volume_control( void );
/**
* ConfigurationManager - Get the ringtone
......@@ -514,12 +514,6 @@ void dbus_set_sip_port(const guint portNum);
guint dbus_get_sip_port();
gchar* dbus_get_stun_server (void);
void dbus_set_stun_server( gchar* server);
gint dbus_stun_is_enabled (void);
void dbus_enable_stun (void);
void dbus_add_participant(const gchar* callID, const gchar* confID);
void dbus_set_record (const gchar * id);
......
......@@ -57,7 +57,6 @@ AM_CPPFLAGS = \
$(ZEROCONFFLAGS) \
$(IAX_FLAGS) \
$(SIP_CFLAGS) \
$(DBUSCPP_CFLAGS) \
-DCODECS_DIR=\""$(sflcodecdir)"\" \
-DPLUGINS_DIR=\""$(sflplugindir)"\" \
-DENABLE_TRACE \
......
......@@ -292,7 +292,7 @@
</method>
<method name="getPulseAppVolumeControl">
<arg type="i" name="state" direction="out"/>
<arg type="s" name="state" direction="out"/>
</method>
<method name="setSipPort">
......
......@@ -699,7 +699,7 @@ ConfigurationManager::getMailNotify (void)
return Manager::instance().getMailNotify();
}
int32_t
std::string
ConfigurationManager::getPulseAppVolumeControl (void)
{
return Manager::instance().getPulseAppVolumeControl();
......
......@@ -113,7 +113,7 @@ public:
void setNotify( void );
int32_t getMailNotify( void );
void setMailNotify( void );
int32_t getPulseAppVolumeControl( void );
std::string getPulseAppVolumeControl( void );
void setPulseAppVolumeControl( void );
int32_t getSipPort( void );
void setSipPort( const int32_t& portNum);
......
......@@ -2964,16 +2964,16 @@ ManagerImpl::getMailNotify (void)
return getConfigInt (PREFERENCES, CONFIG_MAIL_NOTIFY);
}
int32_t
std::string
ManagerImpl::getPulseAppVolumeControl (void)
{
return getConfigInt (PREFERENCES , CONFIG_PA_VOLUME_CTRL);
return getConfigString (PREFERENCES , CONFIG_PA_VOLUME_CTRL);
}
void
ManagerImpl::setPulseAppVolumeControl (void)
{
(getConfigInt (PREFERENCES , CONFIG_PA_VOLUME_CTRL) == 1) ? setConfig (PREFERENCES , CONFIG_PA_VOLUME_CTRL , FALSE_STR) : setConfig (PREFERENCES , CONFIG_PA_VOLUME_CTRL , TRUE_STR) ;
(getConfigString (PREFERENCES , CONFIG_PA_VOLUME_CTRL) == TRUE_STR) ? setConfig (PREFERENCES , CONFIG_PA_VOLUME_CTRL , FALSE_STR) : setConfig (PREFERENCES , CONFIG_PA_VOLUME_CTRL , TRUE_STR) ;
}
void ManagerImpl::setAudioManager (const int32_t& api)
......
......@@ -742,7 +742,7 @@ class ManagerImpl {
void switchAudioManager( void );
void setPulseAppVolumeControl( void );
int32_t getPulseAppVolumeControl( void );
std::string getPulseAppVolumeControl( void );
/**
* Get the desktop mail notification level
......
......@@ -475,7 +475,7 @@ int SIPVoIPLink::sendRegister (AccountID id)
status = createUDPServer (id);
if (status != PJ_SUCCESS) {
_debug ("Failed to initialize UDP transport with a local address for account %s\n. Try to use the local UDT transport", id.c_str());
_debug ("Failed to initialize UDP transport with a local address for account %s\n. Try to use the local UDP transport", id.c_str());
account->setAccountTransport (_localUDPTransport);
}
}
......@@ -498,13 +498,6 @@ int SIPVoIPLink::sendRegister (AccountID id)
// Update the state of the voip link
account->setRegistrationState (Trying);
if (!validStunServer) {
account->setRegistrationState (ErrorExistStun);
account->setRegister (false);
_mutexSIP.leaveMutex();
return false;
}
// Create the registration according to the account ID
status = pjsip_regc_create (_endpt, (void*) account, &regc_cb, &regc);
......
[sflphone-jaunty]
#[sflphone-jaunty]
#fqdn = ppa.launchpad.net
#method = ftp
#incoming = ~savoirfairelinux/ppa/ubuntu/jaunty
#login = anonymous
#allow_unsigned_uploads = 0
#[sflphone-karmic]
#fqdn = ppa.launchpad.net
#method = ftp
#incoming = ~savoirfairelinux/ppa/ubuntu/karmic
#login = anonymous
#allow_unsigned_uploads = 0
[sflphone-nightly-jaunty]
fqdn = ppa.launchpad.net
method = ftp
incoming = ~julien-bonjean/ppa/ubuntu/jaunty
incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/jaunty
login = anonymous
allow_unsigned_uploads = 0
[sflphone-karmic]
[sflphone-nightly-karmic]
fqdn = ppa.launchpad.net
method = ftp
incoming = ~julien-bonjean/ppa/ubuntu/karmic
incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/karmic
login = anonymous
allow_unsigned_uploads = 0
Markdown is supported
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