Merge branch 'master' into jbonjean

sflphone-client-gnome/debian/changelog

-sflphone-client-gnome (0.9.5-SYSVER~snapshot1242399317) SYSTEM; urgency=low
+sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
 
-    ** SNAPSHOT 1242399317 **
+    ** 0.9.5 rc2 **
 
+  * [#1402] Fix pjsip build
+  * [#1404] Clear GTK-Critical Bug at client startup
   * Changes for name based dbus connection
   * Clean changelogs
   * [#1343] Gnome: Implement a callback system to handle focus on
@@ -37,7 +39,7 @@ sflphone-client-gnome (0.9.5-SYSVER~snapshot1242399317) SYSTEM; urgency=low
   * Bug #1405: Fix strings as requested.
   * Bug #1404: Fix strings in preferences panel.
 
- -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 15 May 2009 10:55:43 -0400
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 15 May 2009 16:57:05 -0400
 
 sflphone-client-gnome (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
 

sflphone-client-gnome/src/actions.c

@@ -78,7 +78,7 @@ status_bar_display_account ()
 
     acc = account_list_get_current ();
     if(acc){
-        msg = g_markup_printf_escaped(_("Connected to %s (%s)") ,
+        msg = g_markup_printf_escaped(_("Registered to %s (%s)") ,
                 (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
                 (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE));
     }

sflphone-client-gnome/src/contacts/history.c

@@ -32,7 +32,12 @@ static gboolean history_is_visible (GtkTreeModel*, GtkTreeIter*, gpointer);
 void
 history_search(GtkEntry* entry UNUSED){
 
+  
+  if(history_filter != NULL) {
+    
     gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(history_filter));
+  
+  }
 }
 
 void
@@ -40,6 +45,7 @@ history_init(){
   
   history_filter = history_create_filter(GTK_TREE_MODEL(history->store));
   gtk_tree_view_set_model(GTK_TREE_VIEW(history->view), GTK_TREE_MODEL(history_filter));
+  
 }
 
 void history_set_searchbar_widget(GtkWidget *searchbar){
@@ -51,7 +57,9 @@ static GtkTreeModel*
 history_create_filter (GtkTreeModel* child) {
 
   GtkTreeModel* ret;
+  GtkTreePath  *path; 
 
+  DEBUG("Create Filter\n");
   ret = gtk_tree_model_filter_new(child, NULL);
   gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(ret), history_is_visible, NULL, NULL);
   return GTK_TREE_MODEL(ret);

sflphone-common/debian/changelog

-sflphone-common (0.9.5-SYSVER~snapshot1242399317) SYSTEM; urgency=low
+sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
 
-    ** SNAPSHOT 1242399317 **
+    ** 0.9.5 rc2 **
 
+  * [#1402] Fix pjsip build
+  * [#1404] Clear GTK-Critical Bug at client startup
   * Changes for name based dbus connection
   * Clean changelogs
   * [#1343] Gnome: Implement a callback system to handle focus on
@@ -37,7 +39,7 @@ sflphone-common (0.9.5-SYSVER~snapshot1242399317) SYSTEM; urgency=low
   * Bug #1405: Fix strings as requested.
   * Bug #1404: Fix strings in preferences panel.
 
- -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 15 May 2009 10:55:31 -0400
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 15 May 2009 16:56:52 -0400
 
 sflphone-common (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
 

sflphone-common/globals.mak

@@ -7,11 +7,11 @@ sflplugindir=$(libdir)/sflphone/plugins
 export TARGET_NAME := @target@
 
 PJSIP_LIBS= \
-			-L$(src)/libs/pjproject-1.0.1/pjnath/lib \
-			-L$(src)/libs/pjproject-1.0.1/pjsip/lib \
-			-L$(src)/libs/pjproject-1.0.1/pjlib/lib \
-			-L$(src)/libs/pjproject-1.0.1/pjlib-util/lib \
-			-L$(src)/libs/pjproject-1.0.1/pjmedia/lib \
+			-L$(src)/libs/pjproject-1.0.1/pjnath/ \
+			-L$(src)/libs/pjproject-1.0.1/pjsip/ \
+			-L$(src)/libs/pjproject-1.0.1/pjlib/ \
+			-L$(src)/libs/pjproject-1.0.1/pjlib-util/ \
+			-L$(src)/libs/pjproject-1.0.1/pjmedia/ \
 			-lpjnath-sfl-$(TARGET_NAME) -lpjsua-sfl-$(TARGET_NAME) -lpjsip-sfl-$(TARGET_NAME) -lpjmedia-sfl-$(TARGET_NAME) -lpjsip-simple-sfl-$(TARGET_NAME) -lpjsip-ua-sfl-$(TARGET_NAME) -lpjmedia-codec-sfl-$(TARGET_NAME) -lpjlib-util-sfl-$(TARGET_NAME) -lpj-sfl-$(TARGET_NAME)
 
 SIP_CFLAGS=-I$(src)/libs/pjproject-1.0.1/pjsip/include \