aboutsummaryrefslogtreecommitdiff
path: root/src/main.cc
diff options
context:
space:
mode:
authormathias <mathias>2005-02-03 16:46:46 (GMT)
committermathias <mathias>2005-02-03 16:46:46 (GMT)
commitb7bf873aa0512c672a36cad852ebd6742ffaf681 (patch)
treea26f695388914816e9fd0202271b64acda04d58b /src/main.cc
parenta88dcb3676aaf3ab3186ba1c2fb95f02e105d819 (diff)
downloadfluxbox_pavel-b7bf873aa0512c672a36cad852ebd6742ffaf681.zip
fluxbox_pavel-b7bf873aa0512c672a36cad852ebd6742ffaf681.tar.bz2
fixes the year for fluxbox -version
added a way to display the svn-revision-number in fluxbox -info
Diffstat (limited to 'src/main.cc')
-rw-r--r--src/main.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cc b/src/main.cc
index 3da300e..ce93186 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -63,6 +63,9 @@ using namespace std;
63void showInfo(ostream &ostr) { 63void showInfo(ostream &ostr) {
64 _FB_USES_NLS; 64 _FB_USES_NLS;
65 ostr<<_FBTEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version<<endl; 65 ostr<<_FBTEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version<<endl;
66
67 if (strlen(svnversion()) > 0)
68 ostr<<"SVN Revision: "<<svnversion()<<endl;
66#if defined(__DATE__) && defined(__TIME__) 69#if defined(__DATE__) && defined(__TIME__)
67 ostr<<_FBTEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<<endl; 70 ostr<<_FBTEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<<endl;
68#endif 71#endif
@@ -221,7 +224,7 @@ int main(int argc, char **argv) {
221 "\t-help\t\t\t\tdisplay this help text and exit.\n\n", 224 "\t-help\t\t\t\tdisplay this help text and exit.\n\n",
222 225
223 "Main usage string. Please lay it out nicely. There is one %s that is given the version"), 226 "Main usage string. Please lay it out nicely. There is one %s that is given the version"),
224 __fluxbox_version, "2001-2004"); 227 __fluxbox_version, "2001-2005");
225 exit(0); 228 exit(0);
226 } else if (strcmp(argv[i], "-info") == 0 || strcmp(argv[i], "-i") == 0) { 229 } else if (strcmp(argv[i], "-info") == 0 || strcmp(argv[i], "-i") == 0) {
227 showInfo(cout); 230 showInfo(cout);