From 57910b71bf7a1532f931f66fcd9d31e877650b02 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Fri, 9 Oct 2009 14:56:25 -0400
Subject: [PATCH] [#2284] Add silent build rule + client clean warnings
---
sflphone-client-gnome/configure.ac | 3 +
.../src/config/accountconfigdialog.c | 2 +-
.../src/config/accountlistconfigdialog.c | 22 ++---
sflphone-client-gnome/src/dbus/dbus.c | 2 +-
.../src/icons/icon_factory.c | 25 +++---
sflphone-client-gnome/src/uimanager.c | 81 ++++++++++---------
sflphone-common/configure.ac | 19 +++--
7 files changed, 82 insertions(+), 72 deletions(-)
diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index 2b2ac246d6..53540ad6dd 100644
--- a/sflphone-client-gnome/configure.ac
+++ b/sflphone-client-gnome/configure.ac
@@ -10,6 +10,9 @@ VERSION=`cat VERSION`
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AC_CONFIG_MACRO_DIR([m4])
+dnl Silent build by default. Use make V=1 to increase verbosity
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
AC_ARG_WITH(debug,
AS_HELP_STRING(
[--with-debug],
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index f261b40f40..999141002a 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -755,7 +755,7 @@ GtkWidget * create_advanced_tab(account_t **a)
useStunRadioButton = gtk_radio_button_new_with_mnemonic(NULL,_("Using STUN "));
gtk_table_attach_defaults(GTK_TABLE(table), useStunRadioButton, 0, 2, 3, 4);
- gtk_widget_set_sensitive(GTK_TOGGLE_BUTTON(useStunRadioButton),
+ gtk_widget_set_sensitive (GTK_WIDGET(useStunRadioButton),
g_strcasecmp(use_tls,"true") == 0 ? FALSE: TRUE);
sameAsLocalRadioButton = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(useStunRadioButton), _("Same as local parameters"));
diff --git a/sflphone-client-gnome/src/config/accountlistconfigdialog.c b/sflphone-client-gnome/src/config/accountlistconfigdialog.c
index 733603f35e..0709c18c7f 100644
--- a/sflphone-client-gnome/src/config/accountlistconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountlistconfigdialog.c
@@ -23,6 +23,7 @@
#include <dbus/dbus.h>
#include <actions.h>
#include <utils.h>
+#include <string.h>
#define CONTEXT_ID_REGISTRATION 0
@@ -127,6 +128,7 @@ select_account_cb(GtkTreeSelection *selection, GtkTreeModel *model)
{
GtkTreeIter iter;
GValue val;
+ gchar *state;
memset (&val, 0, sizeof(val));
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
@@ -153,7 +155,7 @@ select_account_cb(GtkTreeSelection *selection, GtkTreeModel *model)
gtk_widget_set_sensitive(GTK_WIDGET(deleteButton), TRUE);
/* Update status bar about current registration state */
- gtk_statusbar_pop(status_bar, CONTEXT_ID_REGISTRATION);
+ gtk_statusbar_pop (GTK_STATUSBAR (status_bar), CONTEXT_ID_REGISTRATION);
if (selectedAccount->protocol_state_description != NULL
&& selectedAccount->protocol_state_code != 0) {
@@ -171,13 +173,13 @@ select_account_cb(GtkTreeSelection *selection, GtkTreeModel *model)
") ",
NULL);
- gtk_statusbar_push(status_bar, CONTEXT_ID_REGISTRATION, message);
+ gtk_statusbar_push (GTK_STATUSBAR (status_bar), CONTEXT_ID_REGISTRATION, message);
g_free(message);
} else {
- gchar * state = account_state_name(selectedAccount->state);
- gtk_statusbar_push(status_bar, CONTEXT_ID_REGISTRATION, state);
+ state = (gchar*) account_state_name (selectedAccount->state);
+ gtk_statusbar_push (GTK_STATUSBAR (status_bar), CONTEXT_ID_REGISTRATION, state);
}
}
@@ -347,7 +349,7 @@ create_account_list(GtkDialog * dialog)
table = gtk_table_new (1, 2, FALSE/* homogeneous */);
gtk_table_set_col_spacings(GTK_TABLE(table), 10);
- gtk_container_set_border_width(GTK_TABLE(table), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 10);
scrolledWindow = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -362,7 +364,7 @@ create_account_list(GtkDialog * dialog)
G_TYPE_POINTER // Pointer to the Object
);
- treeView = gtk_tree_view_new_with_model(GTK_TREE_MODEL(accountStore));
+ treeView = gtk_tree_view_new_with_model (GTK_TREE_MODEL (accountStore));
treeSelection = gtk_tree_view_get_selection(GTK_TREE_VIEW (treeView));
g_signal_connect(G_OBJECT (treeSelection), "changed",
G_CALLBACK (select_account_cb),
@@ -399,7 +401,7 @@ create_account_list(GtkDialog * dialog)
g_object_unref(G_OBJECT(accountStore));
- gtk_container_add(GTK_CONTAINER(scrolledWindow), treeView);
+ gtk_container_add (GTK_CONTAINER(scrolledWindow), GTK_WIDGET (treeView));
/* The buttons to press! */
buttonBox = gtk_vbutton_box_new();
@@ -490,7 +492,7 @@ show_account_list_config_dialog(void)
/* Status bar for the account list */
status_bar = gtk_statusbar_new();
- gtk_statusbar_set_has_resize_grip(status_bar, FALSE);
+ gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (status_bar), FALSE);
gtk_widget_show(status_bar);
gtk_box_pack_start(GTK_BOX(accountListDialog->vbox ), status_bar, TRUE, TRUE, 0);
@@ -506,10 +508,10 @@ show_account_list_config_dialog(void)
_(" active account"),
(number_accounts == 1) ? _(""):_("s"),
NULL);
- gtk_statusbar_push(status_bar, CONTEXT_ID_REGISTRATION, message);
+ gtk_statusbar_push (GTK_STATUSBAR (status_bar), CONTEXT_ID_REGISTRATION, message);
g_free(message);
} else {
- gtk_statusbar_push(status_bar, CONTEXT_ID_REGISTRATION, _("You have no active account"));
+ gtk_statusbar_push (GTK_STATUSBAR (status_bar), CONTEXT_ID_REGISTRATION, _("You have no active account"));
}
gtk_dialog_run(accountListDialog);
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 033e908e61..79952f5e21 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -367,7 +367,7 @@ secure_off_cb (DBusGProxy *proxy UNUSED,
show_sas_cb (DBusGProxy *proxy UNUSED,
const gchar* callID,
const gchar* sas,
- const gboolean* verified,
+ const gboolean verified,
void * foo UNUSED )
{
DEBUG ("Showing SAS");
diff --git a/sflphone-client-gnome/src/icons/icon_factory.c b/sflphone-client-gnome/src/icons/icon_factory.c
index 08b05a0196..3598e3510f 100644
--- a/sflphone-client-gnome/src/icons/icon_factory.c
+++ b/sflphone-client-gnome/src/icons/icon_factory.c
@@ -21,18 +21,6 @@
static GtkIconFactory *icon_factory = NULL;
-void init_icon_factory (void)
-{
- // Init the factory
- icon_factory = gtk_icon_factory_new ();
-
- // Load icons
- register_sflphone_stock_icons (icon_factory);
-
- // Specify a default icon set
- gtk_icon_factory_add_default (icon_factory);
-}
-
void add_icon (GtkIconFactory *factory, const gchar *stock_id, const guint8 *icon_data, GtkIconSize size)
{
GtkIconSet *icons;
@@ -73,3 +61,16 @@ void register_sflphone_stock_icons (GtkIconFactory *factory)
add_icon (factory, GTK_STOCK_CALLS, gnome_stock_calls, GTK_ICON_SIZE_SMALL_TOOLBAR);
}
+void init_icon_factory (void)
+{
+ // Init the factory
+ icon_factory = gtk_icon_factory_new ();
+
+ // Load icons
+ register_sflphone_stock_icons (icon_factory);
+
+ // Specify a default icon set
+ gtk_icon_factory_add_default (icon_factory);
+}
+
+
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 05abad255a..6d844be61c 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -23,6 +23,7 @@
#include <mainwindow.h>
#include <assistant.h>
#include <gtk/gtk.h>
+#include <string.h>
#include <glib/gprintf.h>
#include <libgnome/gnome-help.h>
#include <uimanager.h>
@@ -33,7 +34,7 @@ guint transfertButtonConnId; //The button toggled signal connection ID
GtkAction * pickUpAction;
GtkWidget * pickUpWidget;
-GtkWidget * newCallAction;
+GtkAction * newCallAction;
GtkWidget * newCallWidget;
GtkAction * hangUpAction;
GtkWidget * holdMenu;
@@ -226,13 +227,13 @@ void update_actions()
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (holdToolbar));
if (is_inserted (GTK_WIDGET (offHoldToolbar)))
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (offHoldToolbar));
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), holdToolbar, 3);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (holdToolbar), 3);
if (is_inserted (GTK_WIDGET (newCallWidget)))
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (newCallWidget));
if (is_inserted (GTK_WIDGET (pickUpWidget)))
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (pickUpWidget));
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), newCallWidget, 0);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (newCallWidget), 0);
g_signal_handler_block ( (gpointer)transferToolbar, transfertButtonConnId);
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (transferToolbar), FALSE);
@@ -254,7 +255,7 @@ void update_actions()
// Replace the dial button with the hangup button
g_object_ref (newCallWidget);
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET(newCallWidget));
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), pickUpWidget, 0);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (pickUpWidget), 0);
break;
case CALL_STATE_HOLD:
gtk_action_set_sensitive (GTK_ACTION (hangUpAction), TRUE);
@@ -264,7 +265,7 @@ void update_actions()
// Replace the hold button with the off-hold button
g_object_ref (holdToolbar);
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET(holdToolbar));
- gtk_toolbar_insert (GTK_TOOLBAR(toolbar), offHoldToolbar, 3);
+ gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM (offHoldToolbar), 3);
break;
case CALL_STATE_RINGING:
gtk_action_set_sensitive (GTK_ACTION (pickUpAction), TRUE);
@@ -276,7 +277,7 @@ void update_actions()
//gtk_action_set_sensitive( GTK_ACTION(newCallMenu),TRUE);
g_object_ref (newCallWidget);
gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET (newCallWidget));
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), pickUpWidget, 0);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (pickUpWidget), 0);
break;
case CALL_STATE_CURRENT:
case CALL_STATE_RECORD:
@@ -862,6 +863,40 @@ static void edit_number_cb (GtkWidget *widget UNUSED, gpointer user_data) {
show_edit_number ((callable_obj_t*)user_data);
}
+void add_registered_accounts_to_menu (GtkWidget *menu) {
+
+ GtkWidget *menu_items;
+ unsigned int i;
+ account_t* acc, *current;
+ gchar* alias;
+
+ menu_items = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
+ gtk_widget_show (menu_items);
+
+ for( i = 0 ; i < account_list_get_size() ; i++ ){
+ acc = account_list_get_nth(i);
+ // Display only the registered accounts
+ if( g_strcasecmp( account_state_name(acc->state) , account_state_name(ACCOUNT_STATE_REGISTERED) ) == 0 ){
+ alias = g_strconcat( g_hash_table_lookup(acc->properties , ACCOUNT_ALIAS) , " - ",g_hash_table_lookup(acc->properties , ACCOUNT_TYPE), NULL);
+ menu_items = gtk_check_menu_item_new_with_mnemonic(alias);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
+ g_object_set_data( G_OBJECT( menu_items ) , "account" , acc );
+ g_free( alias );
+ current = account_list_get_current();
+ if(current){
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items),
+ (g_strcasecmp( acc->accountID , current->accountID) == 0)? TRUE : FALSE);
+ }
+ g_signal_connect (G_OBJECT (menu_items), "activate",
+ G_CALLBACK (switch_account),
+ NULL);
+ gtk_widget_show (menu_items);
+ } // fi
+ }
+
+}
+
void
show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
@@ -1226,40 +1261,6 @@ show_popup_menu_contacts(GtkWidget *my_widget, GdkEventButton *event)
}
-void add_registered_accounts_to_menu (GtkWidget *menu) {
-
- GtkWidget *menu_items;
- unsigned int i;
- account_t* acc, *current;
- gchar* alias;
-
- menu_items = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
- gtk_widget_show (menu_items);
-
- for( i = 0 ; i < account_list_get_size() ; i++ ){
- acc = account_list_get_nth(i);
- // Display only the registered accounts
- if( g_strcasecmp( account_state_name(acc->state) , account_state_name(ACCOUNT_STATE_REGISTERED) ) == 0 ){
- alias = g_strconcat( g_hash_table_lookup(acc->properties , ACCOUNT_ALIAS) , " - ",g_hash_table_lookup(acc->properties , ACCOUNT_TYPE), NULL);
- menu_items = gtk_check_menu_item_new_with_mnemonic(alias);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
- g_object_set_data( G_OBJECT( menu_items ) , "account" , acc );
- g_free( alias );
- current = account_list_get_current();
- if(current){
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items),
- (g_strcasecmp( acc->accountID , current->accountID) == 0)? TRUE : FALSE);
- }
- g_signal_connect (G_OBJECT (menu_items), "activate",
- G_CALLBACK (switch_account),
- NULL);
- gtk_widget_show (menu_items);
- } // fi
- }
-
-}
-
static void ok_cb (GtkWidget *widget UNUSED, gpointer userdata) {
gchar *new_number;
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 30c4fe1c7b..2b146685ee 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -11,6 +11,9 @@ AC_REVISION([$Revision$])
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER([config.h])
+# Silent build by default. Use make V=1 to increase verbosity
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
dnl Use this variable in the program
AC_SUBST(PACKAGE_VERSION)
@@ -159,9 +162,9 @@ AC_CHECK_TYPES([ptrdiff_t])
dnl PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION})
dnl AC_SUBST(UUID_CFLAGS)
dnl AC_SUBST(UUID_LIBS)
-UUID_MIN_VERSION=1.0
-PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false);
-AC_SUBST(UUID_CFLAGS)
+ UUID_MIN_VERSION=1.0
+ PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false);
+ AC_SUBST(UUID_CFLAGS)
AC_SUBST(UUID_LIBS)
dnl Check for alsa development package - name: libasound2-dev
@@ -197,17 +200,17 @@ AC_SUBST(CCEXT2_CFLAGS)
AC_SUBST(CCRTP_LIBS)
AC_SUBST(CCRTP_CFLAGS)
-dnl Check for OpenSSL to link against pjsip and provide SIPS TLS support
+ dnl Check for OpenSSL to link against pjsip and provide SIPS TLS support
PKG_CHECK_MODULES([libssl], libssl, , AC_MSG_ERROR([libssl is required]))
AC_SUBST(libssl_CFLAGS)
- AC_SUBST(libssl_LIBS)
+AC_SUBST(libssl_LIBS)
-dnl Check for libzrtpcpp, a ccRTP extension providing zrtp key exchange
+ dnl Check for libzrtpcpp, a ccRTP extension providing zrtp key exchange
LIBZRTPCPP_MIN_VERSION=1.3.0
PKG_CHECK_MODULES(ZRTPCPP, libzrtpcpp >= ${LIBZRTPCPP_MIN_VERSION})
AC_SUBST(ZRTPCPP_LIBS)
- AC_SUBST(ZRTPCPP_CFLAGS)
-
+AC_SUBST(ZRTPCPP_CFLAGS)
+
dnl DBus-C++ detection (used to be in library own build system)
DBUS_REQUIRED_VERSION=0.60
--
GitLab