diff options
author | root <root@rshg054.dnsready.net> | 2011-08-27 23:14:39 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-08-27 23:14:39 +0000 |
commit | a4c358009dd89183b4124505c694ea7f5fcdbeec (patch) | |
tree | 2b157b1e89ca7df45bd35f6a72c39b26af558827 /community/obconf/config-file.patch | |
parent | d7d02f7c02a5c761e8a64df49598ae976640e450 (diff) |
Sat Aug 27 23:14:39 UTC 2011
Diffstat (limited to 'community/obconf/config-file.patch')
-rw-r--r-- | community/obconf/config-file.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/community/obconf/config-file.patch b/community/obconf/config-file.patch new file mode 100644 index 000000000..ce7973f3d --- /dev/null +++ b/community/obconf/config-file.patch @@ -0,0 +1,28 @@ +From: Dana Jansens <danakj@orodu.net> +Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400) +Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ... +X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889 + +Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given). +--- + +diff --git a/src/main.c b/src/main.c +index 9035e8d..a576253 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -233,11 +233,10 @@ int main(int argc, char **argv) + } + + xmlIndentTreeOutput = 1; +- if (!obt_xml_load_config_file(parse_i, +- "openbox", +- (obc_config_file ? +- obc_config_file : "rc.xml"), +- "openbox_config")) ++ if (!((obc_config_file && ++ obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) || ++ obt_xml_load_config_file(parse_i, "openbox", "rc.xml", ++ "openbox_config"))) + { + obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE); + exit_with_error = TRUE; |