Bug fix: current account null after creating an new account with the assistant

debian/changelog

-sflphone (0.9) unstable; urgency=low
+sflphone (0.9-2008-06-06) unstable; urgency=low
+  * Audio bug correction: capture stopped after a few minutes of conversation
+  with USB Plantronics sound card
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
 
+sflphone (0.9-2008-05-06) unstable; urgency=low
+  * Bug correction: account creation with the assistant
+  * GTK+ warnings removal
+  * libnotify warnings removal
+  * Remove aliasing on the SFLphone logo
+  
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
+
+sflphone (0.9) unstable; urgency=low
   * Clean dependencies ( removal of libboost )
   * Several GTK improvement and updates
-    * account window
-    * configuration window
+    -account window
+    -configuration window
   * Migrate from GtkCheckMenuItem to GtkImageMenuItem  
   * ALSA standard I/O transfers: MMAP instead of R/W
   * Fix speex audio quality
   * IAX2 protocol
-    * Fix hold/unhold situation
-    * Add on hold music
+    -Fix hold/unhold situation
+    -Add on hold music
   * SIP protocol
-    * Ringtone on incoming call
-    * Fix transfer situation
+    -Ringtone on incoming call
+    -Fix transfer situation
   * Add desktop notification ( libnotify )
   * Improve the system tray icon behaviour
   * Improve registration error handling
-  * Register/unregister from the account window takes effect without starting
-  back SFLphone
+  * Register/unregister from the account window takes effect without starting back SFLphone
   * Compilation warnings removal
   * Call history
   * Add an account configuration wizard
 
  -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
 
+
+
 sflphone (0.8.2 ) unstable; urgency=low
 
   * Internationalization of the GTK GUI 

debian/control

@@ -2,7 +2,7 @@ Source: sflphone
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Standards-Version: 0.8.2-3
+Standards-Version: 0.9
 
 Package: sflphone
 Architecture: i386

sflphone-gtk/src/accountlist.c

@@ -129,8 +129,13 @@ account_list_get_nth ( guint n )
 account_t*
 account_list_get_current( )
 {
+  account_t* tmp = account_list_get_by_state( ACCOUNT_STATE_REGISTERED );
   if( __CURRENT_ACCOUNT_ID != NULL  )
     return account_list_get_by_id( __CURRENT_ACCOUNT_ID );
+  else if( tmp != NULL )
+    return tmp;
+  else if( account_list_get_size() > 0 )
+    return account_list_get_nth(0);
   else
     return NULL;
 }

sflphone-gtk/src/assistant.c

@@ -61,7 +61,6 @@ sip_apply_callback( void )
     g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->addr))));
 
     dbus_add_account( current );
-    account_list_set_current_id( current->accountID );
     g_print( "ACCOUNT ID = %s\n" , current->accountID );
   }
 }
@@ -80,7 +79,6 @@ iax_apply_callback( void )
     g_hash_table_insert(current->properties, g_strdup(ACCOUNT_IAX_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_password))));
 
     dbus_add_account( current );
-    account_list_set_current_id( current->accountID );
     g_print( "ACCOUNT ID = %s\n" , current->accountID );
   }
 }

sflphone-gtk/src/calltree.c

@@ -159,6 +159,8 @@ toggle_history(GtkToggleToolButton *toggle_tool_button,
 call_mailbox( GtkWidget* widget , gpointer data )
 {
     account_t* current = account_list_get_current();
+    if( current == NULL ) // Should not happens
+     return; 
     call_t* mailboxCall = g_new0( call_t , 1);
     mailboxCall->state = CALL_STATE_DIALING;
     mailboxCall->from = g_strconcat("\"\" <>", NULL);

sflphone-gtk/src/mainwindow.c

@@ -121,7 +121,7 @@ create_main_window ()
   gtk_container_set_border_width (GTK_CONTAINER (window), 0);
   gtk_window_set_title (GTK_WINDOW (window), PACKAGE);
   gtk_window_set_default_size (GTK_WINDOW (window), 230, 320);
-  gtk_window_set_default_icon_from_file (ICON_DIR "/sflphone.png", 
+  gtk_window_set_default_icon_from_file (ICONS_DIR "/sflphone.png", 
                                           NULL);
   gtk_window_set_position( GTK_WINDOW( window ) , GTK_WIN_POS_MOUSE);
 

sflphone-gtk/src/statusicon.c

@@ -111,7 +111,7 @@ create_menu()
 void
 show_status_icon()
 {
-  status = gtk_status_icon_new_from_file(ICON_DIR "/sflphone.png");
+  status = gtk_status_icon_new_from_file(ICONS_DIR "/sflphone.png");
   g_signal_connect (G_OBJECT (status), "activate",
 			  G_CALLBACK (status_click),
 			  NULL);