Apply patch to create custom SIP account from our own server

debian/control.hardy

@@ -2,7 +2,7 @@ Source: sflphone
 Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev
 Standards-Version: 3.7.3
 
 Package: sflphone

debian/control.intrepid

@@ -2,7 +2,7 @@ Source: sflphone
 Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev
 Standards-Version: 3.8.0
 
 Package: sflphone

debian/control.jaunty

@@ -2,7 +2,7 @@ Source: sflphone
 Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev
 Standards-Version: 3.7.3
 
 Package: sflphone

sflphone-gtk/src/Makefile.am

@@ -33,11 +33,12 @@ sflphone_gtk_SOURCES = \
   sliders.c \
   $(STATUSICON_SOURCE) \
   codeclist.c \
-  timestamp.c 
+  timestamp.c \
+  reqaccount.c
   
-noinst_HEADERS =  actions.h dbus.h sflnotify.h mainwindow.h calllist.h dialpad.h audioconf.h codeclist.h assistant.h\
+noinst_HEADERS =  actions.h dbus.h sflnotify.h mainwindow.h calllist.h dialpad.h audioconf.h codeclist.h assistant.h \
                   callmanager-glue.h errors.h sflphone_const.h configurationmanager-glue.h instance-glue.h menus.h calltab.h calltree.h configwindow.h \
-                  accountlist.h accountwindow.h marshaller.h sliders.h $(STATUSICON_HEADER) timestamp.h historyfilter.c
+                  accountlist.h accountwindow.h marshaller.h sliders.h $(STATUSICON_HEADER) timestamp.h historyfilter.c reqaccount.h
 
 EXTRA_DIST   = marshaller.list  
 sflphone_gtk_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SEXY_LIBS)

sflphone-gtk/src/assistant.c

@@ -18,13 +18,18 @@
  */
 
 #include <assistant.h>
+#include "reqaccount.h"
 
 #include <libsexy/sexy-icon-entry.h>
 
 #if GTK_CHECK_VERSION(2,10,0)
 
+#define SFLPHONE_ORG_SERVER "sip.sflphone.org"
+#define SFLPHONE_ORG_ALIAS "sflphone.org"
+
 struct _wizard *wiz;
 static int account_type;
+static int use_sflphone_org = 1;
 account_t* current;
 
 /**
@@ -48,6 +53,12 @@ set_account_type( GtkWidget* widget , gpointer data UNUSED )
   }
 }
 
+void set_sflphone_org( GtkWidget* widget , gpointer data UNUSED ) {
+  use_sflphone_org = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) && 1;
+}
+
+
+
 /**
  * Callback when the close button of the dialog is clicked
  * Action : close the assistant widget and get back to sflphone main window
@@ -140,6 +151,7 @@ if(!wiz){
   gtk_assistant_set_forward_page_func( GTK_ASSISTANT( wiz->assistant ), (GtkAssistantPageFunc) forward_page_func , NULL , NULL );
 
   build_intro();
+  build_sfl_or_account();
   build_select_account();
   build_sip_account_configuration();
   build_nat_settings();
@@ -153,7 +165,7 @@ if(!wiz){
   gtk_widget_show_all(wiz->assistant);
 
   gtk_assistant_update_buttons_state(GTK_ASSISTANT(wiz->assistant));
-	}
+ }
 }
 
   GtkWidget*
@@ -191,6 +203,23 @@ build_select_account()
 }
 
 
+GtkWidget* build_sfl_or_account()
+{
+  GtkWidget* sfl;
+  GtkWidget* cus;
+
+  wiz->sflphone_org = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("Account") , _("Choose SFLphone an account or a custom one"));
+
+  sfl = gtk_radio_button_new_with_label(NULL, "sflphone.org account");
+  gtk_box_pack_start( GTK_BOX(wiz->sflphone_org) , sfl , TRUE, TRUE, 0);
+  cus = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sfl), "Custom SIP or IAX2 account");
+  gtk_box_pack_start( GTK_BOX(wiz->sflphone_org) , cus , TRUE, TRUE, 0);
+  g_signal_connect(G_OBJECT( sfl ) , "clicked" , G_CALLBACK( set_sflphone_org ) , NULL );
+
+  return wiz->sflphone_org;
+}
+
+
   GtkWidget*
 build_sip_account_configuration( void )
 {
@@ -369,27 +398,73 @@ build_registration_error()
 
 }
 
-  static gint 
-forward_page_func( gint current_page , gpointer data  UNUSED)
-{
+void set_sip_infos_sentivite(gboolean b) {
+  gtk_widget_set_sensitive(GTK_WIDGET(wiz->sip_alias), b);
+  gtk_widget_set_sensitive(GTK_WIDGET(wiz->sip_server), b);
+  gtk_widget_set_sensitive(GTK_WIDGET(wiz->sip_username), b);
+  gtk_widget_set_sensitive(GTK_WIDGET(wiz->sip_password), b);
+}
+
+void prefill_sip(void) {
+  if (use_sflphone_org == 1) {
+    rest_account ra = get_rest_account(SFLPHONE_ORG_SERVER);
+    if (ra.success) {
+      set_sip_infos_sentivite(FALSE);
+      gtk_entry_set_text (GTK_ENTRY(wiz->sip_alias), SFLPHONE_ORG_ALIAS);
+      gtk_entry_set_text (GTK_ENTRY(wiz->sip_server), SFLPHONE_ORG_SERVER);
+      gtk_entry_set_text (GTK_ENTRY(wiz->sip_username), ra.user);
+      gtk_entry_set_text (GTK_ENTRY(wiz->sip_password), ra.passwd);
+    }
+  }
+}
+
+
+#define PAGE_INTRO   0
+#define PAGE_SFL     1
+#define PAGE_TYPE    2
+#define PAGE_SIP     3
+#define PAGE_STUN    4
+#define PAGE_IAX     5
+#define PAGE_REG_ERR 6
+#define PAGE_SUMMARY 8
+
+static gint 
+forward_page_func( gint current_page , gpointer data  UNUSED) {
+  
   switch( current_page ){
-    case 0:
-      return 1;
-    case 1:
-      if( account_type == _SIP )
-	return 2;
-      return 4;
-    case 2:  
-      return 3;
-    case 3:
-      return 6;
-    case 4:
-      return 6;
-    default:
-      return -1;
+  case PAGE_INTRO:
+    return PAGE_SFL;
+
+  case PAGE_SFL:
+    if (use_sflphone_org) {
+      prefill_sip();
+      account_type = _SIP;
+      return PAGE_SIP;
+    }
+    return PAGE_TYPE;
+
+  case PAGE_TYPE:
+    if( account_type == _SIP ) {
+      set_sip_infos_sentivite(TRUE);
+      return PAGE_SIP;
+    }
+    return PAGE_IAX;
+
+  case PAGE_SIP:  
+    return PAGE_STUN;
+
+  case PAGE_STUN:
+    return PAGE_SUMMARY;
+
+  case PAGE_IAX:
+    return PAGE_SUMMARY;
+
+  default:
+    return -1;
   }
 }
 
+
   static GtkWidget*
 create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section)
 {

sflphone-gtk/src/dbus.c

@@ -180,10 +180,11 @@ error_alert(DBusGProxy *proxy UNUSED,
 
 static void nameOwnerChanged(DBusGProxy *proxy, char *name, char *old_owner, char *new_owner, gpointer data )
 {
-
+    #if 0
     g_print("******************************************************************\n");
     g_print("Owner name of the service %s changed from %s to %s\n", name, old_owner, new_owner);
     g_print("******************************************************************\n");
+    #endif
 
     if (strcmp(name, "org.sflphone.SFLphone")!=0)   return;