jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emmanuel Milou
2009-02-06 11:09:26 -05:00
parent 90edabd14b
commit e825ec5ae9
7 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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$])

4
sflphone-gtk/configure.ac
View File

@ -1,8 +1,8 @@
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)

3
sflphone-gtk/src/actions.h
View File

@ -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

14
sflphone-gtk/src/dbus.c
View File

@ -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");
@ -1292,8 +1292,12 @@ dbus_set_record(const call_t * c)
org_sflphone_SFLphone_CallManager_set_recording (
callManagerProxy,
c->callID,
error);
g_print("called dbus_set_record on CallManager\n");
&error);
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)
}
}
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,

2
sflphone-gtk/src/dbus.h
View File

@ -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);

20
sflphone-gtk/src/mainwindow.c
View File

@ -59,25 +59,28 @@ on_delete (GtkWidget * widget UNUSED, gpointer data UNUSED)
/** Ask the user if he wants to hangup current calls */
gboolean
main_window_ask_quit(){
guint count = call_list_get_size(current_calls);
GtkWidget * dialog;
gint response;
gchar * question;
guint count = call_list_get_size(current_calls);
GtkWidget * dialog;
gint response;
gchar * question;
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));

20
sflphone-gtk/src/menus.c
View File

@ -492,25 +492,11 @@ edit_paste ( void * foo UNUSED)
}
static void
clear_history( void* foo UNUSED)
clear_history (void)
{
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{
if( call_list_get_size( history ) != 0 ){
call_list_clean_history();
}
}
}
GtkWidget *