refactor some code out of sflphone_const.h

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)

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;
 

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

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>

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"

gnome/src/config/assistant.c

@@ -30,6 +30,7 @@
 
 #include <string.h>
 
+#include "unused.h"
 #include "assistant.h"
 #include "logger.h"
 #include "dbus.h"

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;

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"
 
 /**

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>

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

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"

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;

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"

gnome/src/dbus/dbus.c

@@ -46,6 +46,7 @@
 
 #include "dbus.h"
 #include "actions.h"
+#include "unused.h"
 
 #include "widget/imwidget.h"
 

gnome/src/dialpad.c

@@ -31,6 +31,7 @@
 #include "dialpad.h"
 #include "actions.h"
 #include "calltab.h"
+#include "unused.h"
 
 /**
  * button pressed event

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
 

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 */

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>

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

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