Commit e825ec5a authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Update version number, fix implicit declaration, fix GTK markup warnings

parent 90edabd1
...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59 ...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) 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_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$]) AC_REVISION([$Revision$])
......
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) AM_CONFIG_HEADER(config.h)
PACKAGE=SFLphone PACKAGE=SFLphone
VERSION=0.9.2-7 VERSION=0.9.3
AM_INIT_AUTOMAKE($PACKAGE,$VERSION) AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
......
...@@ -165,4 +165,7 @@ void sflphone_set_current_account(); ...@@ -165,4 +165,7 @@ void sflphone_set_current_account();
*/ */
void sflphone_fill_codec_list(); void sflphone_fill_codec_list();
void sflphone_record (call_t *c);
void sflphone_rec_call (void);
#endif #endif
...@@ -178,7 +178,7 @@ error_alert(DBusGProxy *proxy UNUSED, ...@@ -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)
{ {
g_print("******************************************************************\n"); g_print("******************************************************************\n");
...@@ -1292,8 +1292,12 @@ dbus_set_record(const call_t * c) ...@@ -1292,8 +1292,12 @@ dbus_set_record(const call_t * c)
org_sflphone_SFLphone_CallManager_set_recording ( org_sflphone_SFLphone_CallManager_set_recording (
callManagerProxy, callManagerProxy,
c->callID, c->callID,
error); &error);
g_print("called dbus_set_record on CallManager\n"); if(error)
{
g_error_free(error);
}
g_print("called dbus_set_record on CallManager\n");
} }
...@@ -1588,10 +1592,10 @@ void dbus_set_stun_server( gchar* server) ...@@ -1588,10 +1592,10 @@ void dbus_set_stun_server( gchar* server)
} }
} }
guint dbus_stun_is_enabled (void) gint dbus_stun_is_enabled (void)
{ {
GError* error = NULL; GError* error = NULL;
guint stun; gint stun;
org_sflphone_SFLphone_ConfigurationManager_is_stun_enabled( org_sflphone_SFLphone_ConfigurationManager_is_stun_enabled(
configurationManagerProxy, configurationManagerProxy,
&stun, &stun,
......
...@@ -432,7 +432,7 @@ guint dbus_get_sip_port(); ...@@ -432,7 +432,7 @@ guint dbus_get_sip_port();
gchar* dbus_get_stun_server (void); gchar* dbus_get_stun_server (void);
void dbus_set_stun_server( gchar* server); 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_enable_stun (void);
void dbus_set_record (const call_t * c); void dbus_set_record (const call_t * c);
......
...@@ -59,25 +59,28 @@ on_delete (GtkWidget * widget UNUSED, gpointer data UNUSED) ...@@ -59,25 +59,28 @@ on_delete (GtkWidget * widget UNUSED, gpointer data UNUSED)
/** Ask the user if he wants to hangup current calls */ /** Ask the user if he wants to hangup current calls */
gboolean gboolean
main_window_ask_quit(){ main_window_ask_quit(){
guint count = call_list_get_size(current_calls); guint count = call_list_get_size(current_calls);
GtkWidget * dialog; GtkWidget * dialog;
gint response; gint response;
gchar * question; gchar * question;
if(count == 1) 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 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) , dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window) ,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO, GTK_BUTTONS_YES_NO,
question); "<b>%s<b>\n%s",
question,
_("Do you still want to quit?") );
response = gtk_dialog_run (GTK_DIALOG (dialog)); response = gtk_dialog_run (GTK_DIALOG (dialog));
...@@ -209,6 +212,7 @@ main_window_message(GtkMessageType type, gchar * markup){ ...@@ -209,6 +212,7 @@ main_window_message(GtkMessageType type, gchar * markup){
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
type, type,
GTK_BUTTONS_CLOSE, GTK_BUTTONS_CLOSE,
"%s\n",
markup); markup);
gtk_dialog_run (GTK_DIALOG(dialog)); gtk_dialog_run (GTK_DIALOG(dialog));
......
...@@ -492,25 +492,11 @@ edit_paste ( void * foo UNUSED) ...@@ -492,25 +492,11 @@ edit_paste ( void * foo UNUSED)
} }
static void static void
clear_history( void* foo UNUSED) clear_history (void)
{ {
gchar *markup; if( call_list_get_size( history ) != 0 ){
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{
call_list_clean_history(); call_list_clean_history();
} }
} }
GtkWidget * GtkWidget *
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment