make bsetroot compile with the new codebase

3 files changed, 23 insertions, 36 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
index 676e53ae..b217dde3 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -7,7 +7,9 @@ bin_SCRIPTS = 		bsetbg
 bin_PROGRAMS =		bsetroot xftlsfonts
 
 bsetroot_SOURCES =	bsetroot.cc
-bsetroot_LDADD =	../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o
+bsetroot_LDADD =	../src/basedisplay.o ../src/color.o ../src/gccache.o \
+			../src/texture.o ../src/timer.o ../src/image.o \
+			../src/imagecontrol.o ../src/util.o
 
 xftlsfonts_SOURCES = xftlsfonts.cc
 
@@ -16,10 +18,4 @@ MAINTAINERCLEANFILES =	Makefile.in
 distclean-local:
 	rm -f *\~ .\#*
 
-# local dependencies
-
-bsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \
- ../src/../nls/blackbox-nls.hh ../src/GCCache.hh ../src/BaseDisplay.hh \
- ../src/Timer.hh ../src/Color.hh ../src/Texture.hh ../src/Util.hh \
- bsetroot.hh ../src/Image.hh
-xftlsfonts.o: xftlsfonts.cc
+# local dependencies
\ No newline at end of file
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 460dc350..213d0f48 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -43,15 +43,11 @@ extern "C" {
 #endif // HAVE_CTYPE_H
 }
 
-#include "../src/i18n.hh"
-#include "../src/GCCache.hh"
-#include "../src/Texture.hh"
-#include "../src/Util.hh"
+#include "../src/gccache.hh"
+#include "../src/texture.hh"
+#include "../src/util.hh"
 #include "bsetroot.hh"
 
-
-I18n i18n;
-
 bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
   : BaseDisplay(argv[0], dpy_name) {
 
@@ -106,8 +102,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
 
   if ((mod + sol + grd) != True) {
     fprintf(stderr,
-	    i18n(bsetrootSet, bsetrootMustSpecify,
-	         "%s: error: must specify one of: -solid, -mod, -gradient\n"),
+	    "%s: error: must specify one of: -solid, -mod, -gradient\n",
 	    getApplicationName());
 
     usage(2);
@@ -348,19 +343,18 @@ void bsetroot::gradient(void) {
 
 void bsetroot::usage(int exit_code) {
     fprintf(stderr,
-	    i18n(bsetrootSet, bsetrootUsage,
-		 "%s 2.0\n\n"
-		 "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n"
-		 "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n"
-		 "  -display <string>        use display connection\n"
-		 "  -mod <x> <y>             modula pattern\n"
-		 "  -foreground, -fg <color> modula foreground color\n"
-		 "  -background, -bg <color> modula background color\n\n"
-		 "  -gradient <texture>      gradient texture\n"
-		 "  -from <color>            gradient start color\n"
-		 "  -to <color>              gradient end color\n\n"
-		 "  -solid <color>           solid color\n\n"
-		 "  -help                    print this help text and exit\n"),
+	    "%s 2.0\n\n"
+            "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n"
+            "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n"
+            "  -display <string>        use display connection\n"
+            "  -mod <x> <y>             modula pattern\n"
+            "  -foreground, -fg <color> modula foreground color\n"
+            "  -background, -bg <color> modula background color\n\n"
+            "  -gradient <texture>      gradient texture\n"
+            "  -from <color>            gradient start color\n"
+            "  -to <color>              gradient end color\n\n"
+            "  -solid <color>           solid color\n\n"
+            "  -help                    print this help text and exit\n",
 	    getApplicationName());
 
     exit(exit_code);
@@ -369,15 +363,12 @@ void bsetroot::usage(int exit_code) {
 int main(int argc, char **argv) {
   char *display_name = (char *) 0;
 
-  i18n.openCatalog("openbox.cat");
-
   for (int i = 1; i < argc; i++) {
     if (! strcmp(argv[i], "-display")) {
       // check for -display option
 
       if ((++i) >= argc) {
-        fprintf(stderr, i18n(mainSet, mainDISPLAYRequiresArg,
-		             "error: '-display' requires an argument\n"));
+        fprintf(stderr, "error: '-display' requires an argument\n");
 
         ::exit(1);
       }
diff --git a/util/bsetroot.hh b/util/bsetroot.hh
index 23e5e3d9..54956804 100644
--- a/util/bsetroot.hh
+++ b/util/bsetroot.hh
@@ -24,8 +24,8 @@
 #ifndef   __bsetroot2_hh
 #define   __bsetroot2_hh
 
-#include "../src/BaseDisplay.hh"
-#include "../src/Image.hh"
+#include "../src/basedisplay.hh"
+#include "../src/image.hh"
 
 #include <string>