aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-07-18 15:44:36 (GMT)
committerrathnor <rathnor>2003-07-18 15:44:36 (GMT)
commit2e3bd41f4e0e5d10c65888b277f944d75938fab8 (patch)
treeade56490f1b1789376efcb55c9ae8f219e766ef4
parent7e1733c4352befe577150bad63d362dd7c1a94b9 (diff)
downloadfluxbox-2e3bd41f4e0e5d10c65888b277f944d75938fab8.zip
fluxbox-2e3bd41f4e0e5d10c65888b277f944d75938fab8.tar.bz2
add compiled-in defaults to output of fluxbox -info (thanks Matt Hope)
-rw-r--r--ChangeLog2
-rw-r--r--src/main.cc12
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b72753..2b8c050 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.5: 2Changes for 0.9.5:
3*03/07/19: 3*03/07/19:
4 * Add compiled-in defaults to fluxbox -info (thanks Matt Hope)
5 main.cc
4 * Redo ResourceManager so that it loads resources on registration, and 6 * Redo ResourceManager so that it loads resources on registration, and
5 only opens the database in blocks of requests (Simon) 7 only opens the database in blocks of requests (Simon)
6 - fixes initial loading of init resources (e.g. toolbar.layer) 8 - fixes initial loading of init resources (e.g. toolbar.layer)
diff --git a/src/main.cc b/src/main.cc
index e9fb414..7a82857 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,11 +20,12 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: main.cc,v 1.20 2003/07/11 15:03:02 fluxgen Exp $ 23// $Id: main.cc,v 1.21 2003/07/18 15:44:36 rathnor Exp $
24 24
25#include "fluxbox.hh" 25#include "fluxbox.hh"
26#include "I18n.hh" 26#include "I18n.hh"
27#include "version.h" 27#include "version.h"
28#include "defaults.hh"
28 29
29#ifdef HAVE_CONFIG_H 30#ifdef HAVE_CONFIG_H
30#include "config.h" 31#include "config.h"
@@ -55,8 +56,15 @@ void showInfo(ostream &ostr) {
55#endif 56#endif
56 ostr<<endl<<"Compiler version: "<<__VERSION__<<endl; 57 ostr<<endl<<"Compiler version: "<<__VERSION__<<endl;
57 58
59 ostr<<endl<<"Defaults:"<<endl;
60 ostr<<" menu: "<<DEFAULTMENU<<endl;
61 ostr<<" style: "<<DEFAULTSTYLE<<endl;
62
63 ostr<<" keys: "<<DEFAULTKEYSFILE<<endl;
64 ostr<<" init: "<<DEFAULT_INITFILE<<endl;
65
58 const char NOT[] = "-"; 66 const char NOT[] = "-";
59 ostr<<"Compiled options ("<<NOT<<" => disabled): "<<endl<< 67 ostr<<endl<<"Compiled options ("<<NOT<<" => disabled): "<<endl<<
60#ifndef DEBUG 68#ifndef DEBUG
61 NOT<< 69 NOT<<
62#endif // DEBUG 70#endif // DEBUG