4 files changed, 16 insertions, 26 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));
 }