From 87a17f396ff9b645a17bcb3ff3fcda32d74e955c Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Thu, 10 Apr 2008 11:54:43 -0400
Subject: [PATCH] Compilation warnings removal ( from the client )
---
sflphone-gtk/src/SFLnotify.c | 12 ++++++------
sflphone-gtk/src/SFLnotify.h | 1 +
sflphone-gtk/src/accountwindow.c | 1 -
sflphone-gtk/src/actions.c | 4 ++--
sflphone-gtk/src/configwindow.c | 8 +-------
sflphone-gtk/src/configwindow.h | 1 -
sflphone-gtk/src/dbus.h | 1 +
sflphone-gtk/src/menus.c | 2 --
8 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/sflphone-gtk/src/SFLnotify.c b/sflphone-gtk/src/SFLnotify.c
index cf32e4252e..7a011399ad 100644
--- a/sflphone-gtk/src/SFLnotify.c
+++ b/sflphone-gtk/src/SFLnotify.c
@@ -30,8 +30,8 @@ notify_incoming_call( call_t* c )
notify_init("sflphone");
title = g_markup_printf_escaped(_("%s account: %s") ,
- g_hash_table_lookup(account_list_get_by_id(c->accountID)->properties , ACCOUNT_TYPE) ,
- g_hash_table_lookup(account_list_get_by_id(c->accountID)->properties , ACCOUNT_ALIAS) ) ;
+ (gchar*)g_hash_table_lookup(account_list_get_by_id(c->accountID)->properties , ACCOUNT_TYPE) ,
+ (gchar*)g_hash_table_lookup(account_list_get_by_id(c->accountID)->properties , ACCOUNT_ALIAS) ) ;
callerid = g_markup_printf_escaped(_("<i>From:</i> %s") , c->from);
@@ -90,8 +90,8 @@ notify_voice_mails( guint count , account_t* acc )
notify_init("sflphone");
title = g_markup_printf_escaped(_("%s account: %s") ,
- g_hash_table_lookup(acc->properties , ACCOUNT_TYPE) ,
- g_hash_table_lookup(acc->properties , ACCOUNT_ALIAS) ) ;
+ (gchar*)g_hash_table_lookup(acc->properties , ACCOUNT_TYPE) ,
+ (gchar*) g_hash_table_lookup(acc->properties , ACCOUNT_ALIAS) ) ;
body = g_markup_printf_escaped(_("%d voice mails"), count);
pixbuf = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL);
@@ -121,8 +121,8 @@ notify_current_account( account_t* acc )
notify_init("sflphone");
body = g_markup_printf_escaped(_("Calling with %s account <i>%s</i>") ,
- g_hash_table_lookup( acc->properties , ACCOUNT_TYPE) ,
- g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS));
+ (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE) ,
+ (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS));
title = g_markup_printf_escaped(_("Current account"));
diff --git a/sflphone-gtk/src/SFLnotify.h b/sflphone-gtk/src/SFLnotify.h
index eb343332cd..70658d97ec 100644
--- a/sflphone-gtk/src/SFLnotify.h
+++ b/sflphone-gtk/src/SFLnotify.h
@@ -28,6 +28,7 @@
#include <dbus.h>
#include <actions.h>
#include <statusicon.h>
+#include <configwindow.h>
#define __TIMEOUT_MODE "default"
#define __TIMEOUT_TIME 30000 // 30 secondes
diff --git a/sflphone-gtk/src/accountwindow.c b/sflphone-gtk/src/accountwindow.c
index 10a47ec738..23b295b14b 100644
--- a/sflphone-gtk/src/accountwindow.c
+++ b/sflphone-gtk/src/accountwindow.c
@@ -122,7 +122,6 @@ show_account_window (account_t * a)
{
curAccountID = a->accountID;
curAccountType = g_hash_table_lookup(currentAccount->properties, ACCOUNT_TYPE);
- g_print("account window = %s\n" , g_hash_table_lookup(currentAccount->properties, ACCOUNT_ENABLED));
curAccountEnabled = g_hash_table_lookup(currentAccount->properties, ACCOUNT_ENABLED);
if (strcmp(curAccountType, "IAX") == 0) {
diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index 7f04c4ec3f..5bf1ed6442 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -73,8 +73,8 @@ status_bar_display_account( call_t* c)
if(c->accountID != NULL){
acc = account_list_get_by_id(c->accountID);
msg = g_markup_printf_escaped("%s account- %s" ,
- g_hash_table_lookup( acc->properties , ACCOUNT_TYPE),
- g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS));
+ (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE),
+ (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS));
status_bar_message_add( msg , __MSG_ACCOUNT_DEFAULT);
g_free(msg);
}
diff --git a/sflphone-gtk/src/configwindow.c b/sflphone-gtk/src/configwindow.c
index c243d11e47..5f713d9fd0 100644
--- a/sflphone-gtk/src/configwindow.c
+++ b/sflphone-gtk/src/configwindow.c
@@ -99,7 +99,7 @@ config_window_fill_account_list()
account_t * a = account_list_get_nth (i);
if (a)
{
- g_print("fill account list : %s\n" , g_hash_table_lookup(a->properties, ACCOUNT_ENABLED));
+ g_print("fill account list : %s\n" , (gchar*)g_hash_table_lookup(a->properties, ACCOUNT_ENABLED));
gtk_list_store_append (accountStore, &iter);
gtk_list_store_set(accountStore, &iter,
COLUMN_ACCOUNT_ALIAS, g_hash_table_lookup(a->properties, ACCOUNT_ALIAS), // Name
@@ -369,7 +369,6 @@ select_active_output_audio_plugin()
{
GtkTreeModel* model;
GtkTreeIter iter;
- gchar** devices;
gchar* plugin;
gchar* tmp;
@@ -1049,7 +1048,6 @@ create_audio_tab ()
GtkWidget *fileChooser;
GtkWidget *titleLabel;
- GtkWidget *comboBox;
GtkWidget *refreshButton;
GtkCellRenderer *renderer;
@@ -1230,10 +1228,6 @@ create_general_settings ()
GtkWidget *trayBox;
GtkWidget *trayItem;
- GtkWidget *dialFrame;
- GtkWidget *dialBox;
- GtkWidget *dialItem;
-
// Main widget
ret = gtk_vbox_new(FALSE, 10);
gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
diff --git a/sflphone-gtk/src/configwindow.h b/sflphone-gtk/src/configwindow.h
index d4cbb9e8af..778ed81d96 100644
--- a/sflphone-gtk/src/configwindow.h
+++ b/sflphone-gtk/src/configwindow.h
@@ -39,7 +39,6 @@ void update_combo_box( gchar* plugin );
void default_account(GtkWidget *widget, gpointer data);
void bold_if_default_account(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data);
void default_codecs(GtkWidget* widget, gpointer data);
-void enable_account( GtkWidget* widget, gpointer data );
GtkWidget * create_codec_table();
GtkWidget * create_accounts_tab();
GtkWidget * create_audio_tab();
diff --git a/sflphone-gtk/src/dbus.h b/sflphone-gtk/src/dbus.h
index 8ab821f58d..7899db4411 100644
--- a/sflphone-gtk/src/dbus.h
+++ b/sflphone-gtk/src/dbus.h
@@ -86,6 +86,7 @@ void dbus_start_hidden( void );
int dbus_is_start_hidden( void );
void dbus_switch_popup_mode( void );
int dbus_popup_mode( void );
+void dbus_start_tone(const int start , const guint type);
/* Instance */
void dbus_register( int pid, gchar * name);
diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c
index 63bf128fbb..7680f587ff 100644
--- a/sflphone-gtk/src/menus.c
+++ b/sflphone-gtk/src/menus.c
@@ -484,8 +484,6 @@ create_view_menu()
GtkWidget * menu;
GtkWidget * root_menu;
GtkWidget * menu_items;
- GtkWidget * submenu;
- GtkWidget * submenu_items;
menu = gtk_menu_new ();
--
GitLab