diff options
author | Jens Georg <jensg@openismus.com> | 2012-08-30 08:43:29 +0200 |
---|---|---|
committer | Jens Georg <mail@jensge.org> | 2012-09-21 16:02:51 +0200 |
commit | 628976934ea4d7188ca16e5df6395e49e8a887a5 (patch) | |
tree | a7863a1086bf298c5203731d82176ed6445df838 /src | |
parent | f6d6fe8d6130a86958a3524beeee8686e099607c (diff) | |
download | rygel-628976934ea4d7188ca16e5df6395e49e8a887a5.tar.gz |
core: Move executable configuration out of core
The files are only ever used by the rygel executable and are not necessary in
libcore.
Diffstat (limited to 'src')
-rw-r--r-- | src/librygel-core/filelist.am | 5 | ||||
-rw-r--r-- | src/librygel-core/rygel-meta-config.vala | 21 | ||||
-rw-r--r-- | src/rygel/Makefile.am | 3 | ||||
-rw-r--r-- | src/rygel/rygel-cmdline-config.vala (renamed from src/librygel-core/rygel-cmdline-config.vala) | 0 | ||||
-rw-r--r-- | src/rygel/rygel-environment-config.vala (renamed from src/librygel-core/rygel-environment-config.vala) | 0 | ||||
-rw-r--r-- | src/rygel/rygel-main.vala | 24 | ||||
-rw-r--r-- | src/rygel/rygel-user-config.vala (renamed from src/librygel-core/rygel-user-config.vala) | 0 | ||||
-rw-r--r-- | src/ui/Makefile.am | 3 | ||||
-rw-r--r-- | src/ui/rygel-preferences-dialog.vala | 2 | ||||
l--------- | src/ui/rygel-user-config.vala | 1 |
10 files changed, 31 insertions, 28 deletions
diff --git a/src/librygel-core/filelist.am b/src/librygel-core/filelist.am index d98cb746..a3490723 100644 --- a/src/librygel-core/filelist.am +++ b/src/librygel-core/filelist.am @@ -1,5 +1,4 @@ LIBRYGEL_CORE_VAPI_SOURCE_FILES = \ - rygel-cmdline-config.vala \ rygel-connection-manager.vala \ rygel-description-file.vala \ rygel-root-device.vala \ @@ -10,7 +9,6 @@ LIBRYGEL_CORE_VAPI_SOURCE_FILES = \ rygel-plugin-loader.vala \ rygel-plugin.vala \ rygel-resource-info.vala \ - rygel-user-config.vala \ rygel-media-device.vala \ rygel-configuration.vala \ rygel-free-desktop-interfaces.vala \ @@ -18,8 +16,7 @@ LIBRYGEL_CORE_VAPI_SOURCE_FILES = \ LIBRYGEL_CORE_NONVAPI_SOURCE_FILES = \ rygel-icon-info.vala \ - rygel-xml-utils.vala \ - rygel-environment-config.vala + rygel-xml-utils.vala LIBRYGEL_CORE_VALAFLAGS_PKG = \ --pkg gio-2.0 \ diff --git a/src/librygel-core/rygel-meta-config.vala b/src/librygel-core/rygel-meta-config.vala index 9d055863..3bae6c1a 100644 --- a/src/librygel-core/rygel-meta-config.vala +++ b/src/librygel-core/rygel-meta-config.vala @@ -58,27 +58,6 @@ public class Rygel.MetaConfig : GLib.Object, Configuration { configs.add (config); } - public static void register_default_configurations () { - - var cmdline_config = CmdlineConfig.get_default (); - - MetaConfig.register_configuration (cmdline_config); - MetaConfig.register_configuration (EnvironmentConfig.get_default ()); - - try { - var config_file = cmdline_config.get_config_file (); - var user_config = new UserConfig (config_file); - MetaConfig.register_configuration (user_config); - } catch (Error error) { - try { - var user_config = UserConfig.get_default (); - MetaConfig.register_configuration (user_config); - } catch (Error err) { - warning (_("Failed to load user configuration: %s"), err.message); - } - } - } - public bool get_upnp_enabled () throws GLib.Error { bool val = true; bool unavailable = true; diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am index 6388d13d..d2ceb4f4 100644 --- a/src/rygel/Makefile.am +++ b/src/rygel/Makefile.am @@ -14,6 +14,9 @@ bin_PROGRAMS = rygel rygel_SOURCES = \ rygel-dbus-service.vala \ rygel-main.vala \ + rygel-cmdline-config.vala \ + rygel-environment-config.vala \ + rygel-user-config.vala \ $(top_builddir)/src/librygel-core/rygel-core-1.0.vapi rygel_VALAFLAGS = \ diff --git a/src/librygel-core/rygel-cmdline-config.vala b/src/rygel/rygel-cmdline-config.vala index ccf7d97b..ccf7d97b 100644 --- a/src/librygel-core/rygel-cmdline-config.vala +++ b/src/rygel/rygel-cmdline-config.vala diff --git a/src/librygel-core/rygel-environment-config.vala b/src/rygel/rygel-environment-config.vala index 35d991b9..35d991b9 100644 --- a/src/librygel-core/rygel-environment-config.vala +++ b/src/rygel/rygel-environment-config.vala diff --git a/src/rygel/rygel-main.vala b/src/rygel/rygel-main.vala index 74451993..8207d826 100644 --- a/src/rygel/rygel-main.vala +++ b/src/rygel/rygel-main.vala @@ -242,6 +242,28 @@ internal class Rygel.Main : Object { } } + private static void register_default_configurations () { + + var cmdline_config = CmdlineConfig.get_default (); + + MetaConfig.register_configuration (cmdline_config); + MetaConfig.register_configuration (EnvironmentConfig.get_default ()); + + try { + var config_file = cmdline_config.get_config_file (); + var user_config = new UserConfig (config_file); + MetaConfig.register_configuration (user_config); + } catch (Error error) { + try { + var user_config = UserConfig.get_default (); + MetaConfig.register_configuration (user_config); + } catch (Error err) { + warning (_("Failed to load user configuration: %s"), err.message); + } + } + } + + private static int main (string[] args) { Main main = null; DBusService service = null; @@ -257,7 +279,7 @@ internal class Rygel.Main : Object { try { // Parse commandline options CmdlineConfig.parse_args (ref args); - MetaConfig.register_default_configurations (); + Main.register_default_configurations (); main = new Main (); service = new DBusService (main); diff --git a/src/librygel-core/rygel-user-config.vala b/src/rygel/rygel-user-config.vala index 06efffd7..06efffd7 100644 --- a/src/librygel-core/rygel-user-config.vala +++ b/src/rygel/rygel-user-config.vala diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am index 644dde6f..a5ad8273 100644 --- a/src/ui/Makefile.am +++ b/src/ui/Makefile.am @@ -12,7 +12,8 @@ rygel_preferences_SOURCES = \ rygel-preferences-section.vala \ rygel-media-pref-section.vala \ rygel-writable-user-config.vala \ - rygel-network-pref-section.vala + rygel-network-pref-section.vala \ + rygel-user-config.vala rygel_preferences_VALAFLAGS = \ --thread --pkg gio-2.0 \ diff --git a/src/ui/rygel-preferences-dialog.vala b/src/ui/rygel-preferences-dialog.vala index c80dcd30..7cdd0fcd 100644 --- a/src/ui/rygel-preferences-dialog.vala +++ b/src/ui/rygel-preferences-dialog.vala @@ -86,7 +86,7 @@ public class Rygel.PreferencesDialog : GLib.Object { Gtk.init (ref args); try { - MetaConfig.register_default_configurations (); + MetaConfig.register_configuration (UserConfig.get_default ()); var dialog = new PreferencesDialog (); dialog.run (); diff --git a/src/ui/rygel-user-config.vala b/src/ui/rygel-user-config.vala new file mode 120000 index 00000000..11bb1570 --- /dev/null +++ b/src/ui/rygel-user-config.vala @@ -0,0 +1 @@ +../rygel/rygel-user-config.vala
\ No newline at end of file |