From 54df3f0ea343005402ab02ab90b137783d0bdd72 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 12 Jan 2003 13:18:44 +0000 Subject: 2003-01-12 Marco Pesenti Gritti * 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): --- embed/ephy-embed-utils.c | 21 ++++++--------------- embed/ephy-favicon-cache.c | 6 ++++-- embed/ephy-history.c | 6 ++---- embed/mozilla/mozilla-embed.cpp | 7 +++---- 4 files changed, 15 insertions(+), 25 deletions(-) (limited to 'embed') diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c index 69089daa4..373f4801f 100644 --- a/embed/ephy-embed-utils.c +++ b/embed/ephy-embed-utils.c @@ -21,6 +21,7 @@ #include "ephy-embed-shell.h" #include "ephy-bonobo-extensions.h" #include "ephy-gui.h" +#include "ephy-debug.h" #include #include @@ -222,9 +223,9 @@ add_verbs (BonoboUIComponent *ui_component, **/ void ephy_embed_utils_build_charsets_submenu (BonoboUIComponent *ui_component, - const char *path, - BonoboUIVerbFn fn, - gpointer data) + const char *path, + BonoboUIVerbFn fn, + gpointer data) { GList *groups; GString *xml_string; @@ -232,13 +233,7 @@ ephy_embed_utils_build_charsets_submenu (BonoboUIComponent *ui_component, int group_index = 0; int charset_index = 0; -#ifdef DEBUG_MARCO - GTimer *timer; - gulong s; - - timer = g_timer_new (); - g_timer_start(timer); -#endif + START_PROFILER ("Charsets menu") g_return_if_fail (IS_EPHY_EMBED_SHELL (embed_shell)); g_return_if_fail (ephy_embed_shell_get_charset_groups (embed_shell, &groups) == G_OK); @@ -287,11 +282,7 @@ ephy_embed_utils_build_charsets_submenu (BonoboUIComponent *ui_component, g_list_free (groups); g_string_free (xml_string, TRUE); -#ifdef DEBUG_MARCO - g_timer_stop (timer); - g_timer_elapsed (timer, &s); - g_print ("Time to build charset menu: %f\n", (double)(s)/1000000); -#endif + STOP_PROFILER ("Charsets menu") } /** diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c index e833cf2c7..7d76e50fe 100644 --- a/embed/ephy-favicon-cache.c +++ b/embed/ephy-favicon-cache.c @@ -279,8 +279,10 @@ ephy_favicon_cache_init (EphyFaviconCache *cache) g_str_equal); cache->priv->icons_hash_lock = g_new0 (GStaticRWLock, 1); g_static_rw_lock_init (cache->priv->icons_hash_lock); - cache->priv->downloads_hash = g_hash_table_new (g_str_hash, - g_str_equal); + cache->priv->downloads_hash = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + NULL); /* Icons */ cache->priv->icons = ephy_node_new_with_id (ICONS_NODE_ID); diff --git a/embed/ephy-history.c b/embed/ephy-history.c index 898f7034c..3df30b109 100644 --- a/embed/ephy-history.c +++ b/embed/ephy-history.c @@ -20,15 +20,13 @@ #include "ephy-history.h" #include "ephy-file-helpers.h" #include "ephy-autocompletion-source.h" +#include "ephy-debug.h" #include #include #include #include -//#define DEBUG_MSG(x) g_print x -#define DEBUG_MSG(x) - #define EPHY_HISTORY_XML_VERSION "0.1" /* how often to save the history, in milliseconds */ @@ -272,7 +270,7 @@ ephy_history_save (EphyHistory *eb) GPtrArray *children; int i; - DEBUG_MSG (("Saving history\n")); + LOG ("Saving history\n") /* save nodes to xml */ xmlIndentTreeOutput = TRUE; diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 05408973f..49c1dbad0 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -20,12 +20,13 @@ #include "gtkmozembed_internal.h" #include "ephy-string.h" #include "ephy-embed.h" +#include "ephy-debug.h" #include "mozilla-embed.h" #include "MozillaPrivate.h" #include "EphyWrapper.h" #include "EventContext.h" -#include "nsIWindowWatcher.h" +#include #include #include #include @@ -418,9 +419,7 @@ mozilla_embed_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); -#ifdef DEBUG_MARCO - g_print ("MozillaEmbed finalized %p\n", embed); -#endif + LOG ("MozillaEmbed finalized %p\n", embed) } gpointer -- cgit v1.2.3