Commit ac71dc19 authored by Emmanuel Milou's avatar Emmanuel Milou

Merge branch 'master' into release

Conflicts:
	tools/build-system/build_tarball.sh
parents 289856f3 e9078e18
...@@ -566,29 +566,22 @@ error_alert(DBusGProxy *proxy UNUSED, int err, void *foo UNUSED) ...@@ -566,29 +566,22 @@ error_alert(DBusGProxy *proxy UNUSED, int err, void *foo UNUSED)
switch (err) { switch (err) {
case ALSA_PLAYBACK_DEVICE: case ALSA_PLAYBACK_DEVICE:
msg = _("ALSA notification\n\nError while opening playback device"); msg = _("ALSA notification: Error while opening playback device");
break; break;
case ALSA_CAPTURE_DEVICE: case ALSA_CAPTURE_DEVICE:
msg = _("ALSA notification\n\nError while opening capture device"); msg = _("ALSA notification: Error while opening capture device");
break; break;
case PULSEAUDIO_NOT_RUNNING: case PULSEAUDIO_NOT_RUNNING:
msg = _("Pulseaudio notification\n\nPulseaudio is not running"); msg = _("Pulseaudio notification: Pulseaudio is not running");
break; break;
case CODECS_NOT_LOADED: case CODECS_NOT_LOADED:
msg = _("Codecs notification\n\nCodecs not found"); msg = _("Codecs notification: Codecs not found");
break; break;
default: default:
return; return;
} }
GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(get_main_window()), ERROR("%s", msg);
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", msg);
gtk_window_set_title(GTK_WINDOW(dialog), _("SFLphone Error"));
g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
gtk_widget_show(dialog);
} }
static void static void
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
# #
# Author: Francois Marier <francois@debian.org> # Author: Francois Marier <francois@debian.org>
cd ${WORKSPACE}
if [ ! -e daemon/configure.ac ] ; then if [ ! -e daemon/configure.ac ] ; then
echo "This script must be run in the root directory of the sflphone repository" echo "This script must be run in the root directory of the sflphone repository"
exit 1 exit 1
...@@ -95,6 +97,6 @@ find -name autom4te.cache -type d -exec rm -rf {} \; ...@@ -95,6 +97,6 @@ find -name autom4te.cache -type d -exec rm -rf {} \;
find -name *.in~ -type f -exec rm {} \; find -name *.in~ -type f -exec rm {} \;
popd # builddir popd # builddir
rm -f sflphone-$VERSION.tar.gz rm -f sflphone-*.tar.gz
tar zcf sflphone-$VERSION.tar.gz sflphone-$VERSION tar zcf sflphone-$VERSION.tar.gz sflphone-$VERSION
rm -rf $BUILDDIR rm -rf $BUILDDIR
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