Ported everything (that I could find) to the new debug infrastructure, see

* configure.in:
* src/Yelper.cpp:
* src/yelp-bookmarks.c:
* src/yelp-db-pager.c: (db_pager_parse), (db_pager_params),
(db_pager_cancel):
* src/yelp-db-print-pager.c: (db_print_pager_parse),
(db_print_pager_params), (db_print_pager_cancel):
* src/yelp-debug.c: (yelp_debug):
* src/yelp-debug.h:
* src/yelp-html.cpp:
* src/yelp-info-parser.c: (open_info_file), (process_indirect_map),
(process_tag_table), (node2iter), (process_page),
(yelp_info_parser_parse_file), (parse_tree_level),
(yelp_info_parser_parse_tree):
* src/yelp-pager.c: (yelp_pager_cancel), (yelp_pager_error):
* src/yelp-search-pager.c: (search_pager_class_init),
(search_pager_error), (search_pager_cancel), (search_pager_finish),
(search_pager_process), (snippet_closed), (snippet_response),
(snippet_error), (hits_added_cb), (check_lang), (finished_cb),
(search_pager_process_idle):
* src/yelp-settings.c: (gconf_system_fonts_cb), (gconf_font_cb),
(gtk_theme_changed), (settings_update):
* src/yelp-window.c: (yelp_window_load), (window_do_load),
(window_handle_page), (pager_start_cb), (pager_page_cb),
(pager_error_cb), (pager_cancel_cb), (pager_finish_cb),
(html_uri_selected_cb), (tree_drag_data_get_cb),
(print_disconnect), (print_pager_page_cb), (print_pager_error_cb),
(print_pager_cancel_cb), (print_pager_finish_cb),
(window_print_page_cb), (window_find_cb), (window_reload_cb),
(window_go_home_cb), (window_go_previous_cb), (window_go_next_cb),
(window_go_toc_cb), (window_add_bookmark_cb),
(location_response_cb), (window_find_entry_key_pressed_cb),
(idle_write):
* src/yelp-xslt-pager.c: (xslt_pager_process), (xslt_pager_error),
(xslt_pager_cancel), (xslt_pager_finish), (xslt_yelp_document):
Ported everything (that I could find) to the new debug infrastructure,
see #343788

15 files changed, 177 insertions, 188 deletions

diff --git a/ChangeLog b/ChangeLog
index 726fe47f..bb22b71f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,45 @@
 2006-06-11  Brent Smith  <gnome@nextreality.net>
 
+	* configure.in:
+	* src/Yelper.cpp:
+	* src/yelp-bookmarks.c:
+	* src/yelp-db-pager.c: (db_pager_parse), (db_pager_params),
+	(db_pager_cancel):
+	* src/yelp-db-print-pager.c: (db_print_pager_parse),
+	(db_print_pager_params), (db_print_pager_cancel):
+	* src/yelp-debug.c: (yelp_debug):
+	* src/yelp-debug.h:
+	* src/yelp-html.cpp:
+	* src/yelp-info-parser.c: (open_info_file), (process_indirect_map),
+	(process_tag_table), (node2iter), (process_page),
+	(yelp_info_parser_parse_file), (parse_tree_level),
+	(yelp_info_parser_parse_tree):
+	* src/yelp-pager.c: (yelp_pager_cancel), (yelp_pager_error):
+	* src/yelp-search-pager.c: (search_pager_class_init),
+	(search_pager_error), (search_pager_cancel), (search_pager_finish),
+	(search_pager_process), (snippet_closed), (snippet_response),
+	(snippet_error), (hits_added_cb), (check_lang), (finished_cb),
+	(search_pager_process_idle):
+	* src/yelp-settings.c: (gconf_system_fonts_cb), (gconf_font_cb),
+	(gtk_theme_changed), (settings_update):
+	* src/yelp-window.c: (yelp_window_load), (window_do_load),
+	(window_handle_page), (pager_start_cb), (pager_page_cb),
+	(pager_error_cb), (pager_cancel_cb), (pager_finish_cb),
+	(html_uri_selected_cb), (tree_drag_data_get_cb),
+	(print_disconnect), (print_pager_page_cb), (print_pager_error_cb),
+	(print_pager_cancel_cb), (print_pager_finish_cb),
+	(window_print_page_cb), (window_find_cb), (window_reload_cb),
+	(window_go_home_cb), (window_go_previous_cb), (window_go_next_cb),
+	(window_go_toc_cb), (window_add_bookmark_cb),
+	(location_response_cb), (window_find_entry_key_pressed_cb),
+	(idle_write):
+	* src/yelp-xslt-pager.c: (xslt_pager_process), (xslt_pager_error),
+	(xslt_pager_cancel), (xslt_pager_finish), (xslt_yelp_document):
+	Ported everything (that I could find) to the new debug infrastructure,
+	see #343788
+
+2006-06-11  Brent Smith  <gnome@nextreality.net>
+
 	* src/Makefile.am: 
 	add yelp-debug.[ch]
 	* src/yelp-debug.c: (yelp_debug):
@@ -13,7 +53,7 @@
 	(process_mandir_pending):
 	* src/yelp-utils.c: (yelp_doc_info_new), (yelp_doc_info_get),
 	(yelp_doc_info_free), (yelp_doc_info_add_uri):
-	Modified to use new debug infrastructure
+	Modified to use new debug infrastructure, see #343788
 
 2006-06-11  Brent Smith  <gnome@nextreality.net>
 
diff --git a/configure.in b/configure.in
index 9d04068b..814e75dc 100644
--- a/configure.in
+++ b/configure.in
@@ -72,8 +72,8 @@ PKG_CHECK_MODULES(YELP,
 	gnome-vfs-2.0 >= 1.1
 	gtk+-2.0 >= 2.5.3
 	libglade-2.0 >= 2.0.0
-	libgnome-2.0 >= 2.0.2
-	libgnomeui-2.0 >= 1.103.0
+	libgnome-2.0 >= 2.14.0
+	libgnomeui-2.0 >= 2.14.0
 	libxml-2.0 >= 2.6.5
 	libxslt >= 1.1.4
 	libexslt >= 0.8.1
diff --git a/src/Yelper.cpp b/src/Yelper.cpp
index 73d58a0e..dfaf2d2a 100644
--- a/src/Yelper.cpp
+++ b/src/Yelper.cpp
@@ -49,27 +49,22 @@
 #include <nsServiceManagerUtils.h>
 
 #include "yelp-gecko-services.h"
+#include "yelp-debug.h"
 
 #include "Yelper.h"
 
 #define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1"
 
-#ifdef GNOME_ENABLE_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
-
 Yelper::Yelper (GtkMozEmbed *aEmbed)
 : mInitialised(PR_FALSE)
 , mEmbed(aEmbed)
 {
-	d (g_print ("Yelper ctor [%p]\n", this));
+	debug_print (DB_DEBUG, "Yelper ctor [%p]\n", this);
 }
 
 Yelper::~Yelper ()
 {
-	d (g_print ("Yelper dtor [%p]\n", this));
+	debug_print (DB_DEBUG, "Yelper dtor [%p]\n", this);
 }
 
 nsresult
diff --git a/src/yelp-bookmarks.c b/src/yelp-bookmarks.c
index 1f52abf8..aec00d6b 100644
--- a/src/yelp-bookmarks.c
+++ b/src/yelp-bookmarks.c
@@ -27,6 +27,7 @@
 #include "yelp-bookmarks.h"
 #include "yelp-utils.h"
 #include "yelp-window.h"
+#include "yelp-debug.h"
 
 #include <string.h>
 #include <gtk/gtkuimanager.h>
@@ -41,12 +42,6 @@
 #include <libxml/xmlwriter.h>
 #include <libgnome/gnome-config.h>
 
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
-
 #define COL_NAME   0
 #define COL_LABEL  1
 #define COL_EDIT   2
diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c
index 42b0c1ef..a6787489 100644
--- a/src/yelp-db-pager.c
+++ b/src/yelp-db-pager.c
@@ -40,12 +40,7 @@
 #include "yelp-db-pager.h"
 #include "yelp-toc-pager.h"
 #include "yelp-settings.h"
-
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
+#include "yelp-debug.h"
 
 #define STYLESHEET_PATH DATADIR"/yelp/xslt/"
 #define DB_STYLESHEET   STYLESHEET_PATH"db2html.xsl"
@@ -219,7 +214,7 @@ db_pager_parse (YelpPager *pager)
     xmlChar     *id;
     GError      *error = NULL;
 
-    d (g_print ("db_pager_parse\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     doc_info = yelp_pager_get_doc_info (pager);
 
@@ -298,7 +293,7 @@ db_pager_params (YelpPager *pager)
     gint params_i = 0;
     gint params_max = 20;
 
-    d (g_print ("db_pager_process\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     g_return_val_if_fail (pager != NULL, FALSE);
     g_return_val_if_fail (YELP_IS_DB_PAGER (pager), FALSE);
@@ -334,7 +329,7 @@ db_pager_cancel (YelpPager *pager)
 {
     YelpDBPagerPriv *priv = YELP_DB_PAGER (pager)->priv;
 
-    d (g_print ("db_pager_cancel\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     yelp_pager_set_state (pager, YELP_PAGER_STATE_INVALID);
 
diff --git a/src/yelp-db-print-pager.c b/src/yelp-db-print-pager.c
index e100b2f6..8e184004 100644
--- a/src/yelp-db-print-pager.c
+++ b/src/yelp-db-print-pager.c
@@ -40,12 +40,7 @@
 #include "yelp-db-print-pager.h"
 #include "yelp-toc-pager.h"
 #include "yelp-settings.h"
-
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
+#include "yelp-debug.h"
 
 #define STYLESHEET_PATH DATADIR"/yelp/xslt/"
 #define DB_STYLESHEET   STYLESHEET_PATH"db2html.xsl"
@@ -170,7 +165,7 @@ db_print_pager_parse (YelpPager *pager)
 
     GError      *error = NULL;
 
-    d (g_print ("db_print_pager_parse\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     doc_info = yelp_pager_get_doc_info (pager);
 
@@ -229,7 +224,7 @@ db_print_pager_params (YelpPager *pager)
     gint params_i = 0;
     gint params_max = 20;
 
-    d (g_print ("db_print_pager_process\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     doc_info = yelp_pager_get_doc_info (pager);
 
@@ -267,7 +262,7 @@ db_print_pager_cancel (YelpPager *pager)
 {
     YelpDBPrintPagerPriv *priv = YELP_DB_PRINT_PAGER (pager)->priv;
 
-    d (g_print ("db_print_pager_cancel\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     yelp_pager_set_state (pager, YELP_PAGER_STATE_INVALID);
 
diff --git a/src/yelp-debug.c b/src/yelp-debug.c
index d5796a50..f82728e4 100644
--- a/src/yelp-debug.c
+++ b/src/yelp-debug.c
@@ -110,8 +110,6 @@ void yelp_debug (const gchar *file,     guint line,
 		else if (debug_flags & DB_WARN)
 			debug_flags |= (DB_ERROR);
 
-		g_print ("debug_flags = %x\n", debug_flags);
-		
 		debugenv = g_getenv ("YELP_DEBUG_FILTER");
 
 		if (debugenv != NULL && *debugenv != '\0')
diff --git a/src/yelp-debug.h b/src/yelp-debug.h
index 50d6ba13..657859f9 100644
--- a/src/yelp-debug.h
+++ b/src/yelp-debug.h
@@ -21,6 +21,8 @@
 #ifndef __YELP_DEBUG_H__
 #define __YELP_DEBUG_H__
 
+G_BEGIN_DECLS
+
 #include <config.h>
 #include <glib.h>
 
@@ -65,4 +67,6 @@ typedef enum {
 void yelp_debug (const gchar *file, guint line, 
                  const gchar *function, guint flags, const gchar *format, ...);
 
+G_END_DECLS
+
 #endif /* __YELP_DEBUG_H__ */
diff --git a/src/yelp-html.cpp b/src/yelp-html.cpp
index 4ff49f02..51630476 100644
--- a/src/yelp-html.cpp
+++ b/src/yelp-html.cpp
@@ -34,12 +34,8 @@
 #include "Yelper.h"
 
 #include "yelp-html.h"
+#include "yelp-debug.h"
 
-#ifdef GNOME_ENABLE_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
 
 #define YELP_HTML_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_HTML, YelpHtmlPriv))
 
@@ -100,8 +96,8 @@ html_open_uri (GtkMozEmbed *embed, const gchar *uri)
 
     g_return_val_if_fail (uri != NULL, FALSE);
 
-    d (g_print ("embed_open_uri_cb uri=%s\n", uri));
-    d (g_print ("  uri = \"%s\"\n", uri));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
 
     if (!html->priv->frames_enabled) {
 	g_signal_emit (html, signals[URI_SELECTED], 0, uri, FALSE);
@@ -302,8 +298,8 @@ yelp_html_set_base_uri (YelpHtml *html, const gchar *uri)
 
     g_return_if_fail (YELP_IS_HTML (html));
 
-    d (g_print ("yelp_html_set_base_uri\n"));
-    d (g_print ("  uri = \"%s\"\n", uri));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
 
     priv = html->priv;
 
@@ -316,7 +312,7 @@ yelp_html_set_base_uri (YelpHtml *html, const gchar *uri)
 void
 yelp_html_open_stream (YelpHtml *html, const gchar *mime)
 {
-    d (g_print ("yelp_html_open\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     html->priv->frames_enabled = FALSE;
     gtk_moz_embed_open_stream (GTK_MOZ_EMBED (html),
@@ -329,9 +325,9 @@ yelp_html_write (YelpHtml *html, const gchar *data, gint len)
 {
      if (len == -1) len = strlen (data);
 
-    d (g_print ("yelp_html_write\n"));
-    d (g_print ("  data = %i bytes\n", strlen (data)));
-    d (g_print ("  len  = %i\n", len));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  data = %i bytes\n", strlen (data));
+    debug_print (DB_ARG, "  len  = %i\n", len);
 
     gtk_moz_embed_append_data (GTK_MOZ_EMBED (html),
 			       data, len);
@@ -379,7 +375,7 @@ timeout_update_gok (YelpHtml *html)
 void
 yelp_html_close (YelpHtml *html)
 {
-    d (g_print ("yelp_html_close\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     gtk_moz_embed_close_stream (GTK_MOZ_EMBED (html));
     html->priv->timeout = g_timeout_add (2000, 
 					 (GSourceFunc) timeout_update_gok,
diff --git a/src/yelp-info-parser.c b/src/yelp-info-parser.c
index 65b010f7..dfc485af 100644
--- a/src/yelp-info-parser.c
+++ b/src/yelp-info-parser.c
@@ -30,12 +30,8 @@
 #include "yelp-io-channel.h"
 #include "yelp-info-parser.h"
 #include "yelp-utils.h"
+#include "yelp-debug.h"
 
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
 
 typedef struct _TagTableFix TagTableFix;
 
@@ -107,7 +103,7 @@ static char
 	GError *error = NULL;
 	GIOStatus result = G_IO_STATUS_NORMAL;
 
-	d (g_print ("!! Opening %s...\n", file));
+	debug_print (DB_DEBUG, "!! Opening %s...\n", file);
 	
 	channel = yelp_io_channel_new_file (file, &error);
 	/* TODO: Actually handle the errors sanely.  Don't crash */
@@ -132,7 +128,7 @@ static char
 	{
 		if (str[i] == '\0' && str[i+1] == '\b')
 		{
-		  d (g_print ("=> got a NULL, replacing\n"));
+		  debug_print (DB_WARN, "=> got a NULL, replacing\n");
 		  str[i] = ' '; str[i+1] = ' ';
 		}
 	}
@@ -188,7 +184,7 @@ static char
 		int offset;
 		int plength;
 
-		d (g_print ("Line: %s\n", *ptr));
+		debug_print (DB_DEBUG, "Line: %s\n", *ptr);
 		items = g_strsplit (*ptr, ": ", 2);
 
 		if (items[0])
@@ -202,9 +198,9 @@ static char
 			offset =  atoi(items[1]);
 			plength = strlen(pages[1]);
 			
-			d (g_print ("Need to make string %s+%i bytes = %i\n",
+			debug_print (DB_DEBUG, "Need to make string %s+%i bytes = %i\n",
 				    items[1], plength,
-				    offset + plength));
+				    offset + plength);
 			
 			if (!composite) /* not yet created, malloc it */
 			{
@@ -249,8 +245,8 @@ static GHashTable
 		if (strncmp (*ptr, "Node: ", 6) == 0)
 		{
 			items = g_strsplit (*ptr, "", 2);
-			d (g_print ("Node: %s Offset: %s\n",
-				    items[0] + 6, items[1]));
+			debug_print (DB_DEBUG, "Node: %s Offset: %s\n",
+				    items[0] + 6, items[1]);
 			g_hash_table_insert (table,
 					g_strdup (items[0] + 6),
 					g_strdup (items[1]));
@@ -308,7 +304,7 @@ static GtkTreeIter
 	GtkTreeIter *iter;
 
 	iter = g_hash_table_lookup (nodes2iters, node);
-	d (if (!iter) g_print ("Could not retrieve iter for node !%s!\n", node));
+	d (if (!iter) debug_print (DB_WARN, "Could not retrieve iter for node !%s!\n", node));
 	return iter;
 }
 
@@ -411,7 +407,7 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
 	}
 	processed_table[page] = 1;
 	
-	d (g_print ("-- Processing Page %s\n\tParent: %s\n", node, up));
+	debug_print (DB_DEBUG, "-- Processing Page %s\n\tParent: %s\n", node, up);
 
 	iter = g_malloc0 (sizeof (GtkTreeIter));
 	/* check to see if we need to process our parent and siblings */
@@ -420,7 +416,7 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
 		page = node2page (nodes2offsets, offsets2pages, up);
 		if (!processed_table[page])
 		{
-		  d (g_print ("%% Processing Node %s\n", up));
+		  debug_print (DB_DEBUG, "%% Processing Node %s\n", up);
 			process_page (tree, nodes2offsets, offsets2pages,
 				nodes2iters, processed_table, page_list,
 				page_list[page]);
@@ -434,7 +430,7 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
 	      page = node2page (nodes2offsets, offsets2pages, prev);
 	      if (!processed_table[page])
 		{
-		  d (g_print ("%% Processing Node %s\n", prev));
+		  debug_print (DB_DEBUG, "%% Processing Node %s\n", prev);
 		  process_page (tree, nodes2offsets, offsets2pages,
 				nodes2iters, processed_table, page_list,
 				page_list[page]);
@@ -445,10 +441,10 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
 	/* by this point our parent and older sibling should be processed */
 	if (!up || !g_ascii_strcasecmp (up, "(dir)") || !strcmp (up, "Top"))
 	{
-	  d (g_print ("\t> no parent\n"));
+	  debug_print (DB_DEBUG, "\t> no parent\n");
 		if (!prev || !g_ascii_strcasecmp (prev, "(dir)"))
 		{
-		  d (g_print ("\t> no previous\n"));
+		  debug_print (DB_DEBUG, "\t> no previous\n");
 			gtk_tree_store_append (tree, iter, NULL);
 		}
 		else if (prev) {
@@ -466,7 +462,7 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
 	}
 	else if (!prev || !g_ascii_strcasecmp (prev, "(dir)") || !strcmp (prev, up))
 	{
-	  d (g_print ("\t> no previous\n"));
+	  debug_print (DB_DEBUG, "\t> no previous\n");
 		gtk_tree_store_append (tree, iter,
 			node2iter (nodes2iters, up));
 	}
@@ -475,10 +471,10 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
 	  GtkTreeIter *upit = node2iter (nodes2iters, up);
 	  GtkTreeIter *previt = node2iter (nodes2iters, prev);
 	  GtkTreeIter *nit = NULL;
-	  d (g_print ("+++ Parent: %s Previous: %s\n", up, prev));
+	  debug_print (DB_DEBUG, "+++ Parent: %s Previous: %s\n", up, prev);
 	  
-	  d (if (upit) g_print ("++++ Have parent node!\n"));
-	  d (if (previt) g_print ("++++ Have previous node!\n"));
+	  d (if (upit) debug_print (DB_DEBUG, "++++ Have parent node!\n"));
+	  d (if (previt) debug_print (DB_DEBUG, "++++ Have previous node!\n"));
 	  nit = find_real_sibling (GTK_TREE_MODEL (tree), previt, upit);
 	  if (nit) {
 	    gtk_tree_store_insert_after (tree, iter,
@@ -491,13 +487,13 @@ process_page (GtkTreeStore *tree, GHashTable *nodes2offsets,
 	}
 	else
 	{
-	  d (g_print ("# node %s was not put in tree\n", node));
+	  debug_print (DB_DEBUG, "# node %s was not put in tree\n", node);
 	  return;
 	}
 
-	d (if (iter) g_print ("Have a valid iter, storing for %s\n", node));
+	d (if (iter) debug_print (DB_DEBUG, "Have a valid iter, storing for %s\n", node));
 	g_hash_table_insert (nodes2iters, g_strdup (node), iter);
-	d (g_print ("size: %i\n", g_hash_table_size (nodes2iters)));
+	debug_print (DB_DEBUG, "size: %i\n", g_hash_table_size (nodes2iters));
 
 	tmp = g_strdup_printf ("%i",
 			       node2page (nodes2offsets, offsets2pages, node));
@@ -580,7 +576,7 @@ GtkTreeStore
 	for (ptr = page_list; *ptr != NULL; ptr++)
 	{
 	  gchar *name = NULL;
-	  d (g_print ("page %i at offset %i\n", pages, offset));
+	  debug_print (DB_DEBUG, "page %i at offset %i\n", pages, offset);
 
 		g_hash_table_insert (offsets2pages,
 				g_strdup_printf ("%i", offset), 
@@ -596,14 +592,14 @@ GtkTreeStore
 		pt = page_type (*ptr);
 		if (pt == PAGE_TAG_TABLE)
 		{
-		  d (g_print ("Have the Tag Table\n"));
+		  debug_print (DB_DEBUG, "Have the Tag Table\n");
 			/* this needs to be freed later too */
 			nodes2offsets = process_tag_table (*ptr);
 			break;
 		}
 		else if (pt == PAGE_INDIRECT)
 		{
-		  d (g_print ("Have the indirect mapping table\n"));
+		  debug_print (DB_DEBUG, "Have the indirect mapping table\n");
 			chained_info = TRUE;
 			str = process_indirect_map (*ptr, file);
 		}
@@ -628,7 +624,7 @@ GtkTreeStore
 		
 		for (ptr = page_list; *ptr != NULL; ptr++)
 		{
-		  d (g_print ("page %i at offset %i\n", pages, offset));
+		  debug_print (DB_DEBUG, "page %i at offset %i\n", pages, offset);
 			g_hash_table_insert (offsets2pages,
 					g_strdup_printf ("%i", offset),
 					 GINT_TO_POINTER (pages));
@@ -692,7 +688,7 @@ parse_tree_level (GtkTreeStore *tree, xmlNodePtr *node, GtkTreeIter iter)
 	char *page_content = NULL;
 	gboolean notes = FALSE;
 
-	d (g_print ("Decended\n"));
+	debug_print (DB_DEBUG, "Decended\n");
 	do
 	{
 		gtk_tree_model_get (GTK_TREE_MODEL (tree), &iter,
@@ -700,7 +696,7 @@ parse_tree_level (GtkTreeStore *tree, xmlNodePtr *node, GtkTreeIter iter)
 				COLUMN_PAGE_NAME, &page_name,
 				COLUMN_PAGE_CONTENT, &page_content,
 				-1);
-		d (g_print ("Got Section: %s\n", page_name));
+		debug_print (DB_DEBUG, "Got Section: %s\n", page_name);
 		if (strstr (page_content, "*Note") || 
 		    strstr (page_content, "*note")) {
 		  notes = TRUE;
@@ -738,7 +734,7 @@ parse_tree_level (GtkTreeStore *tree, xmlNodePtr *node, GtkTreeIter iter)
 		g_free (page_name);
 	}
 	while (gtk_tree_model_iter_next (GTK_TREE_MODEL (tree), &iter));
-	d (g_print ("Ascending\n"));
+	debug_print (DB_DEBUG, "Ascending\n");
 }
 
 xmlDocPtr
@@ -765,7 +761,7 @@ yelp_info_parser_parse_tree (GtkTreeStore *tree)
 
 	if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (tree), &iter))
 		parse_tree_level (tree, &node, iter);
-	d (else g_print ("Empty tree?\n"));
+	d (else debug_print (DB_DEBUG, "Empty tree?\n"));
 
 	/*
 	xmlDocDumpFormatMemory (doc, &xmlbuf, &bufsiz, 1);
diff --git a/src/yelp-pager.c b/src/yelp-pager.c
index b17e8628..62d78ebc 100644
--- a/src/yelp-pager.c
+++ b/src/yelp-pager.c
@@ -26,17 +26,11 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <string.h>
 
 #include "yelp-pager.h"
 #include "yelp-marshal.h"
-
-#include <string.h>
-
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
+#include "yelp-debug.h"
 
 #define YELP_PAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_PAGER, YelpPagerPriv))
 
@@ -271,7 +265,7 @@ yelp_pager_cancel (YelpPager *pager)
     g_return_if_fail (pager != NULL);
     g_return_if_fail (YELP_IS_PAGER (pager));
 
-    d (g_print ("yelp_pager_cancel\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     yelp_pager_set_state (pager, YELP_PAGER_STATE_INVALID);
 
@@ -323,7 +317,7 @@ yelp_pager_get_error (YelpPager *pager)
 void
 yelp_pager_error (YelpPager *pager, GError *error)
 {
-    d (g_print ("yelp_pager_error\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     if (pager->priv->error)
 	g_error_free (pager->priv->error);
diff --git a/src/yelp-search-pager.c b/src/yelp-search-pager.c
index bf961b01..d0b3485d 100644
--- a/src/yelp-search-pager.c
+++ b/src/yelp-search-pager.c
@@ -50,16 +50,11 @@
 #include "yelp-settings.h"
 #include "yelp-search-pager.h"
 #include "yelp-utils.h"
+#include "yelp-debug.h"
 
 #define DESKTOP_ENTRY_GROUP     "Desktop Entry"
 #define KDE_DESKTOP_ENTRY_GROUP "KDE Desktop Entry"
 
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
-
 #define YELP_NAMESPACE "http://www.gnome.org/yelp/ns"
 
 #define STYLESHEET_PATH DATADIR"/yelp/xslt/"
@@ -211,7 +206,7 @@ search_pager_class_init (YelpSearchPagerClass *klass)
 
 #ifdef ENABLE_BEAGLE
     beagle_client = beagle_client_new (NULL);
-    d(g_print ("client: %p\n", beagle_client);)
+    debug_print (DB_DEBUG, "client: %p\n", beagle_client);
 #endif /* ENABLE_BEAGLE */
 
     langs = g_get_language_names ();
@@ -332,7 +327,7 @@ yelp_search_pager_get (YelpDocInfo *doc_info)
 static void
 search_pager_error (YelpPager *pager)
 {
-    d (g_print ("search_pager_error\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     yelp_pager_set_state (pager, YELP_PAGER_STATE_ERROR);
 }
 
@@ -341,7 +336,7 @@ search_pager_cancel (YelpPager *pager)
 {
     YelpSearchPagerPriv *priv = YELP_SEARCH_PAGER (pager)->priv;
 
-    d (g_print ("search_pager_cancel\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     yelp_pager_set_state (pager, YELP_PAGER_STATE_INVALID);
 
     priv->cancel = TRUE;
@@ -350,14 +345,14 @@ search_pager_cancel (YelpPager *pager)
 static void
 search_pager_finish (YelpPager   *pager)
 {
-    d (g_print ("search_pager_finish\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     yelp_pager_set_state (pager, YELP_PAGER_STATE_FINISHED);
 }
 
 gboolean
 search_pager_process (YelpPager *pager)
 {
-    d (g_print ("search_pager_process\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     yelp_pager_set_state (pager, YELP_PAGER_STATE_PARSING);
     g_signal_emit_by_name (pager, "parse");
@@ -419,7 +414,7 @@ snippet_closed (BeagleSnippetRequest *request, SnippetLocation *snippet_location
 {
     YelpSearchPager *pager = snippet_location->pager;
     
-    d(g_print ("snippet_closed\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     pager->priv->snippet_request_count --;
     check_finished (pager);
@@ -448,10 +443,10 @@ snippet_response (BeagleSnippetRequest *request, BeagleSnippetResponse *response
     const char *xml = beagle_snippet_response_get_snippet (response);
 
     if (xml == NULL) {
-	d(g_print ("snippet_response empty\n"));
+	debug_print (DB_DEBUG, "snippet_response empty\n");
 	return;
     }
-    d(g_print ("snippet_response: %s\n", xml));
+    debug_print (DB_DEBUG, "snippet_response: %s\n", xml);
 
     xmldoc = g_strdup_printf ("<snippet>%s</snippet>",  xml);
     snippet_doc = xmlParseDoc (BAD_CAST xmldoc);
@@ -467,7 +462,7 @@ snippet_response (BeagleSnippetRequest *request, BeagleSnippetResponse *response
 static void
 snippet_error (BeagleSnippetRequest *request, GError *error, SnippetLocation *snippet_location)
 {
-    d(g_print ("snippet_error\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 }
 
 
@@ -478,14 +473,14 @@ hits_added_cb (BeagleQuery *query, BeagleHitsAddedResponse *response, YelpSearch
 
     GSList *hits, *l;
 
-    d(g_print ("hits_added\n"));
+    debug_print (DB_FUNCTION, "hits_added\n");
 
     hits = beagle_hits_added_response_get_hits (response);
 
     for (l = hits; l; l = l->next) {
 	BeagleHit *hit = l->data;
 	beagle_hit_ref (hit);
-	d(g_print ("%f\n", beagle_hit_get_score (hit)));
+	debug_print (DB_DEBUG, "%f\n", beagle_hit_get_score (hit));
 	g_ptr_array_add (priv->hits, hit);
     }
 }
@@ -495,11 +490,11 @@ check_lang (const char *lang) {
     int i;
     for (i = 0; langs[i]; i++) {
 	if (!strncmp (lang, langs[i], 2)) {
-	    d(g_print ("%s preferred\n", lang));
+	    debug_print (DB_DEBUG, "%s preferred\n", lang);
 	    return TRUE;
 	}
     }
-    d(g_print ("%s not preferred\n", lang));
+    debug_print (DB_DEBUG, "%s not preferred\n", lang);
     return FALSE;
 }
 
@@ -543,7 +538,7 @@ finished_cb (BeagleQuery            *query,
     int i;
     YelpSearchPagerPriv *priv = YELP_SEARCH_PAGER (pager)->priv;
 
-    d(g_print ("finished_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     g_ptr_array_sort (priv->hits, compare_hits);
 
@@ -566,7 +561,7 @@ finished_cb (BeagleQuery            *query,
 	    xmlSetProp (child, BAD_CAST "base_title", BAD_CAST property);
 
 	score = g_strdup_printf ("%f", beagle_hit_get_score (hit));
-	d(g_print ("%f\n", beagle_hit_get_score (hit)));
+	debug_print (DB_DEBUG, "%f\n", beagle_hit_get_score (hit));
 	/*xmlSetProp (child, BAD_CAST "score", BAD_CAST score);*/
 	g_free (score);
 
@@ -588,7 +583,7 @@ finished_cb (BeagleQuery            *query,
 	g_signal_connect (request, "closed",
 			  G_CALLBACK (snippet_closed), snippet_location);
 
-	d(g_print ("Requesting snippet\n"));
+	debug_print (DB_DEBUG, "Requesting snippet\n");
 	beagle_client_send_request_async (beagle_client, BEAGLE_REQUEST (request),
 					  NULL);
     }
@@ -644,7 +639,7 @@ search_pager_process_idle (YelpSearchPager *pager)
 	beagle_client_send_request_async (beagle_client, BEAGLE_REQUEST (query), &error);
 
 	if (error) {
-	    d(g_print ("error: %s\n", error->message));
+	    debug_print (DB_DEBUG, "error: %s\n", error->message);
 	}
 
 	g_clear_error (&error);
diff --git a/src/yelp-settings.c b/src/yelp-settings.c
index 2869fb09..a343cf42 100644
--- a/src/yelp-settings.c
+++ b/src/yelp-settings.c
@@ -31,7 +31,9 @@
 #include <gconf/gconf-client.h>
 #include <libgnomeui/gnome-href.h>
 #include <string.h>
+
 #include "yelp-settings.h"
+#include "yelp-debug.h"
 
 #define KEY_GNOME_DIR           "/desktop/gnome/interface"
 #define KEY_GNOME_VARIABLE_FONT KEY_GNOME_DIR "/document_font_name"
@@ -44,12 +46,6 @@
 #define KEY_YELP_VARIABLE_FONT  KEY_YELP_DIR "/variable_font"
 #define KEY_YELP_FIXED_FONT     KEY_YELP_DIR "/fixed_font"
 
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
-
 static const gchar * const color_params[YELP_NUM_COLORS] = {
     "yelp.color.fg",
     "yelp.color.bg",
@@ -518,7 +514,7 @@ gconf_system_fonts_cb (GConfClient   *client,
 {
     gboolean use;
 
-    d (g_print ("gconf_system_fonts_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     use = gconf_value_get_bool (gconf_entry_get_value (entry));
 
@@ -541,7 +537,7 @@ gconf_font_cb (GConfClient   *client,
     gulong handler;
     const gchar *font;
 
-    d (g_print ("gconf_font_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     font = gconf_value_get_string (gconf_entry_get_value (entry));
 
@@ -590,7 +586,7 @@ gconf_use_caret_cb (GConfClient  *client,
 static void
 gtk_theme_changed (GtkSettings *settings, gpointer user_data)
 {
-    d (g_print ("gtk_theme_changed\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     settings_update (YELP_SETTINGS_INFO_COLOR);
 }
@@ -612,7 +608,7 @@ settings_update (YelpSettingsType type)
     guint16    rval, gval, bval;
     gint i;
 
-    d (g_print ("settings_update\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     if (type & YELP_SETTINGS_INFO_COLOR) {
 	style = gtk_rc_get_style_by_paths (gtk_settings,
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 4aba9426..a222234f 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -48,6 +48,7 @@
 #include "yelp-toc-pager.h"
 #include "yelp-window.h"
 #include "yelp-print.h"
+#include "yelp-debug.h"
 
 #ifdef ENABLE_MAN
 #include "yelp-man-pager.h"
@@ -60,12 +61,6 @@
 #include "gtkentryaction.h"
 #endif
 
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
-
 #define YELP_CONFIG_WIDTH          "/yelp/Geometry/width"
 #define YELP_CONFIG_HEIGHT         "/yelp/Geometry/height"
 #define YELP_CONFIG_WIDTH_DEFAULT  "600"
@@ -913,8 +908,8 @@ yelp_window_load (YelpWindow *window, const gchar *uri)
     } else {
 	real_uri = g_strdup (uri);
     }
-    d (g_print ("yelp_window_load\n"));
-    d (g_print ("  uri = \"%s\"\n", uri));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
 
     if (!real_uri) {
 	GError *error = NULL;
@@ -1002,7 +997,7 @@ window_do_load (YelpWindow  *window,
     g_return_if_fail (YELP_IS_WINDOW (window));
     g_return_if_fail (doc_info != NULL);
 
-    d (g_print ("window_do_laod\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     action = gtk_action_group_get_action (window->priv->action_group, 
 					  "PrintDocument");
@@ -1775,10 +1770,10 @@ window_handle_page (YelpWindow   *window,
     priv = window->priv;
     window_disconnect (window);
 
-    d (g_print ("window_handle_page\n"));
-    d (g_print ("  page->page_id  = \"%s\"\n", page->page_id));
-    d (g_print ("  page->title    = \"%s\"\n", page->title));
-    d (g_print ("  page->contents = %i bytes\n", strlen (page->contents)));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  page->page_id  = \"%s\"\n", page->page_id);
+    debug_print (DB_ARG, "  page->title    = \"%s\"\n", page->title);
+    debug_print (DB_ARG, "  page->contents = %i bytes\n", strlen (page->contents));
 
     model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->side_sects));
     pager = yelp_doc_info_get_pager (priv->current_doc);
@@ -1856,7 +1851,7 @@ window_handle_page (YelpWindow   *window,
 				 priv->current_frag,
 				 YELP_URI_TYPE_FILE);
 
-    d (g_print ("  uri            = %s\n", uri));
+    debug_print (DB_ARG, "  uri            = %s\n", uri);
 
     yelp_html_set_base_uri (priv->html_view, uri);
     yelp_html_open_stream (priv->html_view, "application/xhtml+xml");
@@ -1958,8 +1953,8 @@ pager_start_cb (YelpPager   *pager,
     page_id = yelp_pager_resolve_frag (pager,
 				       window->priv->current_frag);
 
-    d (g_print ("pager_start_cb\n"));
-    d (g_print ("  page_id=\"%s\"\n", page_id));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  page_id=\"%s\"\n", page_id);
 
     window_set_sections (window,
 			 yelp_pager_get_sections (pager));
@@ -1987,8 +1982,8 @@ pager_page_cb (YelpPager *pager,
     YelpWindow  *window = YELP_WINDOW (user_data);
     YelpPage    *page;
 
-    d (g_print ("pager_page_cb\n"));
-    d (g_print ("  page_id=\"%s\"\n", page_id));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  page_id=\"%s\"\n", page_id);
 
     if (yelp_pager_page_contains_frag (pager,
 				       page_id,
@@ -2016,7 +2011,7 @@ pager_error_cb (YelpPager   *pager,
     YelpWindow *window = YELP_WINDOW (user_data);
     GError *error = yelp_pager_get_error (pager);
 
-    d (g_print ("pager_error_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     window_disconnect (window);
     window_error (window, error, TRUE);
@@ -2029,7 +2024,7 @@ pager_cancel_cb (YelpPager   *pager,
 		gpointer     user_data)
 {
     YelpWindow *window = YELP_WINDOW (user_data);
-    d (g_print ("pager_cancel_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     window_disconnect (window);
 }
@@ -2041,7 +2036,7 @@ pager_finish_cb (YelpPager   *pager,
     GError *error = NULL;
     YelpWindow  *window = YELP_WINDOW (user_data);
 
-    d (g_print ("pager_finish_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     window_disconnect (window);
 
@@ -2066,8 +2061,8 @@ html_uri_selected_cb (YelpHtml  *html,
 {
     YelpWindow *window = YELP_WINDOW (user_data);
 
-    d (g_print ("html_uri_selected_cb\n"));
-    d (g_print ("  uri = \"%s\"\n", uri));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
 
     if (!handled) {
 	yelp_window_load (window, uri);
@@ -2174,7 +2169,7 @@ tree_drag_data_get_cb (GtkWidget         *widget,
 
     g_return_if_fail (YELP_IS_WINDOW (window));
 
-    d (g_print ("tree_drag_data_get_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     priv = window->priv;
 
@@ -2236,7 +2231,7 @@ typedef struct {
 static void
 print_disconnect (PrintStruct *data)
 {
-    d(g_print ("print disconnect\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     if (data->page_handler) {
 	g_signal_handler_disconnect (data->pager,
 				     data->page_handler);
@@ -2267,8 +2262,8 @@ print_pager_page_cb (YelpPager *pager,
 {
     PrintStruct *data = user_data;
     YelpPage    *page;
-    d (g_print ("print_pager_page_cb\n"));
-    d (g_print ("  page_id=\"%s\"\n", page_id));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  page_id=\"%s\"\n", page_id);
 
     page = (YelpPage *) yelp_pager_get_page (pager, page_id);
 
@@ -2278,7 +2273,7 @@ print_pager_page_cb (YelpPager *pager,
 	int length, offset;
 	char *uri;
 	GtkWidget *vbox = gtk_vbox_new (FALSE, FALSE);
-	d(g_print (page->contents));
+	debug_print (DB_DEBUG, page->contents);
 
 	gtk_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	html = yelp_html_new ();
@@ -2294,14 +2289,14 @@ print_pager_page_cb (YelpPager *pager,
 				     page_id,
 				     YELP_URI_TYPE_FILE);
 
-	d (g_print ("  uri            = %s\n", uri));
+	debug_print (DB_ARG, "  uri            = %s\n", uri);
 
 	yelp_html_set_base_uri (html, uri);
 	g_free (uri);
 
 	yelp_html_open_stream (html, "application/xhtml+xml");
 	for (length = strlen (page->contents), offset = 0; length > 0; length -= BUFFER_SIZE, offset += BUFFER_SIZE) {
-	    d(g_print ("data: %.*s\n", MIN (length, BUFFER_SIZE), page->contents + offset));
+	    debug_print (DB_DEBUG, "data: %.*s\n", MIN (length, BUFFER_SIZE), page->contents + offset);
 	    yelp_html_write (html, page->contents + offset, MIN (length, BUFFER_SIZE));
 	}
 	yelp_html_close (html);
@@ -2320,7 +2315,7 @@ print_pager_error_cb (YelpPager   *pager,
     PrintStruct *data = user_data;
     /*     GError *error = yelp_pager_get_error (pager);*/
 
-    d (g_print ("print_pager_error_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     print_disconnect (data);
 }
@@ -2330,7 +2325,7 @@ print_pager_cancel_cb (YelpPager   *pager,
 		       gpointer     user_data)
 {
     PrintStruct *data = user_data;
-    d (g_print ("print_pager_cancel_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     print_disconnect (data);
 }
@@ -2341,7 +2336,7 @@ print_pager_finish_cb (YelpPager   *pager,
 {
     PrintStruct *data = user_data;
 
-    d (g_print ("print_pager_finish_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     print_disconnect (data);
 }
@@ -2421,7 +2416,7 @@ window_print_page_cb (GtkAction *action, YelpWindow *window)
 	
 	yelp_html_open_stream (html, "application/xhtml+xml");
 	for (length = strlen (page->contents), offset = 0; length > 0; length -= BUFFER_SIZE, offset += BUFFER_SIZE) {
-	    d (g_print ("data: %.*s\n", MIN (length, BUFFER_SIZE), page->contents + offset));
+	    debug_print (DB_DEBUG, "data: %.*s\n", MIN (length, BUFFER_SIZE), page->contents + offset);
 	    yelp_html_write (html, page->contents + offset, MIN (length, BUFFER_SIZE));
 	}
 	yelp_html_close (html);
@@ -2592,7 +2587,7 @@ window_find_cb (GtkAction *action, YelpWindow *window)
 
     priv = window->priv;
 
-    d (g_print ("window_find_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     gtk_widget_show_all (priv->find_bar);
     gtk_widget_grab_focus (priv->find_entry);
@@ -2614,7 +2609,7 @@ window_reload_cb (GtkAction *action, YelpWindow *window)
 
     g_return_if_fail (YELP_IS_WINDOW (window));
 
-    d (g_print ("window_reload_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     if (window->priv->current_doc) {
 	YelpLoadData *data;
@@ -2720,7 +2715,7 @@ window_go_forward_cb (GtkAction *action, YelpWindow *window)
 static void
 window_go_home_cb (GtkAction *action, YelpWindow *window)
 {
-    d (g_print ("window_go_home_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     g_return_if_fail (YELP_IS_WINDOW (window));
     yelp_window_load (window, "x-yelp-toc:");
 }
@@ -2731,7 +2726,7 @@ window_go_previous_cb (GtkAction *action, YelpWindow *window)
     YelpWindowPriv *priv;
     gchar *base, *uri;
 
-    d (g_print ("window_go_previous_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     g_return_if_fail (YELP_IS_WINDOW (window));
     g_return_if_fail (window->priv->current_doc);
     priv = window->priv;
@@ -2751,7 +2746,7 @@ window_go_next_cb (GtkAction *action, YelpWindow *window)
     YelpWindowPriv *priv;
     gchar *base, *uri;
 
-    d (g_print ("window_go_next_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     g_return_if_fail (YELP_IS_WINDOW (window));
     g_return_if_fail (window->priv->current_doc);
     priv = window->priv;
@@ -2771,7 +2766,7 @@ window_go_toc_cb (GtkAction *action, YelpWindow *window)
     YelpWindowPriv *priv;
     gchar *base, *uri;
 
-    d (g_print ("window_go_toc_cb\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     g_return_if_fail (YELP_IS_WINDOW (window));
     g_return_if_fail (window->priv->current_doc);
     priv = window->priv;
@@ -2791,7 +2786,7 @@ window_add_bookmark_cb (GtkAction *action, YelpWindow *window)
     gchar *uri;
     YelpWindowPriv *priv = window->priv;
 
-    d (g_print ("window_add_bookmark\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     uri = yelp_doc_info_get_uri (priv->current_doc, priv->current_frag,
 				 YELP_URI_TYPE_NO_FILE);
@@ -2920,8 +2915,8 @@ location_response_cb (GtkDialog *dialog, gint id, YelpWindow *window)
 {
     g_return_if_fail (YELP_IS_WINDOW (window));
 
-    d (g_print ("location_response_cb\n"));
-    d (g_print ("  id = %i\n", id));
+    debug_print (DB_FUNCTION, "entering\n");
+    debug_print (DB_ARG, "  id = %i\n", id);
 
     if (id == GTK_RESPONSE_OK) {
 	const gchar *uri = 
@@ -3084,14 +3079,14 @@ window_find_entry_key_pressed_cb (GtkWidget    *widget,
     YelpWindow     *window;
     YelpWindowPriv *priv;
 
+    debug_print (DB_FUNCTION, "entering\n");
+
     if (key->keyval == GDK_Escape) {
 	g_return_val_if_fail (YELP_IS_WINDOW (data), FALSE);
 
 	window = YELP_WINDOW (data);
 	priv = window->priv;
 
-	d (g_print ("window_find_entry_key_pressed_cb\n"));
-
 	gtk_widget_hide_all (priv->find_bar);
 
 	return TRUE;
@@ -3167,15 +3162,15 @@ idle_write (IdleWriterContext *context)
     g_return_val_if_fail (context != NULL, FALSE);
     g_return_val_if_fail (context->window != NULL, FALSE);
 
-    d (g_print ("idle_write\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     priv = context->window->priv;
 
     switch (context->type) {
     case IDLE_WRITER_MEMORY:
-	d (g_print ("  context->buffer = %i bytes\n", strlen (context->buffer)));
-	d (g_print ("  context->cur    = %i\n", context->cur));
-	d (g_print ("  context->length = %i\n", context->length));
+	debug_print (DB_DEBUG, "  context->buffer = %i bytes\n", strlen (context->buffer));
+	debug_print (DB_DEBUG, "  context->cur    = %i\n", context->cur);
+	debug_print (DB_DEBUG, "  context->length = %i\n", context->length);
 
 	if (context->cur + BUFFER_SIZE < context->length) {
 	    yelp_html_write (priv->html_view,
diff --git a/src/yelp-xslt-pager.c b/src/yelp-xslt-pager.c
index 8fa19207..aba64fff 100644
--- a/src/yelp-xslt-pager.c
+++ b/src/yelp-xslt-pager.c
@@ -39,12 +39,7 @@
 #include "yelp-error.h"
 #include "yelp-settings.h"
 #include "yelp-xslt-pager.h"
-
-#ifdef YELP_DEBUG
-#define d(x) x
-#else
-#define d(x)
-#endif
+#include "yelp-debug.h"
 
 #define YELP_NAMESPACE "http://www.gnome.org/yelp/ns"
 
@@ -166,7 +161,7 @@ xslt_pager_process (YelpPager *pager)
 
     GError *error = NULL;
 
-    d (g_print ("xslt_pager_process\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     g_return_val_if_fail (pager != NULL, FALSE);
     g_return_val_if_fail (YELP_IS_XSLT_PAGER (pager), FALSE);
@@ -288,7 +283,7 @@ xslt_pager_process (YelpPager *pager)
 static void
 xslt_pager_error (YelpPager *pager)
 {
-    d (g_print ("xslt_pager_error\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     yelp_pager_set_state (pager, YELP_PAGER_STATE_ERROR);
 }
 
@@ -297,7 +292,7 @@ xslt_pager_cancel (YelpPager *pager)
 {
     YelpXsltPagerPriv *priv = YELP_XSLT_PAGER (pager)->priv;
 
-    d (g_print ("xslt_pager_cancel\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     yelp_pager_set_state (pager, YELP_PAGER_STATE_INVALID);
 
@@ -322,7 +317,7 @@ xslt_pager_cancel (YelpPager *pager)
 static void
 xslt_pager_finish (YelpPager *pager)
 {
-    d (g_print ("xslt_pager_finish\n"));
+    debug_print (DB_FUNCTION, "entering\n");
     yelp_pager_set_state (pager, YELP_PAGER_STATE_FINISHED);
 }
 
@@ -356,7 +351,7 @@ xslt_yelp_document (xsltTransformContextPtr ctxt,
     EVENTS_PENDING;
     CANCEL_CHECK;
 
-    d (g_print ("xslt_yelp_document\n"));
+    debug_print (DB_FUNCTION, "entering\n");
 
     page_id = xsltEvalAttrValueTemplate (ctxt, inst,
 					 (const xmlChar *) "href",
@@ -369,7 +364,7 @@ xslt_yelp_document (xsltTransformContextPtr ctxt,
 	yelp_pager_error (pager, error);
 	goto done;
     }
-    d (g_print ("  page_id = \"%s\"\n", page_id));
+    debug_print (DB_FUNCTION, "  page_id = \"%s\"\n", page_id);
 
     old_outfile = ctxt->outputFile;
     old_doc     = ctxt->output;