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, 13 insertions, 16 deletions

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)
 }
 
 /*