From dcccb22acc252879837bb08a7f6eaaea91005860 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 12 Jan 2003 01:24:41 +0000 Subject: Move root nodes ids to ephy-types. Simple logging facility: 2003-01-12 Marco Pesenti Gritti * configure.in: * embed/ephy-favicon-cache.c: (ephy_favicon_cache_download): * embed/ephy-history.c: * lib/Makefile.am: * lib/ephy-types.h: * src/bookmarks/ephy-bookmarks.c: * src/ephy-shell.c: (ephy_shell_init): Move root nodes ids to ephy-types. Simple logging facility: EPHY_DEBUG_MODULES= all | filename will enable it. Need to provide a way to disable it and to get rid of the old per file crap. --- ChangeLog | 17 +++++++++++++++++ configure.in | 2 +- embed/ephy-favicon-cache.c | 8 +++----- embed/ephy-history.c | 7 +------ lib/Makefile.am | 3 ++- lib/ephy-types.h | 11 +++++++++++ src/bookmarks/ephy-bookmarks.c | 6 ------ src/ephy-shell.c | 2 ++ 8 files changed, 37 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c0413ed9..f85f31849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2003-01-12 Marco Pesenti Gritti + + * configure.in: + * embed/ephy-favicon-cache.c: (ephy_favicon_cache_download): + * embed/ephy-history.c: + * lib/Makefile.am: + * lib/ephy-types.h: + * src/bookmarks/ephy-bookmarks.c: + * src/ephy-shell.c: (ephy_shell_init): + + Move root nodes ids to ephy-types. + Simple logging facility: + EPHY_DEBUG_MODULES= all | filename + will enable it. + Need to provide a way to disable it and to get rid + of the old per file crap. + 2003-01-11 Marco Pesenti Gritti * embed/Makefile.am: diff --git a/configure.in b/configure.in index 553b71633..473c4c327 100644 --- a/configure.in +++ b/configure.in @@ -30,7 +30,7 @@ AC_SUBST(LIBBONOBOUI_REQUIRED) AC_ENABLE_SHARED(yes) AC_ENABLE_STATIC(no) -AM_INIT_AUTOMAKE(epiphany, 0.4.1) +AM_INIT_AUTOMAKE(epiphany, 0.4.2) AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c index 029470d26..e833cf2c7 100644 --- a/embed/ephy-favicon-cache.c +++ b/embed/ephy-favicon-cache.c @@ -26,6 +26,7 @@ #include "ephy-file-helpers.h" #include "ephy-favicon-cache.h" #include "ephy-node.h" +#include "ephy-debug.h" #define EPHY_FAVICON_CACHE_XML_VERSION "0.1" @@ -51,11 +52,6 @@ enum LAST_SIGNAL }; -enum -{ - ICONS_NODE_ID = 9, -}; - static guint ephy_favicon_cache_signals[LAST_SIGNAL] = { 0 }; static GObjectClass *parent_class = NULL; @@ -395,6 +391,8 @@ ephy_favicon_cache_download (EphyFaviconCache *cache, EphyEmbedPersist *persist; const char *dest; + LOG ("Download favicon: %s", favicon_url) + g_return_if_fail (EPHY_IS_FAVICON_CACHE (cache)); g_return_if_fail (favicon_url != NULL); g_return_if_fail (filename != NULL); diff --git a/embed/ephy-history.c b/embed/ephy-history.c index db6f885d2..898f7034c 100644 --- a/embed/ephy-history.c +++ b/embed/ephy-history.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "ephy-types.h" #include "ephy-history.h" #include "ephy-file-helpers.h" #include "ephy-autocompletion-source.h" @@ -57,12 +58,6 @@ enum LAST_SIGNAL }; -enum -{ - HOSTS_NODE_ID = 5, - PAGES_NODE_ID = 6 -}; - static void ephy_history_class_init (EphyHistoryClass *klass); static void diff --git a/lib/Makefile.am b/lib/Makefile.am index 7648fe31c..d131235bb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -21,6 +21,8 @@ libephy_la_SOURCES = \ ephy-autocompletion-source.h \ ephy-bonobo-extensions.h \ ephy-bonobo-extensions.c \ + ephy-debug.c \ + ephy-debug.h \ ephy-dialog.c \ ephy-dialog.h \ ephy-dnd.c \ @@ -53,7 +55,6 @@ libephy_la_SOURCES = \ ephy-stock-icons.h \ ephy-thread-helpers.c \ ephy-thread-helpers.h \ - ephy-types.h \ ephy-types.h libephy_la_LIBADD = \ diff --git a/lib/ephy-types.h b/lib/ephy-types.h index 70ce681e0..da27ceaaf 100644 --- a/lib/ephy-types.h +++ b/lib/ephy-types.h @@ -30,6 +30,17 @@ typedef enum G_NOT_IMPLEMENTED } gresult; +/* Ids of the root nodes of history, + * bookmarks and favicon cache */ +enum +{ + BOOKMARKS_NODE_ID = 0, + KEYWORDS_NODE_ID = 1, + HOSTS_NODE_ID = 5, + PAGES_NODE_ID = 6, + ICONS_NODE_ID = 9, +}; + G_END_DECLS #endif diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 1dea94539..bf77ed3f7 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -47,12 +47,6 @@ struct EphyBookmarksPrivate GStaticRWLock *keywords_hash_lock; }; -enum -{ - BOOKMARKS_NODE_ID = 0, - KEYWORDS_NODE_ID = 1 -}; - static void ephy_bookmarks_class_init (EphyBookmarksClass *klass); static void diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 2f2c207e6..e10af0ee2 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -27,6 +27,7 @@ #include "ephy-file-helpers.h" #include "ephy-thread-helpers.h" #include "ephy-bookmarks-import.h" +#include "ephy-debug.h" #include #include @@ -192,6 +193,7 @@ ephy_shell_init (EphyShell *gs) g_object_add_weak_pointer (G_OBJECT(ephy_shell), (gpointer *)&ephy_shell); + ephy_debug_init (); ephy_thread_helpers_init (); ephy_node_system_init (); ephy_file_helpers_init (); -- cgit v1.2.3