big fat commit..

[chaz/openbox] / src / image.cc

diff --git a/src/image.cc b/src/image.cc
index 11fcd1d7bb0d5ad73d1e897d03ba3ceac5d284a6..21e9d69065bc0b9a59882309a0e58e4f8dd9ded2 100644 (file)
--- a/src/image.cc
+++ b/src/image.cc
@@ -1,25 +1,4 @@
 // -*- mode: C++; indent-tabs-mode: nil; -*-
-// Image.cc for Blackbox - an X11 Window manager
-// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
-// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"
@@ -87,8 +66,7 @@ Pixmap BImage::render_solid(const BTexture &texture) {
                                control->getDrawable(), width,
                                height, control->getDepth());
   if (pixmap == None) {
-    fprintf(stderr, i18n(ImageSet, ImageErrorCreatingSolidPixmap,
-                         "BImage::render_solid: error creating pixmap\n"));
+    fprintf(stderr, "BImage::render_solid: error creating pixmap\n");
     return None;
   }
 
@@ -454,8 +432,7 @@ XImage *BImage::renderXImage(void) {
                  width, height, 32, 0);
 
   if (! image) {
-    fprintf(stderr, i18n(ImageSet, ImageErrorCreatingXImage,
-                         "BImage::renderXImage: error creating XImage\n"));
+    fprintf(stderr, "BImage::renderXImage: error creating XImage\n");
     return (XImage *) 0;
   }
 
@@ -550,8 +527,7 @@ XImage *BImage::renderXImage(void) {
   }
 
   if (unsupported) {
-    fprintf(stderr, i18n(ImageSet, ImageUnsupVisual,
-                         "BImage::renderXImage: unsupported visual\n"));
+    fprintf(stderr, "BImage::renderXImage: unsupported visual\n");
     delete [] d;
     XDestroyImage(image);
     return (XImage *) 0;
@@ -569,8 +545,7 @@ Pixmap BImage::renderPixmap(void) {
                   control->getDrawable(), width, height, control->getDepth());
 
   if (pixmap == None) {
-    fprintf(stderr, i18n(ImageSet, ImageErrorCreatingPixmap,
-                         "BImage::renderPixmap: error creating pixmap\n"));
+    fprintf(stderr, "BImage::renderPixmap: error creating pixmap\n");
     return None;
   }