Debugging stuff now provided by libxfce4util. As a result of this change

libxfcegui4 now depends on libxfce4util.
Some other updates.
added a hint to the libxfcegui4 README for Xinerama problems with XFree86.


(Old svn revision: 11033)

19 files changed, 14 insertions, 54 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e958d9c6..a67b123c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,6 @@ bin_PROGRAMS = xfwm4
 xfwm4_SOURCES =								\
 	client.c							\
 	client.h							\
-	debug.h 							\
 	events.c 							\
 	events.h 							\
 	frame.c 							\
@@ -47,10 +46,6 @@ xfwm4_CFLAGS =								\
 	@LIBXPM_CFLAGS@							\
 	-I$(top_builddir)/common					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
-	-DG_DISABLE_DEPRECATED						\
-	-DGTK_DISABLE_DEPRECATED					\
-	-DGDK_DISABLE_DEPRECATED					\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED					\
 	-DDATADIR=\"$(pkgdatadir)\"
 
 xfwm4_LDADD =								\
diff --git a/src/Makefile.in b/src/Makefile.in
index 9b84905cf..7a8444c3b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -175,7 +175,6 @@ bin_PROGRAMS = xfwm4
 xfwm4_SOURCES = \
 	client.c							\
 	client.h							\
-	debug.h 							\
 	events.c 							\
 	events.h 							\
 	frame.c 							\
@@ -220,10 +219,6 @@ xfwm4_CFLAGS = \
 	@LIBXPM_CFLAGS@							\
 	-I$(top_builddir)/common					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
-	-DG_DISABLE_DEPRECATED						\
-	-DGTK_DISABLE_DEPRECATED					\
-	-DGDK_DISABLE_DEPRECATED					\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED					\
 	-DDATADIR=\"$(pkgdatadir)\"
 
 
diff --git a/src/client.c b/src/client.c
index 55a57d749..90813503b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -33,6 +33,7 @@
 #include <gdk/gdkx.h>
 #include <glib.h>
 
+#include <libxfce4util/debug.h>
 #include <libxfce4util/i18n.h>
 #include <libxfcegui4/libxfcegui4.h>
 
@@ -47,7 +48,6 @@
 #include "tabwin.h"
 #include "session.h"
 #include "startup_notification.h"
-#include "debug.h"
 
 /* Event mask definition */
 
diff --git a/src/debug.h b/src/debug.h
deleted file mode 100644
index 629f885fc..000000000
--- a/src/debug.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-        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; You may only use version 2 of the License,
-        you have no option to use any other 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.
- 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- */
-
-#ifndef INC_DEBUG_H
-#define INC_DEBUG_H
-
-#if defined(DEBUG) && DEBUG
-#include <stdio.h>
-#define DBG(fmt, args...) ({fprintf(stderr, __FILE__ ", line %d: ", __LINE__); fprintf(stderr , fmt , ## args );})
-#else
-#define DBG(fmt, args...) do {} while(0)
-#endif
-
-#endif /* INC_DEBUG_H */
diff --git a/src/events.c b/src/events.c
index 5c462f8bd..d124532d0 100644
--- a/src/events.c
+++ b/src/events.c
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <libxfce4util/debug.h>
 #include <libxfce4util/i18n.h>
 #include <libxfcegui4/libxfcegui4.h>
 #include "main.h"
@@ -37,7 +38,6 @@
 #include "client.h"
 #include "menu.h"
 #include "startup_notification.h"
-#include "debug.h"
 
 static guint raise_timeout = 0;
 static gulong button_handler_id = 0;
diff --git a/src/frame.c b/src/frame.c
index bbf2f9168..9f07ae3fc 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -23,12 +23,12 @@
 #endif
 
 #include <pango/pango.h>
+#include <libxfce4util/debug.h>
 #include "main.h"
 #include "client.h"
 #include "settings.h"
 #include "mywindow.h"
 #include "frame.h"
-#include "debug.h"
 
 inline int frameLeft(Client * c)
 {
diff --git a/src/hints.c b/src/hints.c
index 1016e1df3..9192978d4 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -34,13 +34,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xmd.h>
+#include <libxfce4util/debug.h>
 #include <libxfce4util/i18n.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "main.h"
 #include "hints.h"
-#include "debug.h"
 
 Atom gnome_panel_desktop_area;
 Atom motif_wm_hints;
diff --git a/src/keyboard.c b/src/keyboard.c
index a4d96b7de..dae648253 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -23,12 +23,12 @@
 #endif
 
 #include <X11/Xlib.h>
+#include <libxfce4util/debug.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 #include "keyboard.h"
-#include "debug.h"
 
 unsigned int KeyMask;
 unsigned int ButtonMask;
diff --git a/src/main.c b/src/main.c
index a0e461c86..23bf466d7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,6 +37,7 @@
 #include <gdk/gdkx.h>
 #include <glib.h>
 #include <X11/Xlib.h>
+#include <libxfce4util/debug.h>
 #include <libxfce4util/i18n.h>
 #include <libxfcegui4/libxfcegui4.h>
 
@@ -51,7 +52,6 @@
 #include "session.h"
 #include "startup_notification.h"
 #include "spinning_cursor.h"
-#include "debug.h"
 
 #define MAIN_EVENT_MASK         SubstructureNotifyMask|\
     StructureNotifyMask|\
diff --git a/src/menu.c b/src/menu.c
index ac8198930..ae148d334 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -32,10 +32,10 @@
 #include <gtk/gtk.h>
 #include <X11/Xlib.h>
 #include <unistd.h>
+#include <libxfce4util/debug.h>
 #include <libxfce4util/i18n.h>
 #include <libxfcegui4/libxfcegui4.h>
 #include "menu.h"
-#include "debug.h"
 
 static GtkWidget *menu_open = NULL;
 static MenuItem menuitems[] = {
diff --git a/src/misc.c b/src/misc.c
index f807286d7..00e8c4fae 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -37,11 +37,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <libxfce4util/debug.h>
 
 #include "main.h"
 #include "client.h"
 #include "misc.h"
-#include "debug.h"
 
 void getMouseXY(Window w, int *x2, int *y2)
 {
diff --git a/src/misc.h b/src/misc.h
index 4a78ed33e..7a502bcdd 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -26,7 +26,6 @@
 #endif
 
 #include <glib.h>
-#include "debug.h"
 
 void getMouseXY(Window, int *, int *);
 Window getMouseWindow(Window);
diff --git a/src/mypixmap.c b/src/mypixmap.c
index 494dbd11f..a5d4b5caa 100644
--- a/src/mypixmap.c
+++ b/src/mypixmap.c
@@ -24,12 +24,12 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <libxfce4util/debug.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <glib.h>
 #include "mypixmap.h"
 #include "main.h"
-#include "debug.h"
 
 gboolean myPixmapLoad(Display * dpy, MyPixmap * pm, gchar * dir, gchar * file, XpmColorSymbol * cs, gint n)
 {
diff --git a/src/mywindow.c b/src/mywindow.c
index b7e7d3e6d..e4574b84d 100644
--- a/src/mywindow.c
+++ b/src/mywindow.c
@@ -23,13 +23,13 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <libxfce4util/debug.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <glib.h>
 #include "mywindow.h"
 #include "main.h"
-#include "debug.h"
 
 void myWindowCreate(Display * dpy, Window parent, myWindow * win, Cursor cursor)
 {
diff --git a/src/parserc.c b/src/parserc.c
index 39e9807c2..e0b22eef4 100644
--- a/src/parserc.c
+++ b/src/parserc.c
@@ -23,13 +23,13 @@
 #endif
 
 #include <X11/Xlib.h>
+#include <libxfce4util/debug.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 #include "parserc.h"
 #include "settings.h"
-#include "debug.h"
 
 #ifndef DEFAULT_THEME
 #define DEFAULT_THEME "default"
diff --git a/src/settings.c b/src/settings.c
index 49a28f736..244f1ffa5 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -30,6 +30,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
+#include <libxfce4util/debug.h>
 #include <libxfce4util/i18n.h>
 #include <libxfcegui4/libxfcegui4.h>
 #include <libxfce4mcs/mcs-client.h>
@@ -38,7 +39,6 @@
 #include "parserc.h"
 #include "client.h"
 #include "workspaces.h"
-#include "debug.h"
 
 #define CHANNEL1 "xfwm4"
 #define CHANNEL2 "margins"
diff --git a/src/tabwin.c b/src/tabwin.c
index 07ec783a2..b45d6cccc 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -25,11 +25,11 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
+#include <libxfce4util/debug.h>
 #include <libxfce4util/i18n.h>
 #include <libxfcegui4/libxfcegui4.h>
 #include "inline-tabwin-icon.h"
 #include "tabwin.h"
-#include "debug.h"
 
 Tabwin *tabwinCreate(gchar * label)
 {
diff --git a/src/tabwin.h b/src/tabwin.h
index 761a7ce64..1b6635119 100644
--- a/src/tabwin.h
+++ b/src/tabwin.h
@@ -28,7 +28,6 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include "debug.h"
 
 typedef struct _Tabwin Tabwin;
 struct _Tabwin
diff --git a/src/workspaces.c b/src/workspaces.c
index 479c0a3a5..4ea36f084 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -27,12 +27,12 @@
 #include <X11/Xmd.h>
 #include <gtk/gtk.h>
 #include <glib.h>
+#include <libxfce4util/debug.h>
 #include "main.h"
 #include "workspaces.h"
 #include "settings.h"
 #include "client.h"
 #include "hints.h"
-#include "debug.h"
 
 void workspaceSwitch(int new_ws, Client * c2)
 {