define DEBUG, NDEBUG, and G_DISABLE_ASSERTS

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 8701e1d8211fdd57978ef58bfd9a4dfe87e96c10..3df451b56adeae0ba3ab33787443dd38eee40896 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   popup.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "popup.h"
 
 #include "openbox.h"
@@ -230,7 +248,7 @@ void icon_popup_free(ObIconPopup *self)
 }
 
 void icon_popup_show(ObIconPopup *self,
-                     gchar *text, struct _ObClientIcon *icon)
+                     gchar *text, const ObClientIcon *icon)
 {
     if (icon) {
         self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
@@ -263,11 +281,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
         / screen_desktop_layout.rows;
     /* make them squares */
     eachw = eachh = MIN(eachw, eachh);
-    g_message("dif %d %d %d %d ",
-              (screen_desktop_layout.columns * (eachw + ob_rr_theme->bwidth) +
-               ob_rr_theme->bwidth), w,
-              (screen_desktop_layout.rows * (eachh + ob_rr_theme->bwidth) +
-               ob_rr_theme->bwidth), h);
 
     /* center */
     px += (w - (screen_desktop_layout.columns * (eachw + ob_rr_theme->bwidth) +
@@ -275,8 +288,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
     py += (h - (screen_desktop_layout.rows * (eachh + ob_rr_theme->bwidth) +
                 ob_rr_theme->bwidth)) / 2;
 
-    g_message("%d %d %d %d", px, py, eachw, eachh);
-
     if (eachw <= 0 || eachh <= 0)
         return;
 
@@ -336,8 +347,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
         break;
     }
 
-    g_message("%d %d %d", n, horz_inc, vert_inc);
-
     rown = n;
     i = 0;
     for (r = 0, y = 0; r < screen_desktop_layout.rows;
@@ -348,8 +357,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
         {
             RrAppearance *a;
 
-            g_message("i %d n %d", i, n);
-
             if (i >= self->desks)
                 break;