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

1 files changed, 9 insertions, 10 deletions

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++)
 		{