update copyright step 2

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index 4d9e0adf984d6acdcf9099afbbe4d33d6f60fd3d..0521e2af6c8575a7600e3ff5a0952573945e9631 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    font.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
    Copyright (c) 2003        Derek Foreman
 
@@ -28,7 +29,7 @@
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
-#if defined(USE_PANGO) && !defined(ENABLE_NLS)
+#ifdef USE_PANGO
 #include <locale.h>
 #endif
 
@@ -291,8 +292,9 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     gint x,y,w,h;
     XftColor c;
     GString *text;
-    gint mw, mh;
+    gint mw;
 #ifndef USE_PANGO
+    gint mh;
     size_t l;
     gboolean shortened = FALSE;
 #else