[ekiga] Code cleanup

[Eugen Dedu <ededu src gnome org>]

commit f6fc7620c6b6be28a358d3c13dff7e6fb693e2ab
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Thu May 31 11:06:23 2012 +0200

    Code cleanup

 src/common.h     |   36 ------------------------------------
 src/gui/conf.cpp |    1 +
 src/gui/conf.h   |    7 ++-----
 3 files changed, 3 insertions(+), 41 deletions(-)
---
diff --git a/src/common.h b/src/common.h
index 567816d..7db4e61 100644
--- a/src/common.h
+++ b/src/common.h
@@ -39,18 +39,9 @@
 #ifndef GM_COMMON_H_
 #define GM_COMMON_H_
 
-#include <opal/buildopts.h>
-#include <ptbuildopts.h>
-
-#include <ptlib.h>
-
-#include <opal/manager.h>
-#include <opal/pcss.h>
-
 #include <h323/h323.h>
 #include <sip/sip.h>
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #define GENERAL_KEY         "/apps/" PACKAGE_NAME "/general/"
@@ -73,33 +64,6 @@
 #define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
 #define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"
 
-#define GM_FRAME_SIZE  10
-
-#define GNOMEMEETING_PAD_SMALL 1
-
-/* Contact state */
-typedef enum {
-
-  CONTACT_AVAILABLE,
-  CONTACT_AWAY,
-  CONTACT_DND,
-  CONTACT_INVISIBLE,
-  CONTACT_OFFLINE,
-  CONTACT_UNKNOWN,
-  CONTACT_LAST_STATE
-} ContactState;
-
-/* Incoming Call Mode */
-typedef enum {
-
-  AVAILABLE,
-  AUTO_ANSWER,
-  DO_NOT_DISTURB,
-  FORWARD,
-  NUM_MODES
-} IncomingCallMode;
-
-
 /* Control Panel Section */
 typedef enum {
 
diff --git a/src/gui/conf.cpp b/src/gui/conf.cpp
index 7b13fcb..b6e15f0 100644
--- a/src/gui/conf.cpp
+++ b/src/gui/conf.cpp
@@ -44,6 +44,7 @@
 #include "config.h"
 
 #include "conf.h"
+#include "common.h"
 
 #include "gmconf.h"
 
diff --git a/src/gui/conf.h b/src/gui/conf.h
index 7e57c9a..51acf00 100644
--- a/src/gui/conf.h
+++ b/src/gui/conf.h
@@ -30,10 +30,10 @@
  *                         conf.h  -  description
  *                         ------------------------
  *   begin                : Wed Feb 14 2001
- *   copyright            : (C) 2000-2006 by Damien Sandras 
+ *   copyright            : (C) 2000-2006 by Damien Sandras
  *   description          : This file contains most of config stuff.
  *                          All notifiers are here.
- *                          Callbacks that updates the config cache 
+ *                          Callbacks that updates the config cache
  *                          are in their file, except some generic one that
  *                          are in this file.
  *   Additional code      : Miguel Rodríez Péz  <migrax terra es>
@@ -44,9 +44,6 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#include "common.h"
-
-
 /* The functions */
 
 /* DESCRIPTION  :  /