Merge branch 'master' into sip_server

configure.ac

@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
 dnl
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT([SFLPhone],[0.9.2-7],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([SFLPhone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
 AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
 AC_REVISION([$Revision$])
 

sflphone-gtk/configure.ac

-AC_INIT([SFLphone],[0.9.2-7],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([SFLphone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
 AM_CONFIG_HEADER(config.h)
 
 PACKAGE=SFLphone
-VERSION=0.9.2-7
+VERSION=0.9.3
 
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 
@@ -15,7 +15,7 @@ AC_ARG_WITH(debug,
 		[with_debug=no]
 	)
 if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
-	CFLAGS="$CFLAGS -g -DDEBUG -Wall -Wextra"
+	CFLAGS="$CFLAGS -g -O2 -DDEBUG -Wall -Wextra"
 else
 	CFLAGS="$CFLAGS -g -Wall -O2"
 fi

sflphone-gtk/src/actions.h

@@ -165,4 +165,7 @@ void sflphone_set_current_account();
  */
 void sflphone_fill_codec_list();
 
+void sflphone_record (call_t *c);
+
+void sflphone_rec_call (void);
 #endif 

sflphone-gtk/src/configwindow.c

@@ -184,8 +184,9 @@ clean_history( void )
 select_account(GtkTreeSelection *selection, GtkTreeModel *model)
 {
     GtkTreeIter iter;
-    GValue val = {0};
+    GValue val;
 
+    memset (&val, 0, sizeof(val));
     if (!gtk_tree_selection_get_selected(selection, &model, &iter))
     {
         selectedAccount = NULL;

sflphone-gtk/src/dbus.c

@@ -178,7 +178,7 @@ error_alert(DBusGProxy *proxy UNUSED,
 }
 
 
-static void nameOwnerChanged(DBusGProxy *proxy, char *name, char *old_owner, char *new_owner, gpointer data )
+static void nameOwnerChanged(DBusGProxy *proxy UNUSED, char *name , char *old_owner, char *new_owner, gpointer data UNUSED)
 {
     #if 0
     g_print("******************************************************************\n");
@@ -1293,7 +1293,11 @@ dbus_set_record(const call_t * c)
        org_sflphone_SFLphone_CallManager_set_recording (
                        callManagerProxy,
                        c->callID,
-                       error);
+                       &error);
+	    if(error)
+	    {
+		    g_error_free(error);
+	    }
         g_print("called dbus_set_record on CallManager\n");
 }
 
@@ -1589,10 +1593,10 @@ void dbus_set_stun_server( gchar* server)
         }
 }
 
-guint dbus_stun_is_enabled (void)
+gint dbus_stun_is_enabled (void)
 {
     GError* error = NULL;
-    guint stun;
+    gint stun;
     org_sflphone_SFLphone_ConfigurationManager_is_stun_enabled(
                         configurationManagerProxy,
                         &stun,

sflphone-gtk/src/dbus.h

@@ -432,7 +432,7 @@ guint dbus_get_sip_port();
 gchar* dbus_get_stun_server (void);
 void dbus_set_stun_server( gchar* server);
 
-guint dbus_stun_is_enabled (void);
+gint dbus_stun_is_enabled (void);
 void dbus_enable_stun (void);
 
 void dbus_set_record (const call_t * c);

sflphone-gtk/src/historyfilter.c

@@ -17,6 +17,8 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <string.h>
+
 #include <historyfilter.h>
 #include <calltree.h>
 
@@ -35,9 +37,11 @@ is_visible(GtkTreeModel* model, GtkTreeIter* iter, gpointer data UNUSED)
 {
   if( SHOW_SEARCHBAR )
   {
-	GValue val = {0,};
+	GValue val;
+
 	gchar* text = NULL;
 	gchar* search = (gchar*)gtk_entry_get_text(GTK_ENTRY(filter_entry));
+    memset (&val, 0, sizeof(val));
 	gtk_tree_model_get_value(GTK_TREE_MODEL(model), iter, 1, &val);
 	if(G_VALUE_HOLDS_STRING(&val)){
 		text = (gchar *)g_value_get_string(&val);
@@ -45,6 +49,7 @@ is_visible(GtkTreeModel* model, GtkTreeIter* iter, gpointer data UNUSED)
 	if(text != NULL && g_ascii_strncasecmp(search, _("Search"), 6) != 0){
 		return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0);
  	}
+    g_value_unset (&val);
 	return TRUE;
   }
   return TRUE;

sflphone-gtk/src/mainwindow.c

@@ -66,18 +66,21 @@ main_window_ask_quit(){
 
   if(count == 1)
   {
-    question = _("<b>There is one call in progress.</b>\nDo you still want to quit?");
+    question = _("There is one call in progress.");
   }
   else
   {
-    question = _("<b>There are calls in progress.</b>\nDo you still want to quit?");
+    question = _("There are calls in progress.");
   }
   
   dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window) ,
                                   GTK_DIALOG_MODAL,
                                   GTK_MESSAGE_QUESTION,
                                   GTK_BUTTONS_YES_NO,
-                                  question);
+                                  "<b>%s<b>\n%s",
+                                  question,
+                                   _("Do you still want to quit?") );
+
   
   response = gtk_dialog_run (GTK_DIALOG (dialog));
   
@@ -209,6 +212,7 @@ main_window_message(GtkMessageType type, gchar * markup){
                                       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                       type,
                                       GTK_BUTTONS_CLOSE,
+                                      "%s\n",
                                       markup);
   gtk_dialog_run (GTK_DIALOG(dialog));
   

sflphone-gtk/src/menus.c

@@ -492,23 +492,9 @@ edit_paste ( void * foo UNUSED)
 }
 
   static void
-clear_history( void* foo UNUSED)
-{
-  gchar *markup;
-  GtkWidget *dialog;
-  int response;
-
-  if( call_list_get_size( history ) == 0 ){
-    markup = g_markup_printf_escaped(_("History empty"));
-    dialog = gtk_message_dialog_new_with_markup ( GTK_WINDOW(get_main_window()),
-							    GTK_DIALOG_DESTROY_WITH_PARENT,
-							    GTK_MESSAGE_INFO,
-							    GTK_BUTTONS_CLOSE,
-							    markup);
-    response = gtk_dialog_run (GTK_DIALOG(dialog));
-    gtk_widget_destroy (GTK_WIDGET(dialog));
-  }
-  else{  
+clear_history (void)
+{
+  if( call_list_get_size( history ) != 0 ){
       call_list_clean_history();
     }
 }