[ekiga] Moved src/common.h to lib/gmconf/gmconf-ekiga-keys.h included in gmconf.h

[Julien Puydt <jpuydt src gnome org>]

commit e5bf57a43926f342c6c75275a8ff7539aab73934
Author: Julien Puydt <jpuydt free fr>
Date:   Sun Jan 13 22:48:23 2013 +0100

    Moved src/common.h to lib/gmconf/gmconf-ekiga-keys.h included in gmconf.h
    
    This makes the keys available as part of the gmconf package, and paves
    the way for the GSettings migration by putting all the eggs in the
    very same basket.

 lib/Makefile.am                                |    4 +++-
 src/common.h => lib/gmconf/gmconf-ekiga-keys.h |   15 ++++++++-------
 lib/gmconf/gmconf.h                            |    1 +
 src/Makefile.am                                |    5 ++---
 src/ekiga.h                                    |    2 +-
 src/gui/conf.cpp                               |    1 -
 src/gui/main.cpp                               |    1 -
 src/gui/statusmenu.cpp                         |    1 -
 8 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2f14b38..676e609 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -120,7 +120,9 @@ endif
 ##
 # Sources out of the gmconf directory
 ##
-libekiga_la_SOURCES += $(top_srcdir)/lib/gmconf/gmconf.h
+libekiga_la_SOURCES += \
+	$(top_srcdir)/lib/gmconf/gmconf.h \
+	$(top_srcdir)/lib/gmconf/gmconf-ekiga-keys.h
 
 if HAVE_GCONF
 libekiga_la_SOURCES += $(top_srcdir)/lib/gmconf/gmconf-gconf.c
diff --git a/src/common.h b/lib/gmconf/gmconf-ekiga-keys.h
similarity index 86%
rename from src/common.h
rename to lib/gmconf/gmconf-ekiga-keys.h
index d2d72d7..48817aa 100644
--- a/src/common.h
+++ b/lib/gmconf/gmconf-ekiga-keys.h
@@ -1,6 +1,6 @@
 
 /* Ekiga -- A VoIP and Video-Conferencing application
- * Copyright (C) 2000-2009 Damien Sandras <dsandras seconix com>
+ * Copyright (C) 2000-2013 Damien Sandras <dsandras seconix 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
@@ -27,17 +27,18 @@
 
 
 /*
- *                         common.h  -  description
+ *                         gmconf-ekiga-keys.h  -  description
  *                         ------------------------
  *   begin                : Sat Dec 23 2000
- *   copyright            : (C) 2000-2006 by Damien Sandras
- *   description          : This file contains things common to the whole soft.
+ *   copyright            : (C) 2000-2013 by Damien Sandras
+ *   description          : This file defines gmconf keys for all
+ *                          of ekiga to use
  *
  */
 
 
-#ifndef GM_COMMON_H_
-#define GM_COMMON_H_
+#ifndef GMCONF_EKIGA_KEYS_H_
+#define GMCONF_EKIGA_KEYS_H_
 
 #define GENERAL_KEY         "/apps/" PACKAGE_NAME "/general/"
 #define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
@@ -59,4 +60,4 @@
 #define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
 #define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"
 
-#endif /* GM_COMMON_H */
+#endif /* GMCONF_EKIGA_KEYS_H */
diff --git a/lib/gmconf/gmconf.h b/lib/gmconf/gmconf.h
index 1077c1c..1b852e7 100644
--- a/lib/gmconf/gmconf.h
+++ b/lib/gmconf/gmconf.h
@@ -41,6 +41,7 @@
 
 
 #include <glib.h>
+#include "gmconf-ekiga-keys.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 985c749..a5374a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,13 +48,12 @@ bin_PROGRAMS = ekiga
 EXTRA_PROGRAMS =
 
 # Common stuff
-ekiga_SOURCES =			\
-	common.h
+ekiga_SOURCES =
 
 nodist_ekiga_SOURCES =
 
 # Graphical User Interface
-ekiga_SOURCES +=			\
+ekiga_SOURCES =			\
 	gui/assistant.h			\
 	gui/assistant.cpp		\
 	gui/conf.h			\
diff --git a/src/ekiga.h b/src/ekiga.h
index 4edc8cf..5702744 100644
--- a/src/ekiga.h
+++ b/src/ekiga.h
@@ -40,7 +40,7 @@
 #define _GNOMEMEETING_H_
 
 #include "config.h"
-#include "common.h"
+#include "gmconf.h"
 #include "runtime.h"
 
 // FIXME: remove this include when the class won't have GetMainWindow and GetAssistantWindow anymore
diff --git a/src/gui/conf.cpp b/src/gui/conf.cpp
index 8202b9c..ac600b9 100644
--- a/src/gui/conf.cpp
+++ b/src/gui/conf.cpp
@@ -44,7 +44,6 @@
 #include "config.h"
 
 #include "conf.h"
-#include "common.h"
 
 #include "gmconf.h"
 
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 98650e3..faea422 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -36,7 +36,6 @@
 
 #include "revision.h"
 #include "config.h"
-#include "common.h"
 
 #include "platform/platform.h"
 
diff --git a/src/gui/statusmenu.cpp b/src/gui/statusmenu.cpp
index 7910892..ccd4b07 100644
--- a/src/gui/statusmenu.cpp
+++ b/src/gui/statusmenu.cpp
@@ -40,7 +40,6 @@
 
 #include "statusmenu.h"
 
-#include "common.h"
 #include "personal-details.h"
 
 #include "gmconf.h"