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):

7 files changed, 244 insertions, 176 deletions

diff --git a/lib/ephy-autocompletion.c b/lib/ephy-autocompletion.c
index 265590003..361b0ed2f 100644
--- a/lib/ephy-autocompletion.c
+++ b/lib/ephy-autocompletion.c
@@ -22,17 +22,7 @@
 #include "ephy-autocompletion.h"
 #include "ephy-gobject-misc.h"
 #include "ephy-marshal.h"
-
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
-//#define DEBUG_TIME
-
-#ifdef DEBUG_TIME
-#include <glib/gtimer.h>
-#endif
+#include "ephy-debug.h"
 
 /**
  * Private data
@@ -181,18 +171,15 @@ static void
 ephy_autocompletion_reset (EphyAutocompletion *ac)
 {
 	EphyAutocompletionPrivate *p = ac->priv;
-#ifdef DEBUG_TIME
-	GTimer *timer = g_timer_new ();
-	g_timer_start (timer);
-#endif
+
+	START_PROFILER ("Resetting autocompletion")
+
 	acma_destroy (&p->matches);
 	g_free (p->common_prefix);
 	p->common_prefix = NULL;
 	p->status = GAS_NEEDS_FULL_UPDATE;
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("AC: %f elapsed resetting\n", g_timer_elapsed (timer, NULL)));
-	g_timer_destroy (timer);
-#endif
+
+	STOP_PROFILER ("Resetting autocompletion")
 }
 
 EphyAutocompletion *
@@ -277,10 +264,9 @@ ephy_autocompletion_get_common_prefix (EphyAutocompletion *ac)
 	{
 		guint common_length = 0;
 		guint i;
-#ifdef DEBUG_TIME
-		GTimer *timer = g_timer_new ();
-		g_timer_start (timer);
-#endif
+
+		START_PROFILER ("Get Common Prefix")
+
 		for (i = 0; i < p->matches.num_matches; i++)
 		{
 			EphyAutocompletionMatch *mi = &p->matches.array[i];
@@ -307,10 +293,8 @@ ephy_autocompletion_get_common_prefix (EphyAutocompletion *ac)
 				p->common_prefix = g_strndup (realmatch, common_length);
 			}
 		}
-#ifdef DEBUG_TIME
-		DEBUG_MSG (("AC: %f elapsed calculating common prefix\n", g_timer_elapsed (timer, NULL)));
-		g_timer_destroy (timer);
-#endif
+
+		STOP_PROFILER ("Get Common Prefix")
 	}
 	return g_strdup (p->common_prefix);
 }
@@ -354,14 +338,9 @@ ephy_autocompletion_refine_matches (EphyAutocompletion *ac)
 	guint i;
 	gchar *key0 = p->keys[0];
 	guint key0l = p->key_lengths[0];
-#ifdef DEBUG_TIME
-	GTimer *timer = g_timer_new ();
-#endif
-	DEBUG_MSG (("AC: refining\n"));
-
-#ifdef DEBUG_TIME
-	g_timer_start (timer);
-#endif
+
+	START_PROFILER ("Refine matches")
+
 	acma_init (&newmatches);
 
 	p->changed = FALSE;
@@ -386,11 +365,7 @@ ephy_autocompletion_refine_matches (EphyAutocompletion *ac)
 	acma_destroy (&oldmatches);
 	p->matches = newmatches;
 
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("AC: %f elapsed refining\n", g_timer_elapsed (timer, NULL)));
-	g_timer_destroy (timer);
-#endif
-	DEBUG_MSG (("AC: %d matches\n", p->matches.num_matches));
+	STOP_PROFILER ("Refine matches")
 }
 
 static void
@@ -466,16 +441,9 @@ ephy_autocompletion_update_matches_full (EphyAutocompletion *ac)
 {
 	EphyAutocompletionPrivate *p = ac->priv;
 	GSList *li;
-#ifdef DEBUG_TIME
-	GTimer *timer = g_timer_new ();
-#endif
 
-	DEBUG_MSG (("AC: fully updating\n"));
-	ephy_autocompletion_reset (ac);
+	START_PROFILER ("Update full")
 
-#ifdef DEBUG_TIME
-	g_timer_start (timer);
-#endif
 	for (li = p->sources; li; li = li->next)
 	{
 		EphyAutocompletionSource *s = EPHY_AUTOCOMPLETION_SOURCE (li->data);
@@ -485,15 +453,13 @@ ephy_autocompletion_update_matches_full (EphyAutocompletion *ac)
 						    ephy_autocompletion_update_matches_full_item,
 						    p);
 	}
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("AC: %f elapsed fully updating\n", g_timer_elapsed (timer, NULL)));
-	g_timer_destroy (timer);
-#endif
+
+	STOP_PROFILER ("Update full")
 
 	p->sorted = FALSE;
 	p->changed = TRUE;
 
-	DEBUG_MSG (("AC: %d matches, fully updated\n", p->matches.num_matches));
+	LOG ("AC: %d matches, fully updated", p->matches.num_matches);
 }
 
 static gint
@@ -521,9 +487,7 @@ static gboolean
 ephy_autocompletion_sort_by_score (EphyAutocompletion *ac)
 {
 	EphyAutocompletionPrivate *p = ac->priv;
-#ifdef DEBUG_TIME
-	GTimer *timer;
-#endif
+
 	gint (*comparer) (EphyAutocompletionMatch *m1, EphyAutocompletionMatch *m2);
 
 	if (p->sort_alpha)
@@ -538,11 +502,8 @@ ephy_autocompletion_sort_by_score (EphyAutocompletion *ac)
 	ephy_autocompletion_update_matches (ac);
 	if (p->changed == FALSE) return FALSE;
 
-	DEBUG_MSG (("AC: sorting\n"));
-#ifdef DEBUG_TIME
-	timer = g_timer_new ();
-	g_timer_start (timer);
-#endif
+	START_PROFILER ("Sorting")
+
 	if (p->matches.num_matches > 0)
 	{
 		qsort (p->matches.array, p->matches.num_matches,
@@ -552,10 +513,8 @@ ephy_autocompletion_sort_by_score (EphyAutocompletion *ac)
 
 	p->sorted = TRUE;
 
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("AC: %f elapsed sorting by score\n", g_timer_elapsed (timer, NULL)));
-	g_timer_destroy (timer);
-#endif
+	STOP_PROFILER ("Sorting")
+
 	return TRUE;
 }
 
@@ -563,7 +522,7 @@ static void
 ephy_autocompletion_data_changed_cb (EphyAutocompletionSource *s,
 				     EphyAutocompletion *ac)
 {
-	DEBUG_MSG (("AC: data changed, reseting\n"));
+	LOG ("Data changed, resetting");
 	ephy_autocompletion_reset (ac);
 
 	g_signal_emit (ac, EphyAutocompletionSignals[EPHY_AUTOCOMPLETION_SOURCES_CHANGED], 0);
@@ -663,5 +622,3 @@ acma_grow (ACMatchArray *a)
 	a->array_size = new_size;
 	a->array = new_array;
 }
-
-
diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index a97c081d2..4f9f74cdd 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -20,28 +20,170 @@
 
 #include <string.h>
 
+#ifndef DISABLE_PROFILING
 
-static const char *ephy_debug_modules;
+static GHashTable *ephy_profilers_hash = NULL;
+static const char *ephy_profile_modules = NULL;
+
+#endif
+
+#ifndef DISABLE_LOGGING
+
+static const char *ephy_log_modules;
 
 static void
-log_func (const gchar *log_domain,
-	  GLogLevelFlags log_level,
-	  const gchar *message,
-	  gpointer user_data)
+log_module (const gchar *log_domain,
+	    GLogLevelFlags log_level,
+	    const gchar *message,
+	    gpointer user_data)
 {
-	if (!ephy_debug_modules) return;
+	gboolean should_log = FALSE;
+
+	if (!ephy_log_modules) return;
 
-	if ((strcmp (ephy_debug_modules, "all") == 0) ||
-	    strstr (message, ephy_debug_modules) != NULL)
+	if (strcmp (ephy_log_modules, "all") != 0)
+	{
+		char **modules;
+		int i;
+
+		modules = g_strsplit (ephy_log_modules, ":", 100);
+
+		for (i = 0; modules[i] != NULL; i++)
+		{
+			if (strstr (message, modules [i]) != NULL)
+			{
+				should_log = TRUE;
+				break;
+			}
+		}
+
+		g_strfreev (modules);
+	}
+	else
+	{
+		should_log = TRUE;
+	}
+
+	if (should_log)
 	{
 		g_print ("%s\n", message);
 	}
 }
 
+#endif
+
 void
 ephy_debug_init (void)
 {
-	ephy_debug_modules = g_getenv ("EPHY_DEBUG_MODULES");
+#ifndef DISABLE_LOGGING
+	ephy_log_modules = g_getenv ("EPHY_LOG_MODULES");
+
+	g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, log_module, NULL);
+#endif
+#ifndef DISABLE_PROFILING
+	ephy_profile_modules = g_getenv ("EPHY_PROFILE_MODULES");
+#endif
+}
+
+#ifndef DISABLE_PROFILING
+
+static EphyProfiler *
+ephy_profiler_new (const char *name, const char *module)
+{
+	EphyProfiler *profiler;
+
+	profiler = g_new0 (EphyProfiler, 1);
+	profiler->timer = g_timer_new ();
+	profiler->name  = g_strdup (name);
+	profiler->module  = g_strdup (module);
+
+	g_timer_start (profiler->timer);
+
+	return profiler;
+}
+
+static gboolean
+ephy_should_profile (const char *module)
+{
+	char **modules;
+	int i;
+	gboolean res = FALSE;
+
+	if (!ephy_profile_modules) return FALSE;
+	if (strcmp (ephy_profile_modules, "all") == 0) return TRUE;
+
+	modules = g_strsplit (ephy_profile_modules, ":", 100);
+
+	for (i = 0; modules[i] != NULL; i++)
+	{
+		if (strcmp (module, modules [i]) == 0)
+		{
+			res = TRUE;
+			break;
+		}
+	}
+
+	g_strfreev (modules);
 
-	g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, log_func, NULL);
+	return res;
 }
+
+static void
+ephy_profiler_dump (EphyProfiler *profiler)
+{
+	long elapsed;
+	double seconds;
+
+	g_return_if_fail (profiler != NULL);
+
+	seconds = g_timer_elapsed (profiler->timer, &elapsed);
+
+	g_print ("[ %s ] %s %ld ms (%f s) elapsed\n",
+		 profiler->module, profiler->name,
+		 elapsed / (G_USEC_PER_SEC / 1000), seconds);
+}
+
+static void
+ephy_profiler_free (EphyProfiler *profiler)
+{
+	g_return_if_fail (profiler != NULL);
+
+	g_timer_destroy (profiler->timer);
+	g_free (profiler->name);
+	g_free (profiler->module);
+	g_free (profiler);
+}
+
+void
+ephy_profiler_start (const char *name, const char *module)
+{
+	EphyProfiler *profiler;
+
+	if (ephy_profilers_hash == NULL)
+	{
+		ephy_profilers_hash =
+			g_hash_table_new_full (g_str_hash, g_str_equal,
+					       g_free, NULL);
+	}
+
+	if (!ephy_should_profile (module)) return;
+
+	profiler = ephy_profiler_new (name, module);
+
+	g_hash_table_insert (ephy_profilers_hash, g_strdup (name), profiler);
+}
+
+void
+ephy_profiler_stop (const char *name)
+{
+	EphyProfiler *profiler;
+
+	profiler = g_hash_table_lookup (ephy_profilers_hash, name);
+	if (profiler == NULL) return;
+	g_hash_table_remove (ephy_profilers_hash, name);
+
+	ephy_profiler_dump (profiler);
+	ephy_profiler_free (profiler);
+}
+
+#endif
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 4939bffef..934f2b658 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -19,21 +19,55 @@
 #ifndef EPHY_DEBUG_H
 #define EPHY_DEBUG_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib.h>
 
 G_BEGIN_DECLS
 
+#ifndef GNOME_ENABLE_DEBUG
+#define DISABLE_LOGGING
+#define DISABLE_PROFILING
+#endif
+
 #ifdef DISABLE_LOGGING
-#define LOG()
+#define LOG(msg, ...)
 #else
-#define LOG(msg, args...)					\
+#define LOG(msg, ...)						\
 g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,				\
        "[ %s ] " msg,						\
-       __FILE__,						\
-       args);
+       __FILE__, ##__VA_ARGS__);
+#endif
+
+#ifdef DISABLE_PROFILING
+#define START_PROFILER(name)
+#define STOP_PROFILER(name)
+#else
+#define START_PROFILER(name)	\
+ephy_profiler_start (name, __FILE__);
+#define STOP_PROFILER(name)	\
+ephy_profiler_stop (name);
 #endif
 
-void	ephy_debug_init	(void);
+typedef struct
+{
+	GTimer *timer;
+	char *name;
+	char *module;
+} EphyProfiler;
+
+void		ephy_debug_init		(void);
+
+#ifndef DISABLE_PROFILING
+
+void		ephy_profiler_start	(const char *name,
+					 const char *module);
+
+void		ephy_profiler_stop	(const char *name);
+
+#endif
 
 G_END_DECLS
 
diff --git a/lib/ephy-filesystem-autocompletion.c b/lib/ephy-filesystem-autocompletion.c
index 8b1cb84fb..b1f340a4c 100644
--- a/lib/ephy-filesystem-autocompletion.c
+++ b/lib/ephy-filesystem-autocompletion.c
@@ -23,15 +23,11 @@
 #include "ephy-autocompletion-source.h"
 #include "ephy-filesystem-autocompletion.h"
 #include "ephy-gobject-misc.h"
-#include <string.h>
+#include "ephy-debug.h"
 
+#include <string.h>
 #include  <libgnomevfs/gnome-vfs-async-ops.h>
 
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
 /**
  * Private data
  */
@@ -104,7 +100,7 @@ ephy_filesystem_autocompletion_finalize_impl (GObject *o)
 	EphyFilesystemAutocompletion *as = GUL_FILESYSTEM_AUTOCOMPLETION (o);
 	EphyFilesystemAutocompletionPrivate *p = as->priv;
 
-	DEBUG_MSG (("in ephy_filesystem_autocompletion_finalize_impl\n"));
+	LOG ("Finalize")
 
 	g_free (p->basic_key);
 	g_free (p->basic_key_dir);
@@ -193,7 +189,7 @@ gfa_load_directory_cb (GnomeVFSAsyncHandle *handle,
 
 	g_return_if_fail (p->load_handle == handle);
 
-	DEBUG_MSG (("gfa_load_directory_cb, entries_read == %d\n", entries_read));
+	LOG ("entries_read == %d", entries_read)
 
 	if (entries_read <= 0)
 	{
@@ -221,7 +217,7 @@ gfa_load_directory_cb (GnomeVFSAsyncHandle *handle,
 			gchar *f = g_strconcat (cd, i->name, NULL);
 			p->files = g_slist_prepend (p->files, f);
 			
-			DEBUG_MSG (("+ %s\n", f));
+			LOG ("+ %s", f)
 		}
 	}
 
@@ -262,14 +258,14 @@ ephy_filesystem_autocompletion_set_current_dir (EphyFilesystemAutocompletion *fa
 	
 	if (!cd_uri)
 	{
-		DEBUG_MSG (("Can't load dir %s\n", d));
+		LOG ("Can't load dir %s", d)
 		return;
 	}
 
 	g_free (p->current_dir);
 	p->current_dir = gnome_vfs_uri_to_string (cd_uri, GNOME_VFS_URI_HIDE_NONE);
 
-	DEBUG_MSG (("Loading dir: %s\n", p->current_dir));
+	LOG ("Loading dir: %s", p->current_dir)
 
 	gnome_vfs_async_load_directory_uri (&p->load_handle,
 					    cd_uri,
@@ -336,7 +332,7 @@ ephy_filesystem_autocompletion_set_base_dir (EphyFilesystemAutocompletion *fa, c
 	if (p->base_dir_uri)
 	{
 		gchar *t = gnome_vfs_uri_to_string (p->base_dir_uri, GNOME_VFS_URI_HIDE_NONE);
-		DEBUG_MSG (("base_dir: %s\n", t));
+		LOG ("base_dir: %s", t)
 		g_free (t);
 	}
 }
diff --git a/lib/ephy-start-here.c b/lib/ephy-start-here.c
index 7363baeb2..030b5d5f6 100644
--- a/lib/ephy-start-here.c
+++ b/lib/ephy-start-here.c
@@ -23,9 +23,6 @@
 #include "ephy-start-here.h"
 #include "ephy-file-helpers.h"
 
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
 struct EphyStartHerePrivate
 {
 	const GList *langs;
diff --git a/lib/widgets/ephy-autocompletion-window.c b/lib/widgets/ephy-autocompletion-window.c
index a070c282a..a974a6570 100644
--- a/lib/widgets/ephy-autocompletion-window.c
+++ b/lib/widgets/ephy-autocompletion-window.c
@@ -33,6 +33,7 @@
 #include "ephy-string.h"
 #include "ephy-marshal.h"
 #include "ephy-gui.h"
+#include "ephy-debug.h"
 
 /* This is copied from gtkscrollbarwindow.c */
 #define DEFAULT_SCROLLBAR_SPACING  3
@@ -44,15 +45,6 @@
 #define MAX_VISIBLE_ROWS 9
 #define MAX_COMPLETION_ALTERNATIVES 7
 
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
-//#define DEBUG_TIME
-
-#ifdef DEBUG_TIME
-#include <glib/gtimer.h>
-#endif
-
 /**
  * Private data
  */
@@ -378,10 +370,9 @@ ephy_autocompletion_window_get_dimensions (EphyAutocompletionWindow *aw,
                           popup->vscrollbar->requisition.height);
 
 	row_height = list_requisition.height / MAX (aw->priv->view_nitems, 1);
-	DEBUG_MSG (("Real list requisition %d, Items %d\n", list_requisition.height, aw->priv->view_nitems));
+	LOG ("Real list requisition %d, Items %d", list_requisition.height, aw->priv->view_nitems)
 	list_requisition.height = MIN (row_height * MAX_VISIBLE_ROWS, list_requisition.height);
-	DEBUG_MSG (("Row Height %d, Fake list requisition %d\n",
-		   row_height, list_requisition.height));
+	LOG ("Row Height %d, Fake list requisition %d", row_height, list_requisition.height)
 
 	do
 	{
@@ -439,15 +430,8 @@ ephy_autocompletion_window_fill_store_chunk (EphyAutocompletionWindow *aw)
 	guint nmatches;
 	guint last;
 	guint completion_nitems = 0, action_nitems = 0, substring_nitems = 0;
-#ifdef DEBUG_TIME
-	GTimer *timer;
-#endif
-	DEBUG_MSG (("ACW: Filling the list from %d\n", last));
 
-#ifdef DEBUG_TIME
-	timer = g_timer_new ();
-	g_timer_start (timer);
-#endif
+	START_PROFILER ("Fill store")
 
 	nmatches = ephy_autocompletion_get_num_matches (p->autocompletion);
 	matches = ephy_autocompletion_get_matches_sorted_by_score (p->autocompletion,
@@ -510,10 +494,7 @@ ephy_autocompletion_window_fill_store_chunk (EphyAutocompletionWindow *aw)
 
 	p->last_added_match = last;
 
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("ACW: %f elapsed filling the gtkliststore\n", g_timer_elapsed (timer, NULL)));
-	g_timer_destroy (timer);
-#endif
+	STOP_PROFILER ("Fill store")
 }
 
 void
@@ -522,10 +503,6 @@ ephy_autocompletion_window_show (EphyAutocompletionWindow *aw)
 	EphyAutocompletionWindowPrivate *p = aw->priv;
 	gint x, y, height, width;
 	guint nmatches;
-#ifdef DEBUG_TIME
-	GTimer *timer1;
-	GTimer *timer2;
-#endif
 
 	g_return_if_fail (p->window);
 	g_return_if_fail (p->autocompletion);
@@ -537,16 +514,7 @@ ephy_autocompletion_window_show (EphyAutocompletionWindow *aw)
 		return;
 	}
 
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("ACW: showing window.\n"));
-	timer1 = g_timer_new ();
-	g_timer_start (timer1);
-#endif
-
-#ifdef DEBUG_TIME
-	timer2 = g_timer_new ();
-	g_timer_start (timer2);
-#endif
+	START_PROFILER ("Showing window")
 
 	ephy_autocompletion_window_fill_store_chunk (aw);
 
@@ -561,24 +529,11 @@ ephy_autocompletion_window_show (EphyAutocompletionWindow *aw)
 		p->active_tree_view = p->tree_view;
 	}
 
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("ACW: %f elapsed creating liststore\n", g_timer_elapsed (timer2, NULL)));
-#endif
-
 	gtk_tree_view_set_model (p->tree_view, GTK_TREE_MODEL (p->list_store));
 	gtk_tree_view_set_model (p->action_tree_view, GTK_TREE_MODEL (p->action_list_store));
 
-#ifdef DEBUG_TIME
-	g_timer_start (timer2);
-#endif
-
 	ephy_autocompletion_window_get_dimensions (aw, &x, &y, &width, &height);
 
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("ACW: %f elapsed calculating dimensions\n", g_timer_elapsed (timer2, NULL)));
-	g_timer_destroy (timer2);
-#endif
-
 	gtk_widget_set_size_request (GTK_WIDGET (p->window), width,
 				     height);
 	gtk_window_move (GTK_WINDOW (p->window), x, y);
@@ -613,10 +568,8 @@ ephy_autocompletion_window_show (EphyAutocompletionWindow *aw)
 	gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (p->tree_view), 0, 0);
 
 	gtk_widget_grab_focus (GTK_WIDGET (p->tree_view));
-#ifdef DEBUG_TIME
-	DEBUG_MSG (("ACW: %f elapsed showing window\n", g_timer_elapsed (timer1, NULL)));
-	g_timer_destroy (timer1);
-#endif
+
+	STOP_PROFILER ("Showing window")
 }
 
 static gboolean
@@ -789,8 +742,6 @@ ephy_autocompletion_window_key_press_cb (GtkWidget *widget,
 
 	if (dest_widget != widget)
 	{
-		//DEBUG_MSG (("Resending event\n"));
-
 		tmp_event = *event;
 		gtk_widget_event (dest_widget, (GdkEvent *)&tmp_event);
 
@@ -798,11 +749,6 @@ ephy_autocompletion_window_key_press_cb (GtkWidget *widget,
 	}
 	else
 	{
-		if (widget == GTK_WIDGET (p->tree_view))
-		{
-			//DEBUG_MSG (("on the tree view "));
-		}
-		//DEBUG_MSG (("Ignoring event\n"));
 		return FALSE;
 	}
 
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index b0669f89f..d2702c6b4 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -22,6 +22,7 @@
 #include "ephy-gobject-misc.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-prefs.h"
+#include "ephy-debug.h"
 
 #include <gtk/gtkentry.h>
 #include <gtk/gtkwindow.h>
@@ -30,11 +31,6 @@
 #include <libgnomeui/gnome-entry.h>
 #include <string.h>
 
-//#define DEBUG_MSG(x) g_print x
-#define DEBUG_MSG(x)
-
-#define NOT_IMPLEMENTED g_warning ("not implemented: " G_STRLOC);
-
 /**
  * Private data
  */
@@ -156,7 +152,7 @@ ephy_location_entry_finalize_impl (GObject *o)
 		g_object_unref (G_OBJECT (p->autocompletion_window));
 	}
 
-	DEBUG_MSG (("EphyLocationEntry finalized\n"));
+	LOG ("EphyLocationEntry finalized")
 
 	g_free (p);
 	G_OBJECT_CLASS (gtk_hbox_class)->finalize (o);
@@ -238,7 +234,7 @@ ephy_location_entry_autocompletion_show_alternatives_to (EphyLocationEntry *w)
 
 	if (p->autocompletion)
 	{
-		DEBUG_MSG (("+ephy_location_entry_autocompletion_show_alternatives_to\n"));
+		LOG ("Show alternatives")
 		ephy_location_entry_set_autocompletion_key (w);
 		ephy_location_entry_autocompletion_show_alternatives (w);
 	}
@@ -285,7 +281,7 @@ ephy_location_entry_autocompletion_to (EphyLocationEntry *w)
 	gchar *text;
 	gchar *common_prefix;
 
-	DEBUG_MSG (("in ephy_location_entry_autocompletion_to\n"));
+	LOG ("Autocompletion to")
 
 	ephy_location_entry_set_autocompletion_key (w);
 
@@ -301,8 +297,8 @@ ephy_location_entry_autocompletion_to (EphyLocationEntry *w)
 		    || send != text_len)
 		{
 			/* the user is editing the entry, don't mess it */
-			DEBUG_MSG (("The user seems editing the text: pos = %d, strlen (text) = %d, sstart = %d, send = %d\n",
-				    pos, strlen (text), sstart, send));
+			LOG ("The user seems editing the text: pos = %d, strlen (text) = %d, sstart = %d, send = %d",
+			     pos, strlen (text), sstart, send)
 			p->autocompletion_timeout = 0;
 			return FALSE;
 		}
@@ -310,7 +306,7 @@ ephy_location_entry_autocompletion_to (EphyLocationEntry *w)
 
 	common_prefix = ephy_autocompletion_get_common_prefix (p->autocompletion);
 
-	DEBUG_MSG (("common_prefix: %s\n", common_prefix));
+	LOG ("common_prefix: %s", common_prefix)
 
 	if (common_prefix && (!p->before_completion || p->before_completion[0] == '\0'))
 	{
@@ -503,7 +499,7 @@ ephy_location_entry_activate_cb (GtkEntry *entry, EphyLocationEntry *w)
 
 	ephy_location_entry_autocompletion_hide_alternatives (w);
 
-	DEBUG_MSG (("In ephy_location_entry_activate_cb, activating %s\n", content));
+	LOG ("In ephy_location_entry_activate_cb, activating %s", content)
 
 	g_signal_emit (w, EphyLocationEntrySignals[ACTIVATED], 0, target, content);
 	g_free (content);
@@ -515,7 +511,7 @@ ephy_location_entry_autocompletion_sources_changed_cb (EphyAutocompletion *aw,
 {
 	EphyLocationEntryPrivate *p = w->priv;
 
-	DEBUG_MSG (("in ephy_location_entry_autocompletion_sources_changed_cb\n"));
+	LOG ("in ephy_location_entry_autocompletion_sources_changed_cb")
 
         if (p->autocompletion_timeout == 0
 	    && p->last_completion
@@ -613,7 +609,7 @@ ephy_location_entry_autocompletion_window_url_activated_cb (EphyAutocompletionWi
 
 	content = gtk_editable_get_chars (GTK_EDITABLE(w->priv->entry), 0, -1);
 
-	DEBUG_MSG (("In location_entry_autocompletion_window_url_activated_cb, going to %s\n", content));
+	LOG ("In location_entry_autocompletion_window_url_activated_cb, going to %s", content);
 
 	ephy_location_entry_autocompletion_hide_alternatives (w);
 
@@ -625,11 +621,11 @@ ephy_location_entry_autocompletion_window_url_activated_cb (EphyAutocompletionWi
 
 static void
 ephy_location_entry_autocompletion_window_hidden_cb (EphyAutocompletionWindow *aw,
-						       EphyLocationEntry *w)
+						     EphyLocationEntry *w)
 {
 	EphyLocationEntryPrivate *p = w->priv;
 
-	DEBUG_MSG (("In location_entry_autocompletion_window_hidden_cb\n"));
+	LOG ("In location_entry_autocompletion_window_hidden_cb");
 
 	p->autocompletion_window_visible = FALSE;