# HG changeset patch
# User zas_
# Date 1210932176 0
# Node ID 8268cbe682f13984313cd4f30df80706a2a48735
# Parent  a484500de88d16ec811a9cbec21887618dd62865
Include debug.h from main.h since debug macros may be used anywhere in the code.

diff -r a484500de88d -r 8268cbe682f1 src/bar_info.c
--- a/src/bar_info.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/bar_info.c	Fri May 16 10:02:56 2008 +0000
@@ -17,7 +17,6 @@
 #include "bar_info.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "filedata.h"
 #include "info.h"
 #include "secure_save.h"
diff -r a484500de88d -r 8268cbe682f1 src/cache.c
--- a/src/cache.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/cache.c	Fri May 16 10:02:56 2008 +0000
@@ -13,7 +13,6 @@
 #include "main.h"
 #include "cache.h"
 
-#include "debug.h"
 #include "md5-util.h"
 #include "secure_save.h"
 #include "ui_fileops.h"
diff -r a484500de88d -r 8268cbe682f1 src/cache_maint.c
--- a/src/cache_maint.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/cache_maint.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "cache_maint.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "filedata.h"
 #include "thumb.h"
 #include "thumb_standard.h"
diff -r a484500de88d -r 8268cbe682f1 src/collect-io.c
--- a/src/collect-io.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/collect-io.c	Fri May 16 10:02:56 2008 +0000
@@ -15,7 +15,6 @@
 #include "collect-io.h"
 
 #include "collect.h"
-#include "debug.h"
 #include "filedata.h"
 #include "layout_util.h"
 #include "rcfile.h"
diff -r a484500de88d -r 8268cbe682f1 src/collect-table.c
--- a/src/collect-table.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/collect-table.c	Fri May 16 10:02:56 2008 +0000
@@ -17,7 +17,6 @@
 #include "cellrenderericon.h"
 #include "collect-dlg.h"
 #include "collect-io.h"
-#include "debug.h"
 #include "dnd.h"
 #include "dupe.h"
 #include "editors.h"
diff -r a484500de88d -r 8268cbe682f1 src/collect.c
--- a/src/collect.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/collect.c	Fri May 16 10:02:56 2008 +0000
@@ -17,7 +17,6 @@
 #include "collect-dlg.h"
 #include "collect-io.h"
 #include "collect-table.h"
-#include "debug.h"
 #include "editors.h"
 #include "filedata.h"
 #include "img-view.h"
diff -r a484500de88d -r 8268cbe682f1 src/color-man.c
--- a/src/color-man.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/color-man.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "color-man.h"
 
-#include "debug.h"
 #include "image.h"
 #include "ui_fileops.h"
 
diff -r a484500de88d -r 8268cbe682f1 src/debug.c
--- a/src/debug.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/debug.c	Fri May 16 10:02:56 2008 +0000
@@ -10,7 +10,6 @@
  */
 
 #include "main.h"
-#include "debug.h"
 
 #ifdef DEBUG
 
diff -r a484500de88d -r 8268cbe682f1 src/dupe.c
--- a/src/dupe.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/dupe.c	Fri May 16 10:02:56 2008 +0000
@@ -17,7 +17,6 @@
 #include "cache.h"
 #include "collect.h"
 #include "collect-table.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "filedata.h"
diff -r a484500de88d -r 8268cbe682f1 src/editors.c
--- a/src/editors.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/editors.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "editors.h"
 
-#include "debug.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "utilops.h"
diff -r a484500de88d -r 8268cbe682f1 src/exif-common.c
--- a/src/exif-common.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/exif-common.c	Fri May 16 10:02:56 2008 +0000
@@ -35,7 +35,6 @@
 #include "main.h"
 #include "exif.h"
 
-#include "debug.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "format_raw.h"
diff -r a484500de88d -r 8268cbe682f1 src/filedata.c
--- a/src/filedata.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/filedata.c	Fri May 16 10:02:56 2008 +0000
@@ -16,7 +16,6 @@
 
 #include "filefilter.h"
 #include "cache.h"
-#include "debug.h"
 #include "rcfile.h"
 #include "secure_save.h"
 #include "thumb_standard.h"
diff -r a484500de88d -r 8268cbe682f1 src/filefilter.c
--- a/src/filefilter.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/filefilter.c	Fri May 16 10:02:56 2008 +0000
@@ -15,7 +15,6 @@
 #include "filefilter.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "rcfile.h"
 #include "secure_save.h"
 #include "thumb_standard.h"
diff -r a484500de88d -r 8268cbe682f1 src/format_raw.c
--- a/src/format_raw.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/format_raw.c	Fri May 16 10:02:56 2008 +0000
@@ -31,7 +31,6 @@
 #include "main.h"
 #include "format_raw.h"
 
-#include "debug.h"
 #include "format_canon.h"
 #include "format_fuji.h"
 #include "format_nikon.h"
diff -r a484500de88d -r 8268cbe682f1 src/fullscreen.c
--- a/src/fullscreen.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/fullscreen.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "fullscreen.h"
 
-#include "debug.h"
 #include "image.h"
 #include "ui_fileops.h"
 #include "ui_menu.h"
diff -r a484500de88d -r 8268cbe682f1 src/image-load.c
--- a/src/image-load.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/image-load.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "image-load.h"
 
-#include "debug.h"
 #include "exif.h"
 #include "filedata.h"
 #include "ui_fileops.h"
diff -r a484500de88d -r 8268cbe682f1 src/image-overlay.c
--- a/src/image-overlay.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/image-overlay.c	Fri May 16 10:02:56 2008 +0000
@@ -15,7 +15,6 @@
 
 #include "bar_info.h"
 #include "collect.h"
-#include "debug.h"
 #include "exif.h"
 #include "filedata.h"
 #include "histogram.h"
diff -r a484500de88d -r 8268cbe682f1 src/image.c
--- a/src/image.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/image.c	Fri May 16 10:02:56 2008 +0000
@@ -17,7 +17,6 @@
 
 #include "collect.h"
 #include "color-man.h"
-#include "debug.h"
 #include "exif.h"
 #include "histogram.h"
 #include "image-load.h"
diff -r a484500de88d -r 8268cbe682f1 src/layout.c
--- a/src/layout.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/layout.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "layout.h"
 
 #include "color-man.h"
-#include "debug.h"
 #include "filedata.h"
 #include "histogram.h"
 #include "image.h"
diff -r a484500de88d -r 8268cbe682f1 src/layout_image.c
--- a/src/layout_image.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/layout_image.c	Fri May 16 10:02:56 2008 +0000
@@ -15,7 +15,6 @@
 
 #include "collect.h"
 #include "dnd.h"
-#include "debug.h"
 #include "editors.h"
 #include "filedata.h"
 #include "fullscreen.h"
diff -r a484500de88d -r 8268cbe682f1 src/lirc.c
--- a/src/lirc.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/lirc.c	Fri May 16 10:02:56 2008 +0000
@@ -3,7 +3,6 @@
 #ifdef HAVE_LIRC
 #include <lirc/lirc_client.h>
 #include "layout_image.h"
-#include "debug.h"
 
 gint lirc_fd = -1;
 struct lirc_config *config = NULL;
diff -r a484500de88d -r 8268cbe682f1 src/main.c
--- a/src/main.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/main.c	Fri May 16 10:02:56 2008 +0000
@@ -16,7 +16,6 @@
 #include "cache.h"
 #include "collect.h"
 #include "collect-io.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "filedata.h"
diff -r a484500de88d -r 8268cbe682f1 src/main.h
--- a/src/main.h	Fri May 16 09:10:56 2008 +0000
+++ b/src/main.h	Fri May 16 10:02:56 2008 +0000
@@ -26,6 +26,7 @@
 
 #include "intl.h"
 
+
 /*
  *-------------------------------------
  * Standard library includes
@@ -112,6 +113,7 @@
 				"%formatted.Camera:40%|%formatted.Flash%"
 
 #include "typedefs.h"
+#include "debug.h"
 #include "options.h"
 
 /*
diff -r a484500de88d -r 8268cbe682f1 src/pan-calendar.c
--- a/src/pan-calendar.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/pan-calendar.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "pan-types.h"
 
-#include "debug.h"
 
 #include <math.h>
 
diff -r a484500de88d -r 8268cbe682f1 src/pan-view.c
--- a/src/pan-view.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/pan-view.c	Fri May 16 10:02:56 2008 +0000
@@ -16,7 +16,6 @@
 
 #include "bar_exif.h"
 #include "dnd.h"
-#include "debug.h"
 #include "editors.h"
 #include "exif.h"
 #include "fullscreen.h"
diff -r a484500de88d -r 8268cbe682f1 src/pixbuf-renderer.c
--- a/src/pixbuf-renderer.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/pixbuf-renderer.c	Fri May 16 10:02:56 2008 +0000
@@ -31,7 +31,6 @@
 #include "main.h"
 #include "pixbuf_util.h"
 
-#include "debug.h"
 #endif
 
 
diff -r a484500de88d -r 8268cbe682f1 src/preferences.c
--- a/src/preferences.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/preferences.c	Fri May 16 10:02:56 2008 +0000
@@ -16,7 +16,6 @@
 
 #include "bar_exif.h"
 #include "cache_maint.h"
-#include "debug.h"
 #include "editors.h"
 #include "exif.h"
 #include "filedata.h"
diff -r a484500de88d -r 8268cbe682f1 src/print.c
--- a/src/print.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/print.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "print.h"
 
-#include "debug.h"
 #include "filedata.h"
 #include "image.h"
 #include "image-load.h"
diff -r a484500de88d -r 8268cbe682f1 src/remote.c
--- a/src/remote.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/remote.c	Fri May 16 10:02:56 2008 +0000
@@ -15,7 +15,6 @@
 #include "remote.h"
 
 #include "collect.h"
-#include "debug.h"
 #include "filedata.h"
 #include "img-view.h"
 #include "layout.h"
diff -r a484500de88d -r 8268cbe682f1 src/secure_save.c
--- a/src/secure_save.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/secure_save.c	Fri May 16 10:02:56 2008 +0000
@@ -16,7 +16,6 @@
 #include "main.h"
 #include "secure_save.h"
 
-#include "debug.h"
 
 /* ABOUT SECURE SAVE */
 /* This code was borrowed from the ELinks project (http://elinks.cz)
diff -r a484500de88d -r 8268cbe682f1 src/thumb.c
--- a/src/thumb.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/thumb.c	Fri May 16 10:02:56 2008 +0000
@@ -15,7 +15,6 @@
 #include "thumb.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "image-load.h"
 #include "filedata.h"
 #include "pixbuf_util.h"
diff -r a484500de88d -r 8268cbe682f1 src/thumb_standard.c
--- a/src/thumb_standard.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/thumb_standard.c	Fri May 16 10:02:56 2008 +0000
@@ -15,7 +15,6 @@
 #include "thumb_standard.h"
 
 #include "cache.h"	/* for cache_ensure_dir_exists */
-#include "debug.h"
 #include "image-load.h"
 #include "md5-util.h"
 #include "pixbuf_util.h"
diff -r a484500de88d -r 8268cbe682f1 src/trash.c
--- a/src/trash.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/trash.c	Fri May 16 10:02:56 2008 +0000
@@ -16,7 +16,6 @@
 #include "utilops.h"
 
 
-#include "debug.h"
 #include "filedata.h"
 #include "ui_fileops.h"
 #include "ui_misc.h"
diff -r a484500de88d -r 8268cbe682f1 src/ui_bookmark.c
--- a/src/ui_bookmark.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/ui_bookmark.c	Fri May 16 10:02:56 2008 +0000
@@ -26,7 +26,6 @@
 #include "main.h"
 #include "filedata.h"
 
-#include "debug.h"
 #include "secure_save.h"
 #include "ui_bookmark.h"
 #include "ui_fileops.h"
diff -r a484500de88d -r 8268cbe682f1 src/ui_fileops.c
--- a/src/ui_fileops.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/ui_fileops.c	Fri May 16 10:02:56 2008 +0000
@@ -29,7 +29,6 @@
 #include "main.h"
 #include "ui_fileops.h"
 
-#include "debug.h"
 #include "ui_utildlg.h"	/* for locale warning dialog */
 
 /*
diff -r a484500de88d -r 8268cbe682f1 src/utilops.c
--- a/src/utilops.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/utilops.c	Fri May 16 10:02:56 2008 +0000
@@ -18,7 +18,6 @@
 #include "cache.h"
 #include "cache_maint.h"
 #include "collect.h"
-#include "debug.h"
 #include "dupe.h"
 #include "filedata.h"
 #include "filefilter.h"
diff -r a484500de88d -r 8268cbe682f1 src/view_file.c
--- a/src/view_file.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/view_file.c	Fri May 16 10:02:56 2008 +0000
@@ -12,7 +12,6 @@
 #include "main.h"
 #include "view_file.h"
 
-#include "debug.h"
 #include "editors.h"
 #include "info.h"
 #include "layout.h"
diff -r a484500de88d -r 8268cbe682f1 src/view_file_icon.c
--- a/src/view_file_icon.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/view_file_icon.c	Fri May 16 10:02:56 2008 +0000
@@ -17,7 +17,6 @@
 #include "collect.h"
 #include "collect-io.h"
 #include "collect-table.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "img-view.h"
diff -r a484500de88d -r 8268cbe682f1 src/view_file_list.c
--- a/src/view_file_list.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/view_file_list.c	Fri May 16 10:02:56 2008 +0000
@@ -14,7 +14,6 @@
 #include "view_file_list.h"
 
 #include "cache_maint.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "img-view.h"
diff -r a484500de88d -r 8268cbe682f1 src/window.c
--- a/src/window.c	Fri May 16 09:10:56 2008 +0000
+++ b/src/window.c	Fri May 16 10:02:56 2008 +0000
@@ -12,7 +12,6 @@
 #include "main.h"
 #include "window.h"
 
-#include "debug.h"
 #include "pixbuf_util.h"
 #include "ui_fileops.h"
 #include "ui_help.h"