diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 11babd5c569951ada263ec80c877ea5cdceeca95..7fa05ee7e25a3ac530de2275dcb48930180e9471 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -1007,7 +1007,7 @@ void sflphone_fill_call_list (void)
call_details = dbus_get_call_details(callID);
create_new_call_from_details (callID, call_details, &c);
c->_callID = g_strdup(callID);
-
+ c->_zrtp_confirmed = FALSE;
// Add it to the list
DEBUG ("Add call retrieved from server side: %s\n", c->_callID);
calllist_add (current_calls, c);
diff --git a/sflphone-client-gnome/src/config/ip2ipdialog.c b/sflphone-client-gnome/src/config/ip2ipdialog.c
index fa5acb42b245b12dd15671fc1a6ce1b912453451..db0913e940326afdf502d12dadae067d2db7fc25 100644
--- a/sflphone-client-gnome/src/config/ip2ipdialog.c
+++ b/sflphone-client-gnome/src/config/ip2ipdialog.c
@@ -63,7 +63,7 @@ void show_ip2ip_dialog(GHashTable * properties)
gchar * description;
if(properties != NULL) {
- curSRTPEnabled = g_hash_table_lookup(properties, ACCOUNT_ZRTP_HELLO_HASH);
+ curSRTPEnabled = g_hash_table_lookup(properties, ACCOUNT_SRTP_ENABLED);
curKeyExchange = g_hash_table_lookup(properties, ACCOUNT_KEY_EXCHANGE);
curHelloEnabled = g_hash_table_lookup(properties, ACCOUNT_ZRTP_HELLO_HASH);
curSasConfirm = g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS);
@@ -113,7 +113,7 @@ void show_ip2ip_dialog(GHashTable * properties)
advancedOptions = gtk_button_new_with_label(_("Advanced options"));
g_signal_connect(G_OBJECT(advancedOptions), "clicked", G_CALLBACK(show_advanced_zrtp_options_cb), properties);
- DEBUG("curSRTPenabled = %s\n", curSRTPEnabled);
+ DEBUG("curSRTPEnabled = %s\n", curSRTPEnabled);
if (g_strcasecmp(curSRTPEnabled, "FALSE") == 0)
{
@@ -121,7 +121,7 @@ void show_ip2ip_dialog(GHashTable * properties)
gtk_widget_set_sensitive(GTK_WIDGET(advancedOptions), FALSE);
} else {
DEBUG("curKeyExchange %s \n", curKeyExchange);
- if (strcmp(curKeyExchange, "0") == 0) {
+ if (strcmp(curKeyExchange, "1") == 0) {
gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo),0);
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 1);
diff --git a/sflphone-client-gnome/src/widget/Makefile b/sflphone-client-gnome/src/widget/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..57acf9341e3f800e4d5a92e320ae933734b94100
--- /dev/null
+++ b/sflphone-client-gnome/src/widget/Makefile
@@ -0,0 +1,489 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# src/widget/Makefile. Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/SFLphone
+pkglibdir = $(libdir)/SFLphone
+pkgincludedir = $(includedir)/SFLphone
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+DIST_COMMON = $(srcdir)/../../globals.mak $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+subdir = src/widget
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libwidget_la_LIBADD =
+am_libwidget_la_OBJECTS = libwidget_la-gtkscrollbook.lo \
+ libwidget_la-minidialog.lo
+libwidget_la_OBJECTS = $(am_libwidget_la_OBJECTS)
+libwidget_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libwidget_la_CFLAGS) \
+ $(CFLAGS) $(libwidget_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(libwidget_la_SOURCES)
+DIST_SOURCES = $(libwidget_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/missing --run automake-1.10
+AWK = gawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CHECK_CFLAGS =
+CHECK_LIBS = -lcheck
+CPP = gcc -E
+CPPFLAGS =
+CYGPATH_W = echo
+DBUSGLIB_CFLAGS = -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+DBUSGLIB_LIBS = -L//lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DEPS_CFLAGS = -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.26 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4
+DEPS_LIBS = -pthread -L//lib -lnotify -ldbus-glib-1 -ldbus-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
+DSYMUTIL =
+DUMPBIN =
+ECHO_C =
+ECHO_N = -n
+ECHO_T =
+EGREP = /bin/grep -E
+EXEEXT =
+FGREP = /bin/grep -F
+GREP = /bin/grep
+GTK216_CFLAGS = -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+GTK216_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LD = /usr/bin/ld -m elf_x86_64
+LDFLAGS =
+LIBOBJS =
+LIBS =
+LIBSEXY_CFLAGS =
+LIBSEXY_LIBS =
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIPO =
+LN_S = ln -s
+LTLIBOBJS =
+MAKEINFO = ${SHELL} /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NM = /usr/bin/nm -B
+NMEDIT =
+OBJDUMP = objdump
+OBJEXT = o
+OTOOL =
+OTOOL64 =
+PACKAGE = SFLphone
+PACKAGE_BUGREPORT = sflphoneteam@savoirfairelinux.com
+PACKAGE_NAME = SFLphone
+PACKAGE_STRING = SFLphone 0.9.6~beta
+PACKAGE_TARNAME = sflphone-client-gnome
+PACKAGE_VERSION = 0.9.6~beta
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+RANLIB = ranlib
+SED = /bin/sed
+SET_MAKE =
+SHELL = /bin/bash
+STRIP = strip
+VERSION = 0.9.6
+abs_builddir = /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/src/widget
+abs_srcdir = /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/src/widget
+abs_top_builddir = /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome
+abs_top_srcdir = /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome
+ac_ct_CC = gcc
+ac_ct_DUMPBIN =
+am__include = include
+am__leading_dot = .
+am__quote =
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-unknown-linux-gnu
+build_alias =
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = x86_64-unknown-linux-gnu
+host_alias =
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = $(SHELL) /home/pierre-luc/Code/sfl/sflphone/sflphone-client-gnome/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+lt_ECHO = echo
+mandir = ${datarootdir}/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr/local
+program_transform_name = s,x,x,
+psdir = ${docdir}
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target_alias =
+top_build_prefix = ../../
+top_builddir = ../..
+top_srcdir = ../..
+
+# Global variables
+src = $(top_srcdir)
+
+# Preprocessor flags
+AM_CPPFLAGS = $(DEPS_CFLAGS) \
+ $(LIBSEXY_CFLAGS) \
+ -I$(src)/src \
+ -I$(src)/src/config \
+ -I$(src)/src/dbus \
+ -I$(src)/src/contacts \
+ -I$(src)/src/addressbook \
+ -DDATA_DIR=\""$(prefix)/share/sflphone"\" \
+ -DICONS_DIR=\""$(prefix)/share/sflphone"\" \
+ -DCODECS_DIR=\""$(prefix)/lib/sflphone/codecs"\"
+
+noinst_LTLIBRARIES = libwidget.la
+libwidget_la_SOURCES = \
+ gtkscrollbook.c \
+ minidialog.c
+
+libwidget_la_LDFLAGS = @DEPS_LDFLAGS@
+libwidget_la_CFLAGS = -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.26 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../../globals.mak $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/widget/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/widget/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libwidget.la: $(libwidget_la_OBJECTS) $(libwidget_la_DEPENDENCIES)
+ $(libwidget_la_LINK) $(libwidget_la_OBJECTS) $(libwidget_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+include ./$(DEPDIR)/libwidget_la-gtkscrollbook.Plo
+include ./$(DEPDIR)/libwidget_la-minidialog.Plo
+
+.c.o:
+ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+# source='$<' object='$@' libtool=no \
+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+# $(COMPILE) -c $<
+
+.c.obj:
+ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+# source='$<' object='$@' libtool=no \
+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+# $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+# source='$<' object='$@' libtool=yes \
+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+# $(LTCOMPILE) -c -o $@ $<
+
+libwidget_la-gtkscrollbook.lo: gtkscrollbook.c
+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwidget_la_CFLAGS) $(CFLAGS) -MT libwidget_la-gtkscrollbook.lo -MD -MP -MF $(DEPDIR)/libwidget_la-gtkscrollbook.Tpo -c -o libwidget_la-gtkscrollbook.lo `test -f 'gtkscrollbook.c' || echo '$(srcdir)/'`gtkscrollbook.c
+ mv -f $(DEPDIR)/libwidget_la-gtkscrollbook.Tpo $(DEPDIR)/libwidget_la-gtkscrollbook.Plo
+# source='gtkscrollbook.c' object='libwidget_la-gtkscrollbook.lo' libtool=yes \
+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwidget_la_CFLAGS) $(CFLAGS) -c -o libwidget_la-gtkscrollbook.lo `test -f 'gtkscrollbook.c' || echo '$(srcdir)/'`gtkscrollbook.c
+
+libwidget_la-minidialog.lo: minidialog.c
+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwidget_la_CFLAGS) $(CFLAGS) -MT libwidget_la-minidialog.lo -MD -MP -MF $(DEPDIR)/libwidget_la-minidialog.Tpo -c -o libwidget_la-minidialog.lo `test -f 'minidialog.c' || echo '$(srcdir)/'`minidialog.c
+ mv -f $(DEPDIR)/libwidget_la-minidialog.Tpo $(DEPDIR)/libwidget_la-minidialog.Plo
+# source='minidialog.c' object='libwidget_la-minidialog.lo' libtool=yes \
+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwidget_la_CFLAGS) $(CFLAGS) -c -o libwidget_la-minidialog.lo `test -f 'minidialog.c' || echo '$(srcdir)/'`minidialog.c
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+ -DPREFIX=\"$(prefix)\" \
+ $(ZEROCONFFLAGS) \
+ -DENABLE_TRACE
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
index 89a5aa276ef44c70b98e1f1069b577fa97420b3d..9efca7608f68e079ace92fba020c9b2429504525 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
@@ -59,7 +59,7 @@ namespace sfl {
if (_rtpSession != NULL) {
_debugException("An audio rtp thread was already created but not \
- destroyed, forcing it before continuing.\n");
+ destroyed. Forcing it before continuing.\n");
stop();
}
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 09d6f7656dd7139e742d59a859050693554485f8..b9af98ed834ece4954f031a0e0fd6a4ea0ca74f6 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -3044,7 +3044,7 @@ ManagerImpl::getAccountIdFromNameAndServer (const std::string& userName, const s
if (account != NULL) {
if (account->fullMatch (userName, server)) {
- _debug ("fullMatch\n");
+ _debug ("Matching accountId in request is a fullmatch\n");
return iter->first;
}
}
@@ -3056,7 +3056,7 @@ ManagerImpl::getAccountIdFromNameAndServer (const std::string& userName, const s
if (account != NULL) {
if (account->hostnameMatch (server)) {
- _debug ("hostnameMatch\n");
+ _debug ("Matching accountId in request with hostname\n");
return iter->first;
}
}
@@ -3068,7 +3068,7 @@ ManagerImpl::getAccountIdFromNameAndServer (const std::string& userName, const s
if (account != NULL) {
if (account->userMatch (userName)) {
- _debug ("userMatch\n");
+ _debug ("Matching accountId in request with username\n");
return iter->first;
}
}
diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index d07efce140537f002a349b3dd813b1ef9180d3ba..04a9630890f84d17f72e21714ebd8ec3b4e03b8c 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -273,6 +273,9 @@ pj_status_t Sdp::check_sdp_answer (pjsip_inv_session *inv, pjsip_rx_data *rdata)
status = pjmedia_sdp_neg_negotiate (inv->pool, inv->neg, 0);
_debug ("Negotiation returned with status %d PJ_SUCCESS being %d\n", status, PJ_SUCCESS);
+ } else {
+ _debug ("No need to check sdp answer since we are UAS\n");
+ return PJ_SUCCESS;
}
return status;
@@ -452,7 +455,7 @@ AudioCodec* Sdp::get_session_media (void)
AudioCodec *codec = NULL;
std::vector<sdpMedia*> media_list;
- _debug ("sdp line %d - get_session_media ()\n", __LINE__);
+ _debug ("Executing sdp line %d - get_session_media ()\n", __LINE__);
media_list = get_session_media_list ();
nb_media = media_list.size();
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 4707482da0a9fecfc34cd4652340050ef79814c2..d04c13a9fcc29c928285f45b57fbeeac2fd96a31 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -2036,12 +2036,12 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
// After 2xx is sent/received.
else if (inv->state == PJSIP_INV_STATE_CONNECTING) {
- status = call->getLocalSDP()->check_sdp_answer (inv, rdata);
+ status = call->getLocalSDP()->check_sdp_answer (inv, rdata);
- if (status != PJ_SUCCESS) {
+ if (status != PJ_SUCCESS) {
_debug ("Failed to check_incoming_sdp in call_on_state_changed\n");
return;
- }
+ }
}
// After we sent or received a ACK - The connection is established