aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2006-11-12 17:16:56 (GMT)
committerfluxgen <fluxgen>2006-11-12 17:16:56 (GMT)
commit3efe68ffe30a24169492a97a9a0a883990e68b6a (patch)
tree17414434e41a73e250b0b3f3f65d4fd16e2b62e8 /src/fluxbox.cc
parenta3c5fd60001fc498a8b9904e63358751a17553da (diff)
downloadfluxbox_paul-3efe68ffe30a24169492a97a9a0a883990e68b6a.zip
fluxbox_paul-3efe68ffe30a24169492a97a9a0a883990e68b6a.tar.bz2
removed duplicate headers, patch from Slava Semushin aka php-coder
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index b23ab70..6827ca3 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -50,7 +50,6 @@
50#include "FbTk/XrmDatabaseHelper.hh" 50#include "FbTk/XrmDatabaseHelper.hh"
51#include "FbTk/Command.hh" 51#include "FbTk/Command.hh"
52#include "FbTk/RefCount.hh" 52#include "FbTk/RefCount.hh"
53#include "FbTk/SimpleCommand.hh"
54#include "FbTk/CompareEqual.hh" 53#include "FbTk/CompareEqual.hh"
55#include "FbTk/Transparent.hh" 54#include "FbTk/Transparent.hh"
56#include "FbTk/Select2nd.hh" 55#include "FbTk/Select2nd.hh"
@@ -330,10 +329,14 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
330 setupConfigFiles(); 329 setupConfigFiles();
331 330
332 if (! XSupportsLocale()) 331 if (! XSupportsLocale())
333 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocale, "Warning: X server does not support locale", "XSupportsLocale returned false")<<endl; 332 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocale,
333 "Warning: X server does not support locale",
334 "XSupportsLocale returned false")<<endl;
334 335
335 if (XSetLocaleModifiers("") == 0) 336 if (XSetLocaleModifiers("") == 0)
336 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocaleModifiers, "Warning: cannot set locale modifiers", "XSetLocaleModifiers returned false")<<endl; 337 cerr<<_FB_CONSOLETEXT(Fluxbox, WarningLocaleModifiers,
338 "Warning: cannot set locale modifiers",
339 "XSetLocaleModifiers returned false")<<endl;
337 340
338 341
339#ifdef HAVE_GETPID 342#ifdef HAVE_GETPID
@@ -353,7 +356,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
353 for (i = 1; i < m_argc; i++) { 356 for (i = 1; i < m_argc; i++) {
354 if (! strcmp(m_argv[i], "-screen")) { 357 if (! strcmp(m_argv[i], "-screen")) {
355 if ((++i) >= m_argc) { 358 if ((++i) >= m_argc) {
356 cerr << _FB_CONSOLETEXT(main, ScreenRequiresArg, "error, -screen requires argument", "the -screen option requires a file argument") << endl; 359 cerr << _FB_CONSOLETEXT(main, ScreenRequiresArg,
360 "error, -screen requires argument",
361 "the -screen option requires a file argument") << endl;
357 exit(1); 362 exit(1);
358 } 363 }
359 364