[rygel] core,rygel: Move configuration classes to core
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core,rygel: Move configuration classes to core
- Date: Sat, 11 Feb 2017 11:09:07 +0000 (UTC)
commit 391967c874cd3f24e674cd8ec7fe694e28778d45
Author: Jens Georg <mail jensge org>
Date: Sat Feb 11 12:07:36 2017 +0100
core,rygel: Move configuration classes to core
Signed-off-by: Jens Georg <mail jensge org>
https://bugzilla.gnome.org/show_bug.cgi?id=769189
src/librygel-core/Makefile.am | 3 ++-
src/librygel-core/filelist.am | 3 +++
.../rygel-cmdline-config.vala | 0
.../rygel-environment-config.vala | 2 +-
.../rygel-user-config.vala | 0
src/rygel/Makefile.am | 5 +----
6 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index 4b6fa6d..c6cb71c 100644
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -25,7 +25,8 @@ librygel_core_2_6_la_CFLAGS = \
-DSMALL_ICON_DIR='"$(smallicondir)"' \
-DBIG_ICON_DIR='"$(bigicondir)"' \
-include config.h \
- -DG_LOG_DOMAIN='"RygelCore"'
+ -DG_LOG_DOMAIN='"RygelCore"' \
+ -DSYS_CONFIG_DIR='"$(sysconfigdir)"'
librygel_core_2_6_la_LIBADD = \
$(LIBRYGEL_CORE_DEPS_LIBS) \
diff --git a/src/librygel-core/filelist.am b/src/librygel-core/filelist.am
index c743202..bc13224 100644
--- a/src/librygel-core/filelist.am
+++ b/src/librygel-core/filelist.am
@@ -20,6 +20,9 @@ LIBRYGEL_CORE_VAPI_SOURCE_FILES = \
rygel-media-device.vala \
rygel-configuration.vala \
rygel-base-configuration.vala \
+ rygel-cmdline-config.vala \
+ rygel-environment-config.vala \
+ rygel-user-config.vala \
rygel-state-machine.vala \
rygel-v1-hacks.vala
diff --git a/src/rygel/rygel-cmdline-config.vala b/src/librygel-core/rygel-cmdline-config.vala
similarity index 100%
rename from src/rygel/rygel-cmdline-config.vala
rename to src/librygel-core/rygel-cmdline-config.vala
diff --git a/src/rygel/rygel-environment-config.vala b/src/librygel-core/rygel-environment-config.vala
similarity index 99%
rename from src/rygel/rygel-environment-config.vala
rename to src/librygel-core/rygel-environment-config.vala
index c7800bb..bbe51c0 100644
--- a/src/rygel/rygel-environment-config.vala
+++ b/src/librygel-core/rygel-environment-config.vala
@@ -29,7 +29,7 @@ using Gee;
/**
* Manages configuration from Environment.
*/
-internal class Rygel.EnvironmentConfig : GLib.Object, Configuration {
+public class Rygel.EnvironmentConfig : GLib.Object, Configuration {
private static string RYGEL_PREFIX = "RYGEL";
private static string TITLE_KEY = "TITLE";
private static string DISABLE_PREFIX = RYGEL_PREFIX + "_DISABLE";
diff --git a/src/rygel/rygel-user-config.vala b/src/librygel-core/rygel-user-config.vala
similarity index 100%
rename from src/rygel/rygel-user-config.vala
rename to src/librygel-core/rygel-user-config.vala
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index a912eec..deacf8d 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -5,10 +5,7 @@ bin_PROGRAMS = rygel
rygel_SOURCES = \
rygel-acl.vala \
rygel-dbus-service.vala \
- rygel-main.vala \
- rygel-cmdline-config.vala \
- rygel-environment-config.vala \
- rygel-user-config.vala
+ rygel-main.vala
rygel_VALAFLAGS = \
--pkg posix \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]