2003-01-12 Marco Pesenti Gritti <marco@it.gnome.org>

	* configure.in:
	* doc/debugging.txt:
	* embed/ephy-embed-utils.c:
	(ephy_embed_utils_build_charsets_submenu):
	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_init):
	* embed/ephy-history.c: (ephy_history_save):
	* embed/mozilla/mozilla-embed.cpp:
	* lib/ephy-autocompletion.c: (ephy_autocompletion_reset),
	(ephy_autocompletion_get_common_prefix),
	(ephy_autocompletion_refine_matches),
	(ephy_autocompletion_update_matches_full),
	(ephy_autocompletion_sort_by_score),
	(ephy_autocompletion_data_changed_cb), (acma_grow):
	* lib/ephy-debug.c: (log_module), (ephy_debug_init),
	(ephy_profiler_new), (ephy_should_profile), (ephy_profiler_dump),
	(ephy_profiler_free), (ephy_profiler_start), (ephy_profiler_stop):
	* lib/ephy-debug.h:
	* lib/ephy-filesystem-autocompletion.c:
	(ephy_filesystem_autocompletion_finalize_impl),
	(gfa_load_directory_cb),
	(ephy_filesystem_autocompletion_set_current_dir),
	(ephy_filesystem_autocompletion_set_base_dir):
	* lib/ephy-start-here.c:
	* lib/widgets/ephy-autocompletion-window.c:
	(ephy_autocompletion_window_get_dimensions),
	(ephy_autocompletion_window_fill_store_chunk),
	(ephy_autocompletion_window_show),
	(ephy_autocompletion_window_key_press_cb):
	* lib/widgets/ephy-location-entry.c:
	(ephy_location_entry_finalize_impl),
	(ephy_location_entry_autocompletion_show_alternatives_to),
	(ephy_location_entry_autocompletion_to),
	(ephy_location_entry_activate_cb),
	(ephy_location_entry_autocompletion_sources_changed_cb),
	(ephy_location_entry_autocompletion_window_url_activated_cb),
	(ephy_location_entry_autocompletion_window_hidden_cb):
	* src/bookmarks/ephy-bookmarks-editor.c:
	* src/bookmarks/ephy-bookmarks.c:
	(ephy_bookmarks_clean_empty_keywords), (ephy_bookmarks_save),
	(ephy_bookmarks_find_keyword), (diff_keywords):
	* src/bookmarks/ephy-keywords-entry.c: (try_to_expand_keyword):
	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_set_title):
	* src/ephy-favorites-menu.c: (ephy_favorites_menu_rebuild):
	* src/ephy-nautilus-view.c: (gnv_cmd_set_charset), (if):
	* src/ephy-navigation-button.c:
	(ephy_navigation_button_finalize_impl):
	* src/ephy-shell.c: (ephy_shell_finalize):
	* src/ephy-tab.c: (ephy_tab_embed_destroy_cb), (ephy_tab_finalize):

12 files changed, 54 insertions, 90 deletions

diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 66454d586..94a512fe6 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -32,9 +32,6 @@
 #include "ephy-keywords-entry.h"
 #include "ephy-dnd.h"
 
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
 static void ephy_bookmarks_editor_class_init (EphyBookmarksEditorClass *klass);
 static void ephy_bookmarks_editor_init (EphyBookmarksEditor *editor);
 static void ephy_bookmarks_editor_finalize (GObject *object);
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index bf77ed3f7..0f68d8858 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -20,13 +20,11 @@
 #include "ephy-file-helpers.h"
 #include "ephy-shell.h"
 #include "ephy-history.h"
+#include "ephy-debug.h"
 
 #include <string.h>
 #include <libgnome/gnome-i18n.h>
 
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
 #define EPHY_BOOKMARKS_XML_VERSION "0.1"
 
 #define MAX_FAVORITES_NUM 10
@@ -194,10 +192,11 @@ ephy_bookmarks_clean_empty_keywords (EphyBookmarks *eb)
 
 	for (tmp = l; tmp != NULL; tmp = tmp->next)
 	{
-		DEBUG_MSG (("Remove empty keyword: %s\n",
-				ephy_node_get_property_string (kid,
-				   EPHY_NODE_KEYWORD_PROP_NAME)));
-		g_object_unref (EPHY_NODE (tmp->data));
+		EphyNode *node = EPHY_NODE (tmp->data);
+		LOG ("Remove empty keyword: %s",
+		     ephy_node_get_property_string (node,
+			     EPHY_NODE_KEYWORD_PROP_NAME))
+		g_object_unref (node);
 	}
 	g_list_free (l);
 
@@ -241,7 +240,7 @@ ephy_bookmarks_save (EphyBookmarks *eb)
 	GPtrArray *children;
 	int i;
 
-	DEBUG_MSG (("Saving bookmarks\n"));
+	LOG ("Saving bookmarks")
 
 	/* save nodes to xml */
 	xmlIndentTreeOutput = TRUE;
@@ -853,7 +852,7 @@ ephy_bookmarks_find_keyword (EphyBookmarks *eb,
 
 		if (g_utf8_strlen (name, -1) == 0)
 		{
-			DEBUG_MSG (("Empty name, no keyword matches.\n"));
+			LOG ("Empty name, no keyword matches.")
 			return NULL;
 		}
 
@@ -905,7 +904,7 @@ diff_keywords (char **ks1, char **ks2)
 	{
 		gboolean found = FALSE;
 
-		DEBUG_MSG (("Diff keywords, keyword:\"%s\"\n", ks1[i]));
+		LOG ("Diff keywords, keyword:\"%s\"", ks1[i])
 
 		for (j = 0; ks2 != NULL && ks2[j] != NULL; j++)
 		{
diff --git a/src/bookmarks/ephy-keywords-entry.c b/src/bookmarks/ephy-keywords-entry.c
index 94d6c93a9..0894bfcae 100644
--- a/src/bookmarks/ephy-keywords-entry.c
+++ b/src/bookmarks/ephy-keywords-entry.c
@@ -19,14 +19,10 @@
 #include "ephy-keywords-entry.h"
 #include "ephy-marshal.h"
 #include "ephy-gobject-misc.h"
+#include "ephy-debug.h"
 
 #include <gdk/gdkkeysyms.h>
 
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-
 /**
  * Private data
  */
@@ -99,7 +95,7 @@ try_to_expand_keyword (GtkEditable *editable)
 	entry_text = gtk_editable_get_chars (editable, 0, -1);
 	g_return_if_fail (entry_text != NULL);
 
-	DEBUG_MSG (("Entry text \"%s\"\n", entry_text));
+	LOG ("Entry text \"%s\"", entry_text)
 
 	user_text = g_utf8_strrchr (entry_text, -1, ' ');
 
@@ -114,7 +110,7 @@ try_to_expand_keyword (GtkEditable *editable)
 		user_text = entry_text;
 	}
 
-	DEBUG_MSG (("User text \"%s\"\n", user_text));
+	LOG ("User text \"%s\"", user_text)
 
 	node = ephy_bookmarks_find_keyword (entry->priv->bookmarks,
 					    user_text, TRUE);
@@ -123,7 +119,7 @@ try_to_expand_keyword (GtkEditable *editable)
 		expand_text = ephy_node_get_property_string
 			(node, EPHY_NODE_KEYWORD_PROP_NAME);
 
-		DEBUG_MSG (("Expand text %s\n", expand_text));
+		LOG ("Expand text %s", expand_text)
 
 		expand_text_length = g_utf8_strlen (expand_text, -1);
 		user_text_length = g_utf8_strlen (user_text, -1);
@@ -137,7 +133,7 @@ try_to_expand_keyword (GtkEditable *editable)
 	}
 	else
 	{
-		DEBUG_MSG (("No expansion.\n"));
+		LOG ("No expansion.")
 	}
 
 	g_free (entry_text);
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index e5d9c496d..dbda8b11b 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -28,9 +28,7 @@
 
 #include "ephy-new-bookmark.h"
 #include "ephy-keywords-entry.h"
-
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
+#include "ephy-debug.h"
 
 static void ephy_new_bookmark_class_init (EphyNewBookmarkClass *klass);
 static void ephy_new_bookmark_init (EphyNewBookmark *editor);
@@ -332,7 +330,7 @@ void
 ephy_new_bookmark_set_title (EphyNewBookmark *bookmark,
 			     const char *title)
 {
-	DEBUG_MSG (("Setting new bookmark title to: \"%s\"", title));
+	LOG ("Setting new bookmark title to: \"%s\"", title)
 	gtk_entry_set_text (GTK_ENTRY (bookmark->priv->title_entry),
 			    g_strdup (title));
 }
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c
index d8f44f852..b463663c2 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -26,15 +26,12 @@
 #include "ephy-bonobo-extensions.h"
 #include "ephy-marshal.h"
 #include "ephy-shell.h"
+#include "ephy-debug.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <libxml/entities.h>
 
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
 #define MAX_LABEL_LENGTH 30
 
 /**
@@ -213,7 +210,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
 
 	ephy_bonobo_clear_path (uic, p->path);
 
-	DEBUG_MSG (("Rebuilding recent history menu\n"));
+	LOG ("Rebuilding recent history menu")
 
 	fav = ephy_bookmarks_get_favorites (p->bookmarks);
 	children = ephy_node_get_children (fav);
@@ -260,7 +257,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *wrhm)
 	ephy_node_thaw (fav);
 
 	g_string_append (xml, "</placeholder>\n");
-	DEBUG_MSG (("\n%s\n", xml->str));
+
 	if (children->len > 0)
 	{
 		bonobo_ui_component_set (uic, p->path,
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index c485721a5..04916c37a 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -30,10 +30,7 @@
 #include "print-dialog.h"
 #include "ephy-prefs.h"
 #include "eel-gconf-extensions.h"
-
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-#define DEBUG_MSG(x) g_print x
-//#define DEBUG_MSG(x)
+#include "ephy-debug.h"
 
 static void		gnv_embed_location_cb 			(EphyEmbed *embed, 
 								 EphyNautilusView *view);
@@ -566,7 +563,7 @@ gnv_cmd_set_charset (BonoboUIComponent *uic,
 
 	p = view->priv;
 	
-	DEBUG_MSG ((data->encoding));
+	LOG ("Set charset %s", data->encoding)
 	ephy_embed_set_charset (p->embed, data->encoding);
 }
 
@@ -783,13 +780,13 @@ vfs_open_cb (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer data)
 {
 	EphyNautilusView *view = data;
 
-	DEBUG_MSG (("+%s GnomeVFSResult: %u\n", G_GNUC_FUNCTION, (unsigned)result));
+	LOG ("+%s GnomeVFSResult: %u", G_GNUC_FUNCTION, (unsigned)result)
 
 	if (result != GNOME_VFS_OK)
 	{
 		gtk_moz_embed_close_stream (GTK_MOZ_EMBED (view->priv->embed->mozembed));
 		/* NOTE: the view may go away after a call to report_load_failed */
-		DEBUG_MSG ((">nautilus_view_report_load_failed\n"));
+		LOG (">nautilus_view_report_load_failed")
 		nautilus_view_report_load_failed (view->priv->nautilus_view);
 	} else {
 		if (view->priv->vfs_read_buffer == NULL) {
@@ -798,7 +795,7 @@ vfs_open_cb (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer data)
 		gtk_moz_embed_open_stream (GTK_MOZ_EMBED (view->priv->embed->mozembed), "file:///", "text/html");
 		gnome_vfs_async_read (handle, view->priv->vfs_read_buffer, VFS_READ_BUFFER_SIZE, vfs_read_cb, view);
 	}
-	DEBUG_MSG (("-%s\n", G_GNUC_FUNCTION));
+	LOG ("-%s", G_GNUC_FUNCTION);
 }
 
 /**
@@ -815,7 +812,7 @@ vfs_read_cb (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer buffer
 {
 	EphyNautilusView *view = data;
 
-	DEBUG_MSG (("+%s %ld/%ld bytes\n", G_GNUC_FUNCTION, (long)bytes_requested, (long) bytes_read));
+	LOG ("+%s %ld/%ld bytes", G_GNUC_FUNCTION, (long)bytes_requested, (long) bytes_read)
 
 	if (bytes_read != 0) {
 		gtk_moz_embed_append_data (GTK_MOZ_EMBED (view->priv->embed->mozembed), buffer, bytes_read);
@@ -829,15 +826,15 @@ vfs_read_cb (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer buffer
 		
 		gnome_vfs_async_close (handle, (GnomeVFSAsyncCloseCallback) gtk_true, NULL);
 
-		DEBUG_MSG ((">nautilus_view_report_load_complete\n"));
+		LOG (">nautilus_view_report_load_complete")
 		nautilus_view_report_load_complete (view->priv->nautilus_view);
 
-		DEBUG_MSG (("=%s load complete\n", G_GNUC_FUNCTION));
+		LOG ("=%s load complete", G_GNUC_FUNCTION)
     	} else {
 		gnome_vfs_async_read (handle, view->priv->vfs_read_buffer, VFS_READ_BUFFER_SIZE, vfs_read_cb, view);
 	}
 
-	DEBUG_MSG (("-%s\n", G_GNUC_FUNCTION));
+	LOG ("-%s", G_GNUC_FUNCTION)
 }
 
 /***********************************************************************************/
@@ -875,7 +872,7 @@ navigate_mozilla_to_nautilus_uri (EphyNautilusView *view,
 		 * premature realization may cause other issues)
 		 */
 		
-		DEBUG_MSG (("=%s: Postponing navigation request to widget realization\n", G_GNUC_FUNCTION));
+		LOG ("=%s: Postponing navigation request to widget realization", G_GNUC_FUNCTION)
 		/* Note that view->priv->uri is still set below */
 	} else {
 		if (should_mozilla_load_uri_directly (uri)) {
@@ -891,7 +888,7 @@ navigate_mozilla_to_nautilus_uri (EphyNautilusView *view,
 			old_uri = view->priv->embed->location;
 
 			if (old_uri != NULL && uris_identical (uri, old_uri)) {
-				DEBUG_MSG (("=%s uri's identical, telling ephy to reload\n", G_GNUC_FUNCTION));
+				LOG ("=%s uri's identical, telling ephy to reload", G_GNUC_FUNCTION)
 				embed_reload (view->priv->embed,
 					      GTK_MOZ_EMBED_FLAG_RELOADBYPASSCACHE);
 			} else {
@@ -899,7 +896,7 @@ navigate_mozilla_to_nautilus_uri (EphyNautilusView *view,
 			}
 
 		} else {
-			DEBUG_MSG (("=%s loading URI via gnome-vfs\n", G_GNUC_FUNCTION));
+			LOG ("=%s loading URI via gnome-vfs", G_GNUC_FUNCTION)
 			gnome_vfs_async_open (&(view->priv->vfs_handle), uri,
 					      GNOME_VFS_OPEN_READ, GNOME_VFS_PRIORITY_DEFAULT, 
 					      vfs_open_cb, view);
@@ -909,7 +906,7 @@ navigate_mozilla_to_nautilus_uri (EphyNautilusView *view,
 	g_free (view->priv->uri);
 	view->priv->uri = g_strdup (uri);
 
-	DEBUG_MSG (("=%s current URI is now '%s'\n", G_GNUC_FUNCTION, view->priv->uri));
+	LOG ("=%s current URI is now '%s'", G_GNUC_FUNCTION, view->priv->uri)
 }
 
 /*
diff --git a/src/ephy-navigation-button.c b/src/ephy-navigation-button.c
index f57de2690..a10b3a942 100644
--- a/src/ephy-navigation-button.c
+++ b/src/ephy-navigation-button.c
@@ -20,19 +20,17 @@
 #include "config.h"
 #endif
 
-#include <libgnome/gnome-i18n.h>
 #include "ephy-gobject-misc.h"
 #include "ephy-marshal.h"
 #include "ephy-tb-button.h"
 #include "ephy-gui.h"
 #include "ephy-string.h"
 #include "ephy-navigation-button.h"
+#include "ephy-debug.h"
+
 #include <gtk/gtkstock.h>
 #include <string.h>
-
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
+#include <libgnome/gnome-i18n.h>
 
 /**
  * Private data
@@ -124,7 +122,7 @@ ephy_navigation_button_finalize_impl (GObject *o)
 
 	g_free (p);
 
-	DEBUG_MSG (("EphyNavigationButton finalized\n"));
+	LOG ("EphyNavigationButton finalized")
 
 	G_OBJECT_CLASS (ephy_tb_item_class)->finalize (o);
 }
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index e10af0ee2..86543d082 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -257,15 +257,11 @@ ephy_shell_finalize (GObject *object)
 	ephy_file_helpers_shutdown ();
 	ephy_node_system_shutdown ();
 
-#ifdef DEBUG_MARCO
-	g_print ("Ephy shell finalized\n");
-#endif
+	LOG ("Ephy shell finalized")
 
 	bonobo_main_quit ();
 
-#ifdef DEBUG_MARCO
-	g_print ("Bonobo quit done\n");
-#endif
+	LOG ("Bonobo quit done")
 }
 
 EphyShell *
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 6430f025a..6a0201d30 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -20,17 +20,13 @@
 #include "config.h"
 #endif
 
-#define DEBUG_MSG(x) g_print x
-//#define DEBUG_MSG(x)
-
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-
 #include "ephy-tab.h"
 #include "ephy-shell.h"
 #include "ephy-embed-popup-bw.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-prefs.h"
 #include "ephy-embed-prefs.h"
+#include "ephy-debug.h"
 
 #include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
@@ -182,9 +178,7 @@ ephy_tab_parent_set_cb (GtkWidget *widget, GtkWidget *previous_parent,
 static void
 ephy_tab_embed_destroy_cb (GtkWidget *widget, EphyTab *tab)
 {
-#ifdef DEBUG_MARCO
-	g_print ("GtkMozEmbed destroy signal on EphyTab\n");
-#endif
+	LOG ("GtkMozEmbed destroy signal on EphyTab")
 	g_object_unref (tab);
 }
 
@@ -290,9 +284,7 @@ ephy_tab_finalize (GObject *object)
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 
-#ifdef DEBUG_MARCO
-	g_print ("EphyTab finalized %p\n", tab);
-#endif
+	LOG ("EphyTab finalized %p", tab)
 }
 
 /* Public functions */
diff --git a/src/ephy-tbi.c b/src/ephy-tbi.c
index 0c6e04f9b..4a8993c46 100644
--- a/src/ephy-tbi.c
+++ b/src/ephy-tbi.c
@@ -20,16 +20,14 @@
 #include "config.h"
 #endif
 
-#include <libgnome/gnome-i18n.h>
 #include "ephy-gobject-misc.h"
 #include "ephy-marshal.h"
 #include "ephy-bonobo-extensions.h"
 #include "ephy-tbi.h"
-#include <string.h>
+#include "ephy-debug.h"
 
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
+#include <string.h>
+#include <libgnome/gnome-i18n.h>
 
 /**
  * Private data
@@ -100,7 +98,7 @@ ephy_tbi_finalize_impl (GObject *o)
 					      (gpointer *) &it->window);
 	}
 
-	DEBUG_MSG (("EphyTbi finalized\n"));
+	LOG ("EphyTbi finalized")
 
 	G_OBJECT_CLASS (ephy_tb_item_class)->finalize (o);
 }
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 9f751ea8b..4fd766faa 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -36,6 +36,7 @@
 #include "eel-gconf-extensions.h"
 #include "ephy-prefs.h"
 #include "ephy-embed-utils.h"
+#include "ephy-debug.h"
 
 #include <string.h>
 #include <bonobo/bonobo-window.h>
@@ -595,9 +596,7 @@ ephy_window_finalize (GObject *object)
 
         G_OBJECT_CLASS (parent_class)->finalize (object);
 
-#ifdef DEBUG_MARCO
-	g_print ("Ephy Window finalized %p\n", window);
-#endif
+	LOG ("Ephy Window finalized %p", window)
 
 	g_object_unref (ephy_shell);
 }
diff --git a/src/toolbar.c b/src/toolbar.c
index 695f657da..27c2606f2 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -17,10 +17,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-
 #include "toolbar.h"
 #include "ephy-spinner.h"
 #include "ephy-window.h"
@@ -35,6 +31,7 @@
 #include "ephy-prefs.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-navigation-button.h"
+#include "ephy-debug.h"
 
 #include <string.h>
 #include <bonobo/bonobo-i18n.h>
@@ -362,7 +359,7 @@ toolbar_get_widgets (Toolbar *t)
 	const gchar *nav_buttons_ids[] = {"back", "back_menu", "up", "up_menu", "forward", "forward_menu" };
 	guint i;
 
-	DEBUG_MSG (("in toolbar_get_widgets\n"));
+	LOG ("in toolbar_get_widgets");
 
 	g_return_if_fail (IS_TOOLBAR (t));
 	p = t->priv;
@@ -417,7 +414,7 @@ toolbar_get_widgets (Toolbar *t)
 		{
 			if (EPHY_IS_NAVIGATION_BUTTON (it))
 			{
-				DEBUG_MSG (("    got a navigation button\n"));
+				LOG ("got a navigation button")
 				p->navigation_buttons = g_slist_prepend (p->navigation_buttons, g_object_ref (it));
 				if (p->window)
 				{
@@ -439,7 +436,7 @@ toolbar_get_widgets (Toolbar *t)
 		g_object_ref (p->location_entry);
 		toolbar_setup_location_entry (t, p->location_entry);
 
-		DEBUG_MSG (("    got a location entry\n"));
+		LOG ("got a location entry")
 	}
 
 	it = ephy_toolbar_get_item_by_id (gt, "favicon");
@@ -449,7 +446,7 @@ toolbar_get_widgets (Toolbar *t)
 		g_object_ref (p->favicon_ebox);
 		toolbar_setup_favicon_ebox (t, p->favicon_ebox);
 
-		DEBUG_MSG (("    got a favicon ebox\n"));
+		LOG ("got a favicon ebox")
 	}
 
 	it = ephy_toolbar_get_item_by_id (gt, "spinner");
@@ -459,7 +456,7 @@ toolbar_get_widgets (Toolbar *t)
 		g_object_ref (p->spinner);
 		toolbar_setup_spinner (t, p->spinner);
 
-		DEBUG_MSG (("    got a spinner\n"));
+		LOG ("got a spinner")
 	}
 
 	it = ephy_toolbar_get_item_by_id (gt, "zoom");
@@ -469,7 +466,7 @@ toolbar_get_widgets (Toolbar *t)
 		g_object_ref (p->zoom_spinbutton);
 		toolbar_setup_zoom_spinbutton (t, p->zoom_spinbutton);
 
-		DEBUG_MSG (("    got a zoom control\n"));
+		LOG ("got a zoom control")
 	}
 
 	/* update the controls */