diff --git a/gnome/src/Makefile.am b/gnome/src/Makefile.am
index 778f6d3e097cb0258a746e622cd86163ba9f739c..3348f1b2d72d09e41986f50577a8269886b67c75 100644
--- a/gnome/src/Makefile.am
+++ b/gnome/src/Makefile.am
@@ -32,7 +32,7 @@ sflphone_client_gnome_SOURCES = \
noinst_HEADERS = actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
reqaccount.h sflphone_const.h uimanager.h \
accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \
- shortcuts.h eel-gconf-extensions.h logger.h imwindow.h
+ shortcuts.h eel-gconf-extensions.h logger.h imwindow.h unused.h
sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
$(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(LIBGNOMEUI_LIBS) $(GNOMEDOCUTILS_LIBS) $(LD_LIBS)
diff --git a/gnome/src/accountlist.c b/gnome/src/accountlist.c
index 83e6d171b6d52d1f5e6cc9887050a9ef735f3e9b..662c7bc8729bbfb53cf32df66501c91944844eaf 100644
--- a/gnome/src/accountlist.c
+++ b/gnome/src/accountlist.c
@@ -29,8 +29,9 @@
* as that of the covered work.
*/
-#include <accountlist.h>
-#include <actions.h>
+#include "accountlist.h"
+#include "actions.h"
+#include "unused.h"
static GQueue * accountQueue;
diff --git a/gnome/src/config/accountconfigdialog.c b/gnome/src/config/accountconfigdialog.c
index fcf744c69e662db07f772436c8176211149e03db..2e5f08d6665d60eec4dc813ac87ea52843fa688e 100644
--- a/gnome/src/config/accountconfigdialog.c
+++ b/gnome/src/config/accountconfigdialog.c
@@ -50,6 +50,7 @@
#include "audioconf.h"
#include "dbus/dbus.h"
#include "utils.h"
+#include "unused.h"
/**
* TODO: tidy this up
diff --git a/gnome/src/config/accountlistconfigdialog.c b/gnome/src/config/accountlistconfigdialog.c
index d2ec3fb185426c08bc972b81abfd9b5183f1bfda..47d7aa86b74ae46c3fe9afd225a4dc172389de6f 100644
--- a/gnome/src/config/accountlistconfigdialog.c
+++ b/gnome/src/config/accountlistconfigdialog.c
@@ -36,6 +36,7 @@
#include "actions.h"
#include "mainwindow.h"
#include "utils.h"
+#include "unused.h"
#include "logger.h"
#include <string.h>
#include <libgnome/gnome-help.h>
diff --git a/gnome/src/config/addressbook-config.c b/gnome/src/config/addressbook-config.c
index e640dbca592c086643f51d9e49e7a1e97062b3c8..9abbd3cc6b113ce0613df2c1f60c7057a7386578 100644
--- a/gnome/src/config/addressbook-config.c
+++ b/gnome/src/config/addressbook-config.c
@@ -30,6 +30,7 @@
#include "addressbook-config.h"
#include "dbus.h"
+#include "unused.h"
#include "logger.h"
#include "searchbar.h"
#include "contacts/addrbookfactory.h"
diff --git a/gnome/src/config/assistant.c b/gnome/src/config/assistant.c
index 57d5aec747c9c694b11d53fe5f3fc02c84e33e3a..d3755dbe2199f1c5faae9cec2dc53f286c9a59de 100644
--- a/gnome/src/config/assistant.c
+++ b/gnome/src/config/assistant.c
@@ -30,6 +30,7 @@
#include <string.h>
+#include "unused.h"
#include "assistant.h"
#include "logger.h"
#include "dbus.h"
diff --git a/gnome/src/config/audioconf.c b/gnome/src/config/audioconf.c
index 96fb3e1d8fbec3b1a11c030a06595bb408beb306..77fe694fde4f44fe82e6d4a89fa58402bbd62292 100644
--- a/gnome/src/config/audioconf.c
+++ b/gnome/src/config/audioconf.c
@@ -36,6 +36,7 @@
#include "dbus/dbus.h"
#include "uimanager.h"
#include "mainwindow.h"
+#include "unused.h"
/* FIXME: these should be in a struct rather than at file scope */
static GtkListStore *pluginlist;
diff --git a/gnome/src/config/preferencesdialog.c b/gnome/src/config/preferencesdialog.c
index 67c1d4d065d7f8cb01b1a1f063e658a33135874e..52393533ef1c7e34efba7c76b14b9c2ba09fb930 100644
--- a/gnome/src/config/preferencesdialog.c
+++ b/gnome/src/config/preferencesdialog.c
@@ -48,6 +48,7 @@
#include "hooks-config.h"
#include "audioconf.h"
#include "uimanager.h"
+#include "unused.h"
#include "mainwindow.h"
/**
diff --git a/gnome/src/config/shortcuts-config.c b/gnome/src/config/shortcuts-config.c
index 8b1932baac456090874a32fd00936dae8f6460f3..ba3fc72ff9b80430d6c7a76893fae82ce7dd85af 100644
--- a/gnome/src/config/shortcuts-config.c
+++ b/gnome/src/config/shortcuts-config.c
@@ -30,6 +30,7 @@
#include "shortcuts-config.h"
#include "shortcuts.h"
+#include "unused.h"
#include "logger.h"
#include <gdk/gdkx.h>
diff --git a/gnome/src/contacts/calllist.c b/gnome/src/contacts/calllist.c
index 76f74d61b68a2a63c0cefb436da6c8a2f495f70f..fd20bec21cfe732b720cba06aa2a561547b5c93c 100644
--- a/gnome/src/contacts/calllist.c
+++ b/gnome/src/contacts/calllist.c
@@ -31,8 +31,8 @@
#include "calllist.h"
#include "calltab.h"
#include "calltree.h"
+#include "unused.h"
#include "logger.h"
-#include "contacts/searchbar.h"
#include "eel-gconf-extensions.h"
static
diff --git a/gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c
index 17961c6bc8a202e64808693a1997a8f279c3aeaa..c1abb7d000cb084759d846bc3e1181842fd19d5f 100644
--- a/gnome/src/contacts/calltree.c
+++ b/gnome/src/contacts/calltree.c
@@ -36,6 +36,7 @@
#include <glib/gprintf.h>
#include "eel-gconf-extensions.h"
+#include "unused.h"
#include "dbus.h"
#include "calltab.h"
#include "logger.h"
diff --git a/gnome/src/contacts/history.c b/gnome/src/contacts/history.c
index e311978e465cec93b0e21098ccfd32f85cd3aa78..36cd0a2ac4ad1d72e2b8c7cb1b097683739d5889 100644
--- a/gnome/src/contacts/history.c
+++ b/gnome/src/contacts/history.c
@@ -28,10 +28,11 @@
* as that of the covered work.
*/
-#include <history.h>
#include <string.h>
-#include <searchbar.h>
-#include <calltab.h>
+#include "history.h"
+#include "searchbar.h"
+#include "calltab.h"
+#include "unused.h"
static GtkTreeModel *history_filter;
static GtkEntry *history_searchbar_widget;
diff --git a/gnome/src/contacts/searchbar.c b/gnome/src/contacts/searchbar.c
index aa39c8d7393eafd8a266ada5f6f142dd6c991828..6a14a7e18dbac3dfd229f42706edf0bb5c6e7da2 100644
--- a/gnome/src/contacts/searchbar.c
+++ b/gnome/src/contacts/searchbar.c
@@ -36,6 +36,7 @@
#include "calltab.h"
#include "dbus.h"
#include "logger.h"
+#include "unused.h"
#include "config/addressbook-config.h"
#include "contacts/addressbook.h"
#include "contacts/addrbookfactory.h"
diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c
index 9980fb297d6065f96471a4c176abca20b8d9c8b4..3ff02aa0214791a98dc2c0bacb0983919f5adc94 100644
--- a/gnome/src/dbus/dbus.c
+++ b/gnome/src/dbus/dbus.c
@@ -46,6 +46,7 @@
#include "dbus.h"
#include "actions.h"
+#include "unused.h"
#include "widget/imwidget.h"
diff --git a/gnome/src/dialpad.c b/gnome/src/dialpad.c
index c7a02b988a2fc1aaa6efad6ba253010e47d4d814..0ae6f527976d2801bf7e202bbebeff668f1a414a 100644
--- a/gnome/src/dialpad.c
+++ b/gnome/src/dialpad.c
@@ -31,6 +31,7 @@
#include "dialpad.h"
#include "actions.h"
#include "calltab.h"
+#include "unused.h"
/**
* button pressed event
diff --git a/gnome/src/eel-gconf-extensions.h b/gnome/src/eel-gconf-extensions.h
index f9e4f5c381159e79d732e5c55a687a009d7814c4..0068b15b2f4bf6b35a5f426685c3b67cba5bf12b 100644
--- a/gnome/src/eel-gconf-extensions.h
+++ b/gnome/src/eel-gconf-extensions.h
@@ -32,6 +32,28 @@
#ifdef __cplusplus
BEGIN_EXTERN_C
#endif
+/**
+ * Gconf
+ */
+#define CONF_PREFIX "/apps/sflphone-client-gnome"
+#define CONF_MAIN_WINDOW_WIDTH CONF_PREFIX "/state/window_width"
+#define CONF_MAIN_WINDOW_HEIGHT CONF_PREFIX "/state/window_height"
+#define CONF_MAIN_WINDOW_POSITION_X CONF_PREFIX "/state/window_position_x"
+#define CONF_MAIN_WINDOW_POSITION_Y CONF_PREFIX "/state/window_position_y"
+#define CONF_IM_WINDOW_WIDTH CONF_PREFIX "/state/im_width"
+#define CONF_IM_WINDOW_HEIGHT CONF_PREFIX "/state/im_height"
+#define CONF_IM_WINDOW_POSITION_X CONF_PREFIX "/state/im_position_x"
+#define CONF_IM_WINDOW_POSITION_Y CONF_PREFIX "/state/im_position_y"
+/** Show/Hide the dialpad */
+#define CONF_SHOW_DIALPAD CONF_PREFIX "/state/dialpad"
+#define SHOW_VOLUME_CONTROLS CONF_PREFIX "/state/volume_controls"
+#define SHOW_STATUSICON CONF_PREFIX "/state/statusicon"
+#define NOTIFY_ALL CONF_PREFIX "/state/notify_all"
+#define START_HIDDEN CONF_PREFIX "/state/start_hidden"
+#define POPUP_ON_CALL CONF_PREFIX "/state/popup"
+#define HISTORY_ENABLED CONF_PREFIX "/state/history"
+#define INSTANT_MESSAGING_ENABLED CONF_PREFIX "/state/instant_messaging"
+
#define EEL_GCONF_UNDEFINED_CONNECTION 0
diff --git a/gnome/src/imwindow.c b/gnome/src/imwindow.c
index 32940ff323c2769a73e8cb65fbf0fedd9cfec478..43d8608033dc3652abaf9caca7332b042a6deb09 100644
--- a/gnome/src/imwindow.c
+++ b/gnome/src/imwindow.c
@@ -32,11 +32,12 @@
#include "config.h"
#include "eel-gconf-extensions.h"
-#include "sflphone_const.h"
#include "logger.h"
#include "imwindow.h"
+#include "unused.h"
#include "contacts/calltab.h"
#include "contacts/calltab.h"
+#include "sflphone_const.h"
#include <sys/stat.h>
/** Local variables */
diff --git a/gnome/src/mainwindow.c b/gnome/src/mainwindow.c
index dd1b1c316043163f837bc655b69a0d876781c42d..eea520d9f4430efcc776583783778507a3cc8feb 100644
--- a/gnome/src/mainwindow.c
+++ b/gnome/src/mainwindow.c
@@ -46,6 +46,7 @@
#include "widget/gtkscrollbook.h"
#include "widget/minidialog.h"
#include "uimanager.h"
+#include "unused.h"
#include "config/audioconf.h"
#include <sys/stat.h>
diff --git a/gnome/src/sflphone_const.h b/gnome/src/sflphone_const.h
index 5f36e3f20253630d71e9e5b6d60fb75415d7cc74..fd7cec91d20a169620047955d07a11c3451d739d 100644
--- a/gnome/src/sflphone_const.h
+++ b/gnome/src/sflphone_const.h
@@ -55,11 +55,6 @@
#define IP2IP "IP2IP"
-/** Warnings unused variables **/
-#define UNUSED_VAR(var) (void*)var
-
-#define UNUSED __attribute__((__unused__))
-
#define IP2IP_PROFILE "IP2IP"
#define ACCOUNT_ID "Account.id"
@@ -170,26 +165,4 @@
/** Desktop notifications - Time before to close the notification*/
#define __TIMEOUT_TIME 18000 // 30 secondes
-/**
- * Gconf
- */
-#define CONF_PREFIX "/apps/sflphone-client-gnome"
-#define CONF_MAIN_WINDOW_WIDTH CONF_PREFIX "/state/window_width"
-#define CONF_MAIN_WINDOW_HEIGHT CONF_PREFIX "/state/window_height"
-#define CONF_MAIN_WINDOW_POSITION_X CONF_PREFIX "/state/window_position_x"
-#define CONF_MAIN_WINDOW_POSITION_Y CONF_PREFIX "/state/window_position_y"
-#define CONF_IM_WINDOW_WIDTH CONF_PREFIX "/state/im_width"
-#define CONF_IM_WINDOW_HEIGHT CONF_PREFIX "/state/im_height"
-#define CONF_IM_WINDOW_POSITION_X CONF_PREFIX "/state/im_position_x"
-#define CONF_IM_WINDOW_POSITION_Y CONF_PREFIX "/state/im_position_y"
-/** Show/Hide the dialpad */
-#define CONF_SHOW_DIALPAD CONF_PREFIX "/state/dialpad"
-#define SHOW_VOLUME_CONTROLS CONF_PREFIX "/state/volume_controls"
-#define SHOW_STATUSICON CONF_PREFIX "/state/statusicon"
-#define NOTIFY_ALL CONF_PREFIX "/state/notify_all"
-#define START_HIDDEN CONF_PREFIX "/state/start_hidden"
-#define POPUP_ON_CALL CONF_PREFIX "/state/popup"
-#define HISTORY_ENABLED CONF_PREFIX "/state/history"
-#define INSTANT_MESSAGING_ENABLED CONF_PREFIX "/state/instant_messaging"
-
#endif
diff --git a/gnome/src/shortcuts.c b/gnome/src/shortcuts.c
index 737b917a918ec4648daea2728f55f9b0cf263610..014e4298d323913884ac03e6be87448633a7827a 100644
--- a/gnome/src/shortcuts.c
+++ b/gnome/src/shortcuts.c
@@ -46,6 +46,7 @@
#include "sflphone_const.h"
#include "dbus.h"
#include "actions.h"
+#include "unused.h"
static void
ungrab_key(guint key, GdkModifierType mask, const GdkWindow *root);
diff --git a/gnome/src/statusicon.c b/gnome/src/statusicon.c
index aac67c039cd3e2497a0b45093b11633f79bf6738..60e12a186748ba8be34e554ce2510e5cc41ad461 100644
--- a/gnome/src/statusicon.c
+++ b/gnome/src/statusicon.c
@@ -36,6 +36,7 @@
#include "statusicon.h"
#include "eel-gconf-extensions.h"
#include "logger.h"
+#include "unused.h"
static GtkStatusIcon *status;
static GtkWidget *show_menu_item, *hangup_menu_item;
diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c
index f4aded2fd6f7713ac968956530ec265f74fb41ec..1030d2826b74518b2c4302e3360992a3ebe4b28a 100644
--- a/gnome/src/uimanager.c
+++ b/gnome/src/uimanager.c
@@ -45,6 +45,7 @@
#include "eel-gconf-extensions.h"
#include "config/audioconf.h"
+#include "unused.h"
#include "uimanager.h"
#include "statusicon.h"
diff --git a/gnome/src/unused.h b/gnome/src/unused.h
new file mode 100644
index 0000000000000000000000000000000000000000..24a0ac2e40553a92badabed036fdb285057ee365
--- /dev/null
+++ b/gnome/src/unused.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
+ * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
+ */
+
+#ifndef UNUSED_H_
+
+#define UNUSED __attribute__((__unused__))
+
+#endif /* UNUSED_H_ */
diff --git a/gnome/src/widget/gtkscrollbook.c b/gnome/src/widget/gtkscrollbook.c
index c18f2c3aa079bd160b7999e92de16f98c2af4f61..0e8d5e9556a55bb2a4e3dee0cf76eed02c3c378c 100644
--- a/gnome/src/widget/gtkscrollbook.c
+++ b/gnome/src/widget/gtkscrollbook.c
@@ -25,6 +25,7 @@
*/
#include "gtkscrollbook.h"
+#include "unused.h"
#include "sflphone_const.h"
static void pidgin_scroll_book_init(PidginScrollBook *scroll_book);
diff --git a/gnome/src/widget/imwidget.c b/gnome/src/widget/imwidget.c
index baf85d9eb54ed2e44807658ad5411badf07192b2..84e83adbe48cdfe6e6b85af5e3fa465f72e361b8 100644
--- a/gnome/src/widget/imwidget.c
+++ b/gnome/src/widget/imwidget.c
@@ -31,13 +31,13 @@
#include "logger.h"
#include "imwidget.h"
#include "dbus.h"
+#include "unused.h"
#include "icons/icon_factory.h"
#include "contacts/calltab.h"
#include "contacts/conferencelist.h"
#include <JavaScriptCore/JavaScript.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "sflphone_const.h"
#define WEBKIT_DIR "file://" DATA_DIR "/webkit/"
diff --git a/gnome/src/widget/minidialog.c b/gnome/src/widget/minidialog.c
index 4bdc72214af52079c8c13492faf1433c83e8b6bd..6889873fff7942fb071ebfa750f2b8ef7f856c6e 100644
--- a/gnome/src/widget/minidialog.c
+++ b/gnome/src/widget/minidialog.c
@@ -24,6 +24,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include <gtk/gtk.h>
+#include "unused.h"
#include "sflphone_const.h"
#include "minidialog.h"