Wizard merged

diff --cc configure.ac
Simple merge

diff --cc coreapi/Makefile.am
index eab5bdc5cbecc72130ce02ae47e80bf369e4001f,ced68ababb53b82682dc241c371af8f775c061b7..96a27d02b385a072b34fc2f8526b4c824fb77603
--- 1/coreapi/Makefile.am
--- 2/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@@ -38,14 -35,10 +38,15 @@@ liblinphone_la_SOURCES=
        linphonecall.c \
        sipsetup.c sipsetup.h \
        siplogin.c \
+       sipwizard.c \
        lsd.c linphonecore_utils.h \
        ec-calibrator.c \
 -      conference.c
 +      conference.c 
 +
 +if BUILD_TUNNEL
 +liblinphone_la_SOURCES+=TunnelManager.cc TunnelManager.hh linphone_tunnel.cc
 +endif
 +
  
  
  liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
@@@ -54,9 -47,13 +55,10 @@@ liblinphone_la_LIBADD= 
                $(EXOSIP_LIBS) \
                $(MEDIASTREAMER_LIBS) \
                $(ORTP_LIBS) $(OPENSSL_LIBS) \
-               $(TUNNEL_LIBS)
++              $(TUNNEL_LIBS) \
+               $(LIBSOUP_LIBS)
  
 -if BUILD_WIN32
 -liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
 -endif
 -
 -if ENABLE_TESTS
 +if BUILD_TESTS
  noinst_PROGRAMS=test_lsd test_ecc
  
  test_lsd_SOURCES=test_lsd.c
@@@ -71,14 -68,12 +73,13 @@@ endi
  
  AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
        $(ORTP_CFLAGS) \
 -      $(OSIP_CFLAGS) \
        $(MEDIASTREAMER_CFLAGS) \
 +      $(OSIP_CFLAGS) \
        $(EXOSIP_CFLAGS) \
+       $(LIBSOUP_CFLAGS) \
        -DENABLE_TRACE  \
        -DLOG_DOMAIN=\"LinphoneCore\" \
 -       $(IPV6_CFLAGS) \
 -       -DORTP_INET6 \
 -       $(VIDEO_CFLAGS)
 +      $(IPV6_CFLAGS) \
 +      -DORTP_INET6 \
 +      $(VIDEO_CFLAGS) \
 +      $(TUNNEL_CFLAGS)
- 
- AM_CXXFLAGS=$(AM_CFLAGS)

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc coreapi/proxy.c
Simple merge

diff --cc gtk/linphone.h
Simple merge

diff --cc gtk/main.c
index 88f2807fd5848c9082f48dd4a94023a6e783ae4b,3f61a3df4c99f4756ec7f874c7f79da0838e45a2..27c6f616586d5b931618cd2d771fa170a1b4790b
--- 1/gtk/main.c
--- 2/gtk/main.c
+++ b/gtk/main.c
@@@ -1584,20 -1563,22 +1586,27 @@@ static void linphone_gtk_check_soundcar
        }
  }
  
+ // Display the account wizard
+ void linphone_gtk_display_wizard() {
+       if (the_wizard == NULL || !gtk_widget_get_visible(the_wizard)) { // Only one instance of the wizard at the same time
+               the_wizard = linphone_gtk_create_assistant();
+       }
+ }
+ 
  static void linphone_gtk_quit(void){
 -      linphone_gtk_uninit_instance();
 -      linphone_gtk_destroy_log_window();
 -      linphone_core_destroy(the_core);
 -      linphone_gtk_log_uninit();
 +      static gboolean quit_done=FALSE;
 +      if (!quit_done){
 +              quit_done=TRUE;
 +              g_source_remove_by_user_data(linphone_gtk_get_core());
 +              linphone_gtk_uninit_instance();
 +              linphone_gtk_destroy_log_window();
 +              linphone_core_destroy(the_core);
 +              linphone_gtk_log_uninit();
  #ifdef HAVE_NOTIFY
 -      notify_uninit();
 +              notify_uninit();
  #endif
 -      gdk_threads_leave();
 +              gdk_threads_leave();
 +      }
  }
  
  #ifdef HAVE_GTK_OSX

diff --cc gtk/main.ui
index fde3a794a62a9ae95fa6c2a22071f08ecc18bda6,d4f3eb6fdd2bbb46b7edcfa5949ebd0ac597cc26..f6f418a03c55ca4686940cf23a3615ee07069e78
--- 1/gtk/main.ui
--- 2/gtk/main.ui
+++ b/gtk/main.ui
@@@ -103,41 -104,16 +103,41 @@@
                      <property name="visible">True</property>
                      <property name="can_focus">False</property>
                      <child>
 -                      <object class="GtkVBox" id="in_call_animation">
 +                      <placeholder/>
 +                    </child>
 +                  </object>
 +                  <packing>
 +                    <property name="expand">False</property>
 +                    <property name="fill">False</property>
 +                    <property name="position">0</property>
 +                  </packing>
 +                </child>
 +                <child>
 +                  <object class="GtkLabel" id="in_call_uri">
 +                    <property name="visible">True</property>
 +                    <property name="can_focus">False</property>
 +                    <property name="label" translatable="yes">label</property>
 +                    <property name="justify">center</property>
 +                  </object>
 +                  <packing>
 +                    <property name="expand">True</property>
 +                    <property name="fill">True</property>
 +                    <property name="position">1</property>
 +                  </packing>
 +                </child>
 +                <child>
 +                  <object class="GtkHBox" id="encryption_box">
 +                    <property name="can_focus">False</property>
 +                    <child>
-                       <object class="GtkImage" id="image12">
++                      <object class="GtkImage" id="image121">
                          <property name="visible">True</property>
                          <property name="can_focus">False</property>
 -                        <child>
 -                          <placeholder/>
 -                        </child>
 +                        <property name="stock">gtk-dialog-authentication</property>
 +                        <property name="icon-size">1</property>
                        </object>
                        <packing>
 -                        <property name="expand">True</property>
 -                        <property name="fill">True</property>
 +                        <property name="expand">False</property>
 +                        <property name="fill">False</property>
                          <property name="position">0</property>
                        </packing>
                      </child>

diff --cc gtk/parameters.ui
index 153b5bddecec410d7fb6aa9cc499c408c26527b4,004e49edd4d293eb29120fc526a2de0ec92e681f..dcea80e264cdd01fcb446122416194787e494e79
--- 1/gtk/parameters.ui
--- 2/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@@ -1,11 -1,11 +1,11 @@@
- <?xml version="1.0"?>
+ <?xml version="1.0" encoding="UTF-8"?>
  <interface>
 -  <requires lib="gtk+" version="2.16"/>
 +  <requires lib="gtk+" version="2.18"/>
    <!-- interface-naming-policy toplevel-contextual -->
    <object class="GtkAdjustment" id="adjustment1">
-     <property name="value">500</property>
      <property name="lower">500</property>
      <property name="upper">3001</property>
+     <property name="value">500</property>
      <property name="step_increment">1</property>
      <property name="page_increment">10</property>
    </object>
@@@ -272,137 -299,122 +300,153 @@@
                          <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                          <property name="left_padding">12</property>
                          <child>
 -                          <object class="GtkVBox" id="vbox6">
 +                          <object class="GtkTable" id="table1">
                              <property name="visible">True</property>
+                             <property name="can_focus">False</property>
 +                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 +                            <property name="n_rows">5</property>
 +                            <property name="n_columns">2</property>
                              <child>
 -                              <placeholder/>
 +                              <object class="GtkComboBox" id="proto_combo">
 +                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
 +                                <property name="model">model8</property>
 +                                <child>
 +                                  <object class="GtkCellRendererText" id="renderer1"/>
 +                                  <attributes>
 +                                    <attribute name="text">0</attribute>
 +                                  </attributes>
 +                                </child>
 +                              </object>
                              </child>
                              <child>
 -                              <object class="GtkTable" id="table1">
 +                              <object class="GtkSpinButton" id="proto_port">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">True</property>
-                                 <property name="invisible_char">&#x2022;</property>
++                                <property name="invisible_char">•</property>
 +                                <property name="invisible_char_set">True</property>
++                                <property name="primary_icon_activatable">False</property>
++                                <property name="secondary_icon_activatable">False</property>
++                                <property name="primary_icon_sensitive">True</property>
++                                <property name="secondary_icon_sensitive">True</property>
 +                                <property name="adjustment">adjustment7</property>
 +                              </object>
 +                              <packing>
 +                                <property name="left_attach">1</property>
 +                                <property name="right_attach">2</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkSpinButton" id="video_rtp_port">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">True</property>
 +                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                 <property name="invisible_char">&#x2022;</property>
-                                 <property name="invisible_char_set">True</property>
-                                 <property name="adjustment">adjustment2</property>
-                                 <signal name="value_changed" handler="linphone_gtk_video_port_changed"/>
++                                <property name="primary_icon_activatable">False</property>
++                                <property name="secondary_icon_activatable">False</property>
++                                <property name="primary_icon_sensitive">True</property>
++                                <property name="secondary_icon_sensitive">True</property>
 +                              </object>
 +                              <packing>
 +                                <property name="left_attach">1</property>
 +                                <property name="right_attach">2</property>
 +                                <property name="top_attach">1</property>
 +                                <property name="bottom_attach">2</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkSpinButton" id="audio_rtp_port">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">True</property>
 +                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                 <property name="invisible_char">&#x2022;</property>
++                                <property name="invisible_char">•</property>
 +                                <property name="invisible_char_set">True</property>
++                                <property name="primary_icon_activatable">False</property>
++                                <property name="secondary_icon_activatable">False</property>
++                                <property name="primary_icon_sensitive">True</property>
++                                <property name="secondary_icon_sensitive">True</property>
 +                                <property name="adjustment">adjustment3</property>
-                                 <signal name="value_changed" handler="linphone_gtk_audio_port_changed"/>
++                                <signal name="value-changed" handler="linphone_gtk_audio_port_changed" swapped="no"/>
 +                              </object>
 +                              <packing>
 +                                <property name="left_attach">1</property>
 +                                <property name="right_attach">2</property>
 +                                <property name="top_attach">2</property>
 +                                <property name="bottom_attach">3</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkLabel" id="label7">
                                  <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
                                  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 -                                <property name="n_rows">3</property>
 -                                <property name="n_columns">2</property>
 -                                <child>
 -                                  <object class="GtkComboBox" id="proto_combo">
 -                                    <property name="visible">True</property>
 -                                    <property name="can_focus">False</property>
 -                                    <property name="model">model8</property>
 -                                    <child>
 -                                      <object class="GtkCellRendererText" id="renderer1"/>
 -                                      <attributes>
 -                                        <attribute name="text">0</attribute>
 -                                      </attributes>
 -                                    </child>
 -                                  </object>
 -                                </child>
 -                                <child>
 -                                  <object class="GtkSpinButton" id="proto_port">
 -                                    <property name="visible">True</property>
 -                                    <property name="can_focus">True</property>
 -                                    <property name="invisible_char">•</property>
 -                                    <property name="invisible_char_set">True</property>
 -                                    <property name="primary_icon_activatable">False</property>
 -                                    <property name="secondary_icon_activatable">False</property>
 -                                    <property name="primary_icon_sensitive">True</property>
 -                                    <property name="secondary_icon_sensitive">True</property>
 -                                    <property name="adjustment">adjustment7</property>
 -                                  </object>
 -                                  <packing>
 -                                    <property name="left_attach">1</property>
 -                                    <property name="right_attach">2</property>
 -                                  </packing>
 -                                </child>
 -                                <child>
 -                                  <object class="GtkSpinButton" id="video_rtp_port">
 -                                    <property name="visible">True</property>
 -                                    <property name="can_focus">True</property>
 -                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 -                                    <property name="invisible_char">•</property>
 -                                    <property name="invisible_char_set">True</property>
 -                                    <property name="primary_icon_activatable">False</property>
 -                                    <property name="secondary_icon_activatable">False</property>
 -                                    <property name="primary_icon_sensitive">True</property>
 -                                    <property name="secondary_icon_sensitive">True</property>
 -                                    <property name="adjustment">adjustment2</property>
 -                                    <signal name="value-changed" handler="linphone_gtk_video_port_changed" swapped="no"/>
 -                                  </object>
 -                                  <packing>
 -                                    <property name="left_attach">1</property>
 -                                    <property name="right_attach">2</property>
 -                                    <property name="top_attach">1</property>
 -                                    <property name="bottom_attach">2</property>
 -                                  </packing>
 -                                </child>
 -                                <child>
 -                                  <object class="GtkSpinButton" id="audio_rtp_port">
 -                                    <property name="visible">True</property>
 -                                    <property name="can_focus">True</property>
 -                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 -                                    <property name="invisible_char">•</property>
 -                                    <property name="invisible_char_set">True</property>
 -                                    <property name="primary_icon_activatable">False</property>
 -                                    <property name="secondary_icon_activatable">False</property>
 -                                    <property name="primary_icon_sensitive">True</property>
 -                                    <property name="secondary_icon_sensitive">True</property>
 -                                    <property name="adjustment">adjustment3</property>
 -                                    <signal name="value-changed" handler="linphone_gtk_audio_port_changed" swapped="no"/>
 -                                  </object>
 -                                  <packing>
 -                                    <property name="left_attach">1</property>
 -                                    <property name="right_attach">2</property>
 -                                    <property name="top_attach">2</property>
 -                                    <property name="bottom_attach">3</property>
 -                                  </packing>
 -                                </child>
 -                                <child>
 -                                  <object class="GtkLabel" id="label7">
 -                                    <property name="visible">True</property>
 -                                    <property name="can_focus">False</property>
 -                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 -                                    <property name="label" translatable="yes">Video RTP/UDP:</property>
 -                                    <property name="justify">right</property>
 -                                  </object>
 -                                  <packing>
 -                                    <property name="top_attach">1</property>
 -                                    <property name="bottom_attach">2</property>
 -                                  </packing>
 -                                </child>
 -                                <child>
 -                                  <object class="GtkLabel" id="label6">
 -                                    <property name="visible">True</property>
 -                                    <property name="can_focus">False</property>
 -                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 -                                    <property name="label" translatable="yes">Audio RTP/UDP:</property>
 -                                    <property name="justify">right</property>
 -                                  </object>
 -                                  <packing>
 -                                    <property name="top_attach">2</property>
 -                                    <property name="bottom_attach">3</property>
 -                                  </packing>
 -                                </child>
 +                                <property name="label" translatable="yes">Video RTP/UDP:</property>
 +                                <property name="justify">right</property>
                                </object>
                                <packing>
 -                                <property name="expand">True</property>
 -                                <property name="fill">True</property>
 -                                <property name="position">1</property>
 +                                <property name="top_attach">1</property>
 +                                <property name="bottom_attach">2</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkLabel" id="label6">
 +                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
 +                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 +                                <property name="label" translatable="yes">Audio RTP/UDP:</property>
 +                                <property name="justify">right</property>
 +                              </object>
 +                              <packing>
 +                                <property name="top_attach">2</property>
 +                                <property name="bottom_attach">3</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkLabel" id="media_encryption_label">
 +                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
 +                                <property name="label" translatable="yes">Media encryption type</property>
 +                              </object>
 +                              <packing>
 +                                <property name="top_attach">3</property>
 +                                <property name="bottom_attach">4</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkComboBox" id="media_encryption_combo">
 +                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
 +                                <property name="active">0</property>
 +                              </object>
 +                              <packing>
 +                                <property name="left_attach">1</property>
 +                                <property name="right_attach">2</property>
 +                                <property name="top_attach">3</property>
 +                                <property name="bottom_attach">4</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkLabel" id="tunnel_label">
++                                <property name="can_focus">False</property>
 +                                <property name="label" translatable="yes">Tunnel</property>
 +                              </object>
 +                              <packing>
 +                                <property name="top_attach">4</property>
 +                                <property name="bottom_attach">5</property>
 +                              </packing>
 +                            </child>
 +                            <child>
 +                              <object class="GtkButton" id="tunnel_edit_button">
 +                                <property name="label" translatable="yes">edit</property>
 +                                <property name="can_focus">True</property>
 +                                <property name="receives_default">True</property>
-                                 <signal name="clicked" handler="linphone_gtk_edit_tunnel"/>
++                                <property name="use_action_appearance">False</property>
++                                <signal name="clicked" handler="linphone_gtk_edit_tunnel" swapped="no"/>
 +                              </object>
 +                              <packing>
 +                                <property name="left_attach">1</property>
 +                                <property name="right_attach">2</property>
 +                                <property name="top_attach">4</property>
 +                                <property name="bottom_attach">5</property>
                                </packing>
                              </child>
                            </object>

diff --cc gtk/propertybox.c
Simple merge