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

2 files changed, 20 insertions, 78 deletions

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;