GNOME.org
 

[ekiga] Pushed almost all gmconf key definitions in gmconf-ekiga-keys.h

commit 1df6923c4060227312b0685735d45c7bb24ea08a
Author: Julien Puydt <jpuydt free fr>
Date:   Mon Jan 14 12:51:45 2013 +0100

    Pushed almost all gmconf key definitions in gmconf-ekiga-keys.h

 lib/engine/audioinput/audioinput-core.cpp          |    2 -
 lib/engine/audioinput/audioinput-gmconf-bridge.cpp |    3 --
 lib/engine/audiooutput/audiooutput-core.cpp        |    2 -
 .../audiooutput/audiooutput-gmconf-bridge.cpp      |    4 ---
 lib/engine/components/opal/opal-gmconf-bridge.cpp  |   14 ----------
 lib/engine/components/opal/opal-main.cpp           |    4 ---
 lib/engine/gui/gtk-frontend/call-window.cpp        |    4 ---
 lib/engine/gui/gtk-frontend/ext-window.cpp         |    3 --
 lib/engine/gui/gtk-frontend/preferences-window.cpp |   21 ----------------
 lib/engine/videoinput/videoinput-core.cpp          |    2 -
 lib/engine/videoinput/videoinput-gmconf-bridge.cpp |    3 --
 .../videooutput/videooutput-gmconf-bridge.cpp      |    3 --
 lib/gmconf/gmconf-ekiga-keys.h                     |   26 ++++++++++----------
 lib/gui/gmwindow.c                                 |    2 -
 14 files changed, 13 insertions(+), 80 deletions(-)
---
diff --git a/lib/engine/audioinput/audioinput-core.cpp b/lib/engine/audioinput/audioinput-core.cpp
index 46c2576..e503d8d 100644
--- a/lib/engine/audioinput/audioinput-core.cpp
+++ b/lib/engine/audioinput/audioinput-core.cpp
@@ -46,8 +46,6 @@
 
 using namespace Ekiga;
 
-#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
-
 AudioInputCore::AudioInputCore (Ekiga::ServiceCore & _core) : core(_core)
 {
   PWaitAndSignal m_var(core_mutex);
diff --git a/lib/engine/audioinput/audioinput-gmconf-bridge.cpp b/lib/engine/audioinput/audioinput-gmconf-bridge.cpp
index 123190e..945e697 100644
--- a/lib/engine/audioinput/audioinput-gmconf-bridge.cpp
+++ b/lib/engine/audioinput/audioinput-gmconf-bridge.cpp
@@ -39,9 +39,6 @@
 #include "audioinput-gmconf-bridge.h"
 #include "audioinput-core.h"
 
-#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
-#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
-
 using namespace Ekiga;
 
 AudioInputCoreConfBridge::AudioInputCoreConfBridge (Ekiga::Service & _service)
diff --git a/lib/engine/audiooutput/audiooutput-core.cpp b/lib/engine/audiooutput/audiooutput-core.cpp
index f0e3c53..17d57ed 100644
--- a/lib/engine/audiooutput/audiooutput-core.cpp
+++ b/lib/engine/audiooutput/audiooutput-core.cpp
@@ -46,8 +46,6 @@
 
 using namespace Ekiga;
 
-#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
-
 AudioOutputCore::AudioOutputCore (Ekiga::ServiceCore & _core)
 : audio_event_scheduler(*this), core(_core)
 {
diff --git a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
index 104fab0..76aa868 100644
--- a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
+++ b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
@@ -39,10 +39,6 @@
 #include "audiooutput-gmconf-bridge.h"
 #include "audiooutput-core.h"
 
-#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
-#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
-#define SOUND_EVENTS_KEY  "/apps/" PACKAGE_NAME "/general/sound_events/"
-
 using namespace Ekiga;
 
 AudioOutputCoreConfBridge::AudioOutputCoreConfBridge (Ekiga::Service & _service)
diff --git a/lib/engine/components/opal/opal-gmconf-bridge.cpp b/lib/engine/components/opal/opal-gmconf-bridge.cpp
index ce88044..48f3e90 100644
--- a/lib/engine/components/opal/opal-gmconf-bridge.cpp
+++ b/lib/engine/components/opal/opal-gmconf-bridge.cpp
@@ -51,22 +51,8 @@
 #include "h323-endpoint.h"
 #endif
 
-#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
-#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
-#define PERSONAL_DATA_KEY "/apps/" PACKAGE_NAME "/general/personal_data/"
-#define CALL_OPTIONS_KEY "/apps/" PACKAGE_NAME "/general/call_options/"
-#define NAT_KEY "/apps/" PACKAGE_NAME "/general/nat/"
-#define PROTOCOLS_KEY "/apps/" PACKAGE_NAME "/protocols/"
-#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
-#define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
-#define PORTS_KEY "/apps/" PACKAGE_NAME "/protocols/ports/"
-#define CALL_FORWARDING_KEY "/apps/" PACKAGE_NAME "/protocols/call_forwarding/"
-#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
-#define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"
-
 using namespace Opal;
 
-
 ConfBridge::ConfBridge (Ekiga::Service & _service)
  : Ekiga::ConfBridge (_service)
 {
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 26b1776..1805b1b 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -49,15 +49,11 @@
 #include "opal-plugins-hook.h"
 
 #include "sip-endpoint.h"
-#define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
 
 #ifdef HAVE_H323
 #include "h323-endpoint.h"
-#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
 #endif
 
-#define GENERAL_KEY "/apps/" PACKAGE_NAME "/general/"
-
 // opal manages its endpoints itself, so we must be wary
 struct null_deleter
 {
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 8508050..49d8e30 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -91,10 +91,6 @@ struct deviceStruct {
 
 G_DEFINE_TYPE (EkigaCallWindow, ekiga_call_window, GM_TYPE_WINDOW);
 
-#define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
-#define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"
-#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
-
 struct _EkigaCallWindowPrivate
 {
   Ekiga::ServiceCore *core;
diff --git a/lib/engine/gui/gtk-frontend/ext-window.cpp b/lib/engine/gui/gtk-frontend/ext-window.cpp
index bd2637f..e19e5ff 100644
--- a/lib/engine/gui/gtk-frontend/ext-window.cpp
+++ b/lib/engine/gui/gtk-frontend/ext-window.cpp
@@ -36,9 +36,6 @@
 #include <gdk/gdkwin32.h>
 #endif
 
-#define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
-#define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"
-
 G_DEFINE_TYPE (EkigaExtWindow, ekiga_ext_window, GTK_TYPE_WINDOW);
 
 struct _EkigaExtWindowPrivate {
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index 447e104..7767462 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -56,27 +56,6 @@
 #include "platform/winpaths.h"
 #endif
 
-#define GENERAL_KEY         "/apps/" PACKAGE_NAME "/general/"
-#define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
-#define CONTACTS_KEY "/apps/" PACKAGE_NAME "/contacts/"
-#define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"
-#define SOUND_EVENTS_KEY  "/apps/" PACKAGE_NAME "/general/sound_events/"
-#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
-#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
-#define PERSONAL_DATA_KEY "/apps/" PACKAGE_NAME "/general/personal_data/"
-#define CALL_OPTIONS_KEY "/apps/" PACKAGE_NAME "/general/call_options/"
-#define NAT_KEY "/apps/" PACKAGE_NAME "/general/nat/"
-#define PROTOCOLS_KEY "/apps/" PACKAGE_NAME "/protocols/"
-#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
-#define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
-#define PORTS_KEY "/apps/" PACKAGE_NAME "/protocols/ports/"
-#define CALL_FORWARDING_KEY "/apps/" PACKAGE_NAME "/protocols/call_forwarding/"
-#define LDAP_KEY "/apps/" PACKAGE_NAME "/protocols/ldap/"
-#define CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/"
-#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
-#define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"
-
-
 typedef struct _GmPreferencesWindow
 {
   GtkWidget *audio_codecs_list;
diff --git a/lib/engine/videoinput/videoinput-core.cpp b/lib/engine/videoinput/videoinput-core.cpp
index d801839..6867db4 100644
--- a/lib/engine/videoinput/videoinput-core.cpp
+++ b/lib/engine/videoinput/videoinput-core.cpp
@@ -44,8 +44,6 @@
 #include "videoinput-core.h"
 #include "videoinput-manager.h"
 
-#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
-
 using namespace Ekiga;
 
 VideoInputCore::VideoPreviewManager::VideoPreviewManager (VideoInputCore& _videoinput_core, boost::shared_ptr<VideoOutputCore> _videooutput_core)
diff --git a/lib/engine/videoinput/videoinput-gmconf-bridge.cpp b/lib/engine/videoinput/videoinput-gmconf-bridge.cpp
index 8195f5e..2485eb1 100644
--- a/lib/engine/videoinput/videoinput-gmconf-bridge.cpp
+++ b/lib/engine/videoinput/videoinput-gmconf-bridge.cpp
@@ -39,9 +39,6 @@
 #include "videoinput-gmconf-bridge.h"
 #include "videoinput-core.h"
 
-#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
-#define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"
-
 using namespace Ekiga;
 
 VideoInputCoreConfBridge::VideoInputCoreConfBridge (Ekiga::Service & _service)
diff --git a/lib/engine/videooutput/videooutput-gmconf-bridge.cpp b/lib/engine/videooutput/videooutput-gmconf-bridge.cpp
index fb628d1..89a0ba3 100644
--- a/lib/engine/videooutput/videooutput-gmconf-bridge.cpp
+++ b/lib/engine/videooutput/videooutput-gmconf-bridge.cpp
@@ -39,9 +39,6 @@
 #include "videooutput-gmconf-bridge.h"
 #include "videooutput-core.h"
 
-#define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
-#define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"
-
 using namespace Ekiga;
 
 VideoOutputCoreConfBridge::VideoOutputCoreConfBridge (Ekiga::Service & _service)
diff --git a/lib/gmconf/gmconf-ekiga-keys.h b/lib/gmconf/gmconf-ekiga-keys.h
index 48817aa..2ba96ca 100644
--- a/lib/gmconf/gmconf-ekiga-keys.h
+++ b/lib/gmconf/gmconf-ekiga-keys.h
@@ -40,24 +40,24 @@
 #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/"
-#define CONTACTS_KEY "/apps/" PACKAGE_NAME "/contacts/"
-#define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"
-#define SOUND_EVENTS_KEY  "/apps/" PACKAGE_NAME "/general/sound_events/"
+#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
 #define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
-#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
-#define PERSONAL_DATA_KEY "/apps/" PACKAGE_NAME "/general/personal_data/"
+#define CALL_FORWARDING_KEY "/apps/" PACKAGE_NAME "/protocols/call_forwarding/"
 #define CALL_OPTIONS_KEY "/apps/" PACKAGE_NAME "/general/call_options/"
+#define CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/"
+#define CONTACTS_KEY "/apps/" PACKAGE_NAME "/contacts/"
+#define GENERAL_KEY         "/apps/" PACKAGE_NAME "/general/"
+#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
+#define LDAP_KEY "/apps/" PACKAGE_NAME "/protocols/ldap/"
 #define NAT_KEY "/apps/" PACKAGE_NAME "/general/nat/"
+#define PERSONAL_DATA_KEY "/apps/" PACKAGE_NAME "/general/personal_data/"
+#define PORTS_KEY "/apps/" PACKAGE_NAME "/protocols/ports/"
 #define PROTOCOLS_KEY "/apps/" PACKAGE_NAME "/protocols/"
-#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
 #define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
-#define PORTS_KEY "/apps/" PACKAGE_NAME "/protocols/ports/"
-#define CALL_FORWARDING_KEY "/apps/" PACKAGE_NAME "/protocols/call_forwarding/"
-#define LDAP_KEY "/apps/" PACKAGE_NAME "/protocols/ldap/"
-#define CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/"
-#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
+#define SOUND_EVENTS_KEY  "/apps/" PACKAGE_NAME "/general/sound_events/"
+#define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
 #define VIDEO_CODECS_KEY  "/apps/" PACKAGE_NAME "/codecs/video/"
+#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
+#define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"
 
 #endif /* GMCONF_EKIGA_KEYS_H */
diff --git a/lib/gui/gmwindow.c b/lib/gui/gmwindow.c
index 95ec508..2dd9960 100644
--- a/lib/gui/gmwindow.c
+++ b/lib/gui/gmwindow.c
@@ -46,8 +46,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
-
 /*
  * The GmWindow
  */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]