diff options
61 files changed, 392 insertions, 243 deletions
@@ -1,3 +1,138 @@ +2005-01-28 Christian Persch <chpe@cvs.gnome.org> + + * doc/reference/tmpl/ephy-embed.sgml: + * embed/ephy-embed-persist.c: (ephy_embed_persist_init), + (ephy_embed_persist_finalize): + * embed/ephy-embed-shell.c: (ephy_embed_shell_finalize): + * embed/ephy-encodings.c: (ephy_encodings_finalize), + (ephy_encodings_init): + * embed/ephy-favicon-cache.c: (ephy_favicon_cache_finalize), + (favicon_download_completed_cb), (favicon_download_cancelled_cb), + (ephy_favicon_cache_download), (ephy_favicon_cache_get): + * embed/ephy-history.c: (ephy_history_set_enabled), + (ephy_history_save), (ephy_history_finalize), + (ephy_history_host_visited), (ephy_history_set_page_title), + (ephy_history_set_icon), (ephy_history_clear): + * embed/mozilla/ContentHandler.cpp: + * embed/mozilla/EphyBrowser.cpp: + * embed/mozilla/EphyContentPolicy.cpp: + * embed/mozilla/EphyHeaderSniffer.cpp: + * embed/mozilla/EphyHistoryListener.cpp: + * embed/mozilla/EphySidebar.cpp: + * embed/mozilla/EphySingle.cpp: + * embed/mozilla/FilePicker.cpp: + * embed/mozilla/GtkNSSClientAuthDialogs.cpp: + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + * embed/mozilla/MozDownload.cpp: + * embed/mozilla/PrintingPromptService.cpp: + * embed/mozilla/mozilla-download.cpp: + * embed/mozilla/mozilla-embed-event.cpp: + * lib/ephy-dbus.c: (session_filter_func), (system_filter_func), + (ephy_dbus_connect_to_system_bus), + (ephy_dbus_connect_to_session_bus), (path_message_func), + (ephy_dbus_startup), (ephy_dbus_shutdown), (ephy_dbus_init), + (ephy_dbus_finalize): + * lib/ephy-debug.h: + * lib/ephy-file-chooser.c: (ephy_file_chooser_finalize): + * lib/ephy-file-helpers.c: (ephy_file_helpers_shutdown): + * lib/ephy-langs.c: (load_iso_entries): + * lib/ephy-module.c: (ephy_module_load), (ephy_module_unload), + (ephy_module_new_object), (ephy_module_init), + (ephy_module_finalize): + * lib/ephy-node-db.c: (ephy_node_db_load_from_file), + (ephy_node_db_write_to_xml_valist): + * lib/ephy-shlib-loader.c: (ephy_shlib_loader_init), + (ephy_shlib_loader_finalize): + * lib/widgets/ephy-location-entry.c: (entry_style_set_cb), + (entry_realize_cb), (ephy_location_entry_construct_contents), + (ephy_location_entry_init): + * lib/widgets/ephy-spinner.c: (ephy_spinner_cache_load), + (ephy_spinner_cache_get_images), (ephy_spinner_cache_init), + (ephy_spinner_cache_finalize): + * lib/widgets/ephy-tree-model-node.c: + (ephy_tree_model_node_update_node): + * lib/widgets/ephy-tree-model-sort.c: + (each_property_get_data_binder): + * src/bookmarks/ephy-bookmark-action.c: (create_tool_item), + (connect_proxy), (ephy_bookmark_action_finalize): + * src/bookmarks/ephy-bookmark-properties.c: + (ephy_bookmark_properties_set_bookmark), (set_window_icon): + * src/bookmarks/ephy-bookmarks-editor.c: + (ephy_bookmarks_editor_update_menu), (provide_favicon): + * src/bookmarks/ephy-bookmarks-export.c: + (ephy_bookmarks_export_rdf), (ephy_bookmarks_export_mozilla): + * src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import): + * src/bookmarks/ephy-bookmarks-menu.c: + (ephy_bookmarks_menu_rebuild), (do_update_cb), + (bookmarks_tree_changed_cb), (topics_added_cb), + (topics_removed_cb), (topic_child_changed_cb), (bookmark_added_cb), + (bookmark_removed_cb), (activate_cb), + (ephy_bookmarks_menu_finalize): + * src/bookmarks/ephy-bookmarks.c: + (ephy_bookmarks_get_toolbars_model), (ephy_bookmarks_save), + (ephy_bookmarks_finalize), (ephy_bookmarks_find_keyword), + (ephy_bookmarks_set_keyword), (ephy_bookmarks_unset_keyword): + * src/bookmarks/ephy-bookmarksbar-model.c: (save_changes_idle), + (load_toolbars), (ephy_bookmarksbar_model_init), + (ephy_bookmarksbar_model_dispose), + (ephy_bookmarksbar_model_finalize): + * src/bookmarks/ephy-bookmarksbar.c: + (ephy_bookmarksbar_action_request), (ephy_bookmarksbar_finalize): + * src/bookmarks/ephy-favorites-menu.c: + (ephy_favorites_menu_rebuild): + * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_set_title): + * src/bookmarks/ephy-topic-action.c: (connect_proxy): + * src/bookmarks/ephy-topics-selector.c: + (ephy_topics_selector_set_bookmark): + * src/ephy-encoding-menu.c: (add_action): + * src/ephy-extensions-manager.c: (ephy_extensions_manager_load), + (ephy_extensions_manager_unload), + (ephy_extensions_manager_load_string), (get_loader_for_type), + (load_extension), (unload_extension), (sync_loaded_extensions), + (ephy_extensions_manager_load_dir), (ephy_extensions_manager_init), + (ephy_extensions_manager_startup), + (ephy_extensions_manager_finalize), (impl_attach_window), + (impl_detach_window), (impl_attach_tab), (impl_detach_tab): + * src/ephy-history-window.c: (setup_filters), (provide_favicon): + * src/ephy-link.c: (ephy_link_open): + * src/ephy-location-action.c: (user_changed_cb), (sync_address), + (ephy_location_action_set_address): + * src/ephy-navigation-action.c: (menu_activated_cb), + (connect_proxy): + * src/ephy-notebook.c: (ephy_notebook_finalize): + * src/ephy-session.c: (window_focus_in_event_cb), + (impl_attach_window), (impl_detach_window), (ephy_session_init), + (ephy_session_dispose), (ephy_session_finalize), + (ephy_session_autoresume), (ephy_session_close), + (ephy_session_save), (ephy_session_load), + (ephy_session_add_window), (ephy_session_remove_window): + * src/ephy-shell.c: (save_yourself_cb), (die_cb), + (ephy_shell_finalize), (ephy_shell_new_tab), + (ephy_shell_get_toolbars_model), (toolwindow_show_cb), + (toolwindow_hide_cb): + * src/ephy-tab.c: (popups_manager_add), + (popups_manager_add_window), (ephy_tab_get_popups_allowed), + (popups_manager_show_all), (popups_manager_hide_all), + (ephy_tab_finalize), (ephy_tab_address_cb), + (ephy_tab_zoom_changed_cb), (ephy_tab_new_window_cb), + (ephy_tab_visibility_cb), (ephy_tab_destroy_brsr_cb), + (ephy_tab_size_to_cb), (ephy_tab_dom_mouse_click_cb), + (ephy_tab_init): + * src/ephy-tabs-menu.c: (ephy_tabs_menu_update): + * src/ephy-toolbar.c: (sync_user_input_cb): + * src/ephy-toolbars-model.c: (save_changes_idle), + (ephy_toolbars_model_load): + * src/ephy-window.c: (ephy_window_destroy), (show_embed_popup), + (ephy_window_init), (ephy_window_finalize): + * src/pdm-dialog.c: (pdm_dialog_cookies_construct), + (cookie_added_cb), (cookie_changed_cb), (cookie_deleted_cb), + (cookies_cleared_cb), (pdm_dialog_passwords_construct), + (passwords_changed_cb): + * src/prefs-dialog.c: (fonts_language_changed_cb): + + Add ; to all LOG statements, and adapt ephy-debug.h for + non-GNUC-varargs case. + 2005-01-28 Piers Cornwell <piers@gnome.org> * data/epiphany-lockdown.schemas.in: diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index b6102338b..964dcfa00 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -203,6 +203,8 @@ be done by casting). @: @: @: +@: +@: @: <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### --> diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c index 45bcc209f..5b02a10cc 100644 --- a/embed/ephy-embed-persist.c +++ b/embed/ephy-embed-persist.c @@ -438,7 +438,7 @@ ephy_embed_persist_init (EphyEmbedPersist *persist) { persist->priv = EPHY_EMBED_PERSIST_GET_PRIVATE (persist); - LOG ("EphyEmbedPersist initialising %p", persist) + LOG ("EphyEmbedPersist initialising %p", persist); persist->priv->max_size = -1; } @@ -453,7 +453,7 @@ ephy_embed_persist_finalize (GObject *object) g_free (persist->priv->fc_title); g_free (persist->priv->persist_key); - LOG ("EphyEmbedPersist finalised %p", object) + LOG ("EphyEmbedPersist finalised %p", object); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 0dbb568af..8067bf0ea 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -83,13 +83,13 @@ ephy_embed_shell_finalize (GObject *object) { EphyEmbedShell *shell = EPHY_EMBED_SHELL (object); - LOG ("Unref history") + LOG ("Unref history"); if (shell->priv->global_history) { g_object_unref (shell->priv->global_history); } - LOG ("Unref downloader") + LOG ("Unref downloader"); if (shell->priv->downloader_view) { g_object_remove_weak_pointer @@ -98,19 +98,19 @@ ephy_embed_shell_finalize (GObject *object) g_object_unref (shell->priv->downloader_view); } - LOG ("Unref favicon cache") + LOG ("Unref favicon cache"); if (shell->priv->favicon_cache) { g_object_unref (G_OBJECT (shell->priv->favicon_cache)); } - LOG ("Unref encodings") + LOG ("Unref encodings"); if (shell->priv->encodings) { g_object_unref (G_OBJECT (shell->priv->encodings)); } - LOG ("Unref embed single") + LOG ("Unref embed single"); if (shell->priv->embed_single) { g_object_unref (G_OBJECT (shell->priv->embed_single)); diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c index d4e1168bc..27d700b79 100644 --- a/embed/ephy-encodings.c +++ b/embed/ephy-encodings.c @@ -232,7 +232,7 @@ ephy_encodings_finalize (GObject *object) g_object_unref (encodings->priv->db); - LOG ("EphyEncodings finalised") + LOG ("EphyEncodings finalised"); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -481,7 +481,7 @@ ephy_encodings_init (EphyEncodings *encodings) encodings->priv = EPHY_ENCODINGS_GET_PRIVATE (encodings); - LOG ("EphyEncodings initialising") + LOG ("EphyEncodings initialising"); db = ephy_node_db_new ("EncodingsDB"); encodings->priv->db = db; diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c index d38425cb6..7012191e0 100644 --- a/embed/ephy-favicon-cache.c +++ b/embed/ephy-favicon-cache.c @@ -279,7 +279,7 @@ ephy_favicon_cache_finalize (GObject *object) { EphyFaviconCache *cache = EPHY_FAVICON_CACHE (object); - LOG ("EphyFaviconCache finalising") + LOG ("EphyFaviconCache finalising"); g_hash_table_foreach_remove (cache->priv->downloads_hash, (GHRFunc) kill_download, cache); @@ -326,7 +326,7 @@ favicon_download_completed_cb (EphyEmbedPersist *persist, url = ephy_embed_persist_get_source (persist); g_return_if_fail (url != NULL); - LOG ("Favicon cache download completed for %s", url) + LOG ("Favicon cache download completed for %s", url); g_hash_table_remove (cache->priv->downloads_hash, url); @@ -344,7 +344,7 @@ favicon_download_cancelled_cb (EphyEmbedPersist *persist, url = ephy_embed_persist_get_source (persist); g_return_if_fail (url != NULL); - LOG ("Favicon cache download cancelled %s", url) + LOG ("Favicon cache download cancelled %s", url); g_hash_table_remove (cache->priv->downloads_hash, url); @@ -365,7 +365,7 @@ ephy_favicon_cache_download (EphyFaviconCache *cache, EphyEmbedPersist *persist; char *dest; - LOG ("Download favicon: %s", favicon_url) + LOG ("Download favicon: %s", favicon_url); g_return_if_fail (EPHY_IS_FAVICON_CACHE (cache)); g_return_if_fail (favicon_url != NULL); @@ -458,7 +458,7 @@ ephy_favicon_cache_get (EphyFaviconCache *cache, ephy_node_get_property_string (icon, EPHY_NODE_FAVICON_PROP_FILENAME), NULL); - LOG ("Create pixbuf for %s", pix_file) + LOG ("Create pixbuf for %s", pix_file); pixbuf = gdk_pixbuf_new_from_file (pix_file, NULL); diff --git a/embed/ephy-history.c b/embed/ephy-history.c index 6b54adaaf..5c87a9f8f 100644 --- a/embed/ephy-history.c +++ b/embed/ephy-history.c @@ -115,7 +115,7 @@ static void ephy_history_set_enabled (EphyHistory *history, gboolean enabled) { - LOG ("ephy_history_set_enabled %d", enabled) + LOG ("ephy_history_set_enabled %d", enabled); history->priv->enabled = enabled; @@ -267,7 +267,7 @@ ephy_history_save (EphyHistory *eb) return; } - LOG ("Saving history db") + LOG ("Saving history db"); ret = ephy_node_db_write_to_xml_safe (eb->priv->db, eb->priv->xml_file, @@ -629,7 +629,7 @@ ephy_history_host_visited (EphyHistory *eh, GValue value = { 0, }; int visits; - LOG ("Host visited") + LOG ("Host visited"); visits = ephy_node_get_property_int (host, EPHY_NODE_PAGE_PROP_VISITS); @@ -918,7 +918,7 @@ ephy_history_set_page_title (EphyHistory *gh, EphyNode *node; GValue value = { 0, }; - LOG ("Set page title") + LOG ("Set page title"); if (title == NULL || title[0] == '\0') return; @@ -959,7 +959,7 @@ ephy_history_set_icon (EphyHistory *gh, { EphyNode *host; - LOG ("Set host icon") + LOG ("Set host icon"); host = g_hash_table_lookup (gh->priv->hosts_hash, url); if (host) @@ -979,7 +979,7 @@ ephy_history_clear (EphyHistory *gh) { EphyNode *node; - LOG ("clearing history") + LOG ("clearing history"); ephy_node_db_set_immutable (gh->priv->db, FALSE); diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 0b7f2f653..91c9d081d 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -62,18 +62,18 @@ #ifdef MOZ_NSIMIMEINFO_NSACSTRING_ GContentHandler::GContentHandler() { - LOG ("GContentHandler ctor (%p)", this) + LOG ("GContentHandler ctor (%p)", this); } #else GContentHandler::GContentHandler() : mMimeType(nsnull) { - LOG ("GContentHandler ctor (%p)", this) + LOG ("GContentHandler ctor (%p)", this); } #endif GContentHandler::~GContentHandler() { - LOG ("GContentHandler dtor (%p)", this) + LOG ("GContentHandler dtor (%p)", this); #ifndef MOZ_NSIMIMEINFO_NSACSTRING_ if (mMimeType) diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index 86d6b6073..21f6872ff 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -117,12 +117,12 @@ static PRUnichar DOMModalDialogClosed[] = { 'D', 'O', 'M', 'M', 'o', 'd', 'a', EphyEventListener::EphyEventListener() : mOwner(nsnull) { - LOG ("EphyEventListener ctor (%p)", this) + LOG ("EphyEventListener ctor (%p)", this); } EphyEventListener::~EphyEventListener() { - LOG ("EphyEventListener dtor (%p)", this) + LOG ("EphyEventListener dtor (%p)", this); } NS_IMPL_ISUPPORTS1(EphyEventListener, nsIDOMEventListener) @@ -341,12 +341,12 @@ EphyModalAlertEventListener::HandleEvent (nsIDOMEvent * aDOMEvent) EphyContextMenuListener::EphyContextMenuListener() : mOwner(nsnull) { - LOG ("EphyContextMenuListener ctor (%p)", this) + LOG ("EphyContextMenuListener ctor (%p)", this); } EphyContextMenuListener::~EphyContextMenuListener() { - LOG ("EphyContextMenuListener dtor (%p)", this) + LOG ("EphyContextMenuListener dtor (%p)", this); } NS_IMPL_ISUPPORTS1(EphyContextMenuListener, nsIDOMContextMenuListener) @@ -438,12 +438,12 @@ EphyBrowser::EphyBrowser () , mContextMenuListener(nsnull) , mInitialized(PR_FALSE) { - LOG ("EphyBrowser ctor (%p)", this) + LOG ("EphyBrowser ctor (%p)", this); } EphyBrowser::~EphyBrowser () { - LOG ("EphyBrowser dtor (%p)", this) + LOG ("EphyBrowser dtor (%p)", this); } nsresult EphyBrowser::Init (GtkMozEmbed *mozembed) diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp index 98f5f3afd..9679c0f2a 100644 --- a/embed/mozilla/EphyContentPolicy.cpp +++ b/embed/mozilla/EphyContentPolicy.cpp @@ -43,7 +43,7 @@ NS_IMPL_ISUPPORTS1(EphyContentPolicy, nsIContentPolicy) EphyContentPolicy::EphyContentPolicy() { - LOG ("EphyContentPolicy ctor (%p)", this) + LOG ("EphyContentPolicy ctor (%p)", this); mLocked = eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_UNSAFE_PROTOCOLS); @@ -57,7 +57,7 @@ EphyContentPolicy::EphyContentPolicy() EphyContentPolicy::~EphyContentPolicy() { - LOG ("EphyContentPolicy dtor (%p)", this) + LOG ("EphyContentPolicy dtor (%p)", this); g_slist_foreach (mSafeProtocols, (GFunc) g_free, NULL); g_slist_free (mSafeProtocols); @@ -208,7 +208,7 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType, PRBool *_retval) { /* This is never called. */ - LOG ("ShouldProcess: this is quite unexpected!") + LOG ("ShouldProcess: this is quite unexpected!"); *_retval = PR_TRUE; return NS_OK; diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp index cde2fa1d2..293416b28 100644 --- a/embed/mozilla/EphyHeaderSniffer.cpp +++ b/embed/mozilla/EphyHeaderSniffer.cpp @@ -77,7 +77,7 @@ EphyHeaderSniffer::EphyHeaderSniffer (nsIWebBrowserPersist* aPersist, MozillaEmb , mDocument(aDocument) , mPostData(aPostData) { - LOG ("EphyHeaderSniffer ctor (%p)", this) + LOG ("EphyHeaderSniffer ctor (%p)", this); nsCOMPtr<nsIWindowWatcher> watcher (do_GetService("@mozilla.org/embedcomp/window-watcher;1")); @@ -92,7 +92,7 @@ EphyHeaderSniffer::EphyHeaderSniffer (nsIWebBrowserPersist* aPersist, MozillaEmb EphyHeaderSniffer::~EphyHeaderSniffer() { - LOG ("EphyHeaderSniffer dtor (%p)", this) + LOG ("EphyHeaderSniffer dtor (%p)", this); if (mSingle) { @@ -384,7 +384,7 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI) nsresult EphyHeaderSniffer::InitiateDownload (nsILocalFile *aDestFile) { - LOG ("Initiating download") + LOG ("Initiating download"); return InitiateMozillaDownload (mDocument, mURL, aDestFile, mContentType.get(), mOriginalURI, mEmbedPersist, diff --git a/embed/mozilla/EphyHistoryListener.cpp b/embed/mozilla/EphyHistoryListener.cpp index dc916cc8d..1fcacd198 100644 --- a/embed/mozilla/EphyHistoryListener.cpp +++ b/embed/mozilla/EphyHistoryListener.cpp @@ -45,12 +45,12 @@ EphyHistoryListener::EphyHistoryListener () { - LOG ("EphyHistoryListener ctor") + LOG ("EphyHistoryListener ctor"); } EphyHistoryListener::~EphyHistoryListener () { - LOG ("EphyHistoryListener dtor") + LOG ("EphyHistoryListener dtor"); } nsresult diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp index 5a1f558a4..2d17a6baf 100644 --- a/embed/mozilla/EphySingle.cpp +++ b/embed/mozilla/EphySingle.cpp @@ -46,7 +46,7 @@ NS_IMPL_ISUPPORTS1(EphySingle, nsIObserver) EphySingle::EphySingle() : mOwner(nsnull) { - LOG ("EphySingle ctor") + LOG ("EphySingle ctor"); } nsresult @@ -65,7 +65,7 @@ EphySingle::Init (EphyEmbedSingle *aOwner) mOwner = aOwner; - LOG ("EphySingle::Init") + LOG ("EphySingle::Init"); return NS_OK; } @@ -73,7 +73,7 @@ EphySingle::Init (EphyEmbedSingle *aOwner) nsresult EphySingle::Detach () { - LOG ("EphySingle::Detach") + LOG ("EphySingle::Detach"); if (mObserverService) { @@ -89,7 +89,7 @@ EphySingle::Detach () EphySingle::~EphySingle() { - LOG ("EphySingle dtor") + LOG ("EphySingle dtor"); mOwner = nsnull; } @@ -98,7 +98,7 @@ nsresult EphySingle::EmitCookieNotification (const char *name, nsISupports *aSubject) { - LOG ("EmitCookieNotification %s", name) + LOG ("EmitCookieNotification %s", name); nsCOMPtr<nsICookie> cookie = do_QueryInterface (aSubject); NS_ENSURE_TRUE (cookie, NS_ERROR_FAILURE); @@ -116,7 +116,7 @@ nsresult EphySingle::EmitPermissionNotification (const char *name, nsISupports *aSubject) { - LOG ("EmitPermissionNotification %s", name) + LOG ("EmitPermissionNotification %s", name); nsCOMPtr<nsIPermission> perm = do_QueryInterface (aSubject); NS_ENSURE_TRUE (perm, NS_ERROR_FAILURE); @@ -138,7 +138,7 @@ NS_IMETHODIMP EphySingle::Observe(nsISupports *aSubject, { nsresult rv = NS_OK; - LOG ("EphySingle::Observe topic %s", aTopic) + LOG ("EphySingle::Observe topic %s", aTopic); if (strcmp (aTopic, "cookie-changed") == 0) { @@ -160,7 +160,7 @@ NS_IMETHODIMP EphySingle::Observe(nsISupports *aSubject, /* "cleared" */ else if (aData[0] == 'c' && aData[1] == 'l') { - LOG ("EphySingle::cookie-changed::cleared") + LOG ("EphySingle::cookie-changed::cleared"); g_signal_emit_by_name (EPHY_COOKIE_MANAGER (mOwner), "cookies-cleared"); } @@ -172,7 +172,7 @@ NS_IMETHODIMP EphySingle::Observe(nsISupports *aSubject, } else if (strcmp (aTopic, "cookie-rejected") == 0) { - LOG ("EphySingle::cookie-rejected") + LOG ("EphySingle::cookie-rejected"); nsCOMPtr<nsIURI> uri = do_QueryInterface (aSubject); if (uri) @@ -207,7 +207,7 @@ NS_IMETHODIMP EphySingle::Observe(nsISupports *aSubject, /* "cleared" */ else if (aData[0] == 'c' && aData[1] == 'l') { - LOG ("EphySingle::perm-changed::cleared") + LOG ("EphySingle::perm-changed::cleared"); g_signal_emit_by_name (EPHY_PERMISSION_MANAGER (mOwner), "permissions-cleared"); } @@ -240,7 +240,7 @@ NS_IMETHODIMP EphySingle::Observe(nsISupports *aSubject, rv = NS_ERROR_FAILURE; } - LOG ("EphySingle::Observe %s", NS_SUCCEEDED (rv) ? "success" : "FAILURE") + LOG ("EphySingle::Observe %s", NS_SUCCEEDED (rv) ? "success" : "FAILURE"); return rv; } diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 122df5aff..e4b4e75fb 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -58,12 +58,12 @@ GFilePicker::GFilePicker() : mDialog(nsnull) , mMode(nsIFilePicker::modeOpen) { - LOG ("GFilePicker ctor (%p)", this) + LOG ("GFilePicker ctor (%p)", this); } GFilePicker::~GFilePicker() { - LOG ("GFilePicker dtor (%p)", this) + LOG ("GFilePicker dtor (%p)", this); if (mDialog) { @@ -79,7 +79,7 @@ NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, PR NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *title, PRInt16 mode) #endif { - LOG ("GFilePicker::Init") + LOG ("GFilePicker::Init"); GtkWidget *gtkparent = EphyUtils::FindGtkParent (parent); #if defined(MOZ_NSIFILEPICKER_NSASTRING_) @@ -138,7 +138,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) { NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); - LOG ("GFilePicker::AppendFilters mask=%d", filterMask) + LOG ("GFilePicker::AppendFilters mask=%d", filterMask); // http://lxr.mozilla.org/seamonkey/source/xpfe/components/filepicker/res/locale/en-US/filepicker.properties // http://lxr.mozilla.org/seamonkey/source/xpfe/components/filepicker/src/nsFilePicker.js line 131 ff @@ -192,7 +192,7 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar { NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); - LOG ("GFilePicker::AppendFilter") + LOG ("GFilePicker::AppendFilter"); #ifdef MOZ_NSIFILEPICKER_NSASTRING_ if (!filter.Length()) return NS_ERROR_FAILURE; @@ -244,7 +244,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString) { NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); - LOG ("GFilePicker::GetDefaultString") + LOG ("GFilePicker::GetDefaultString"); #ifdef MOZ_NSIFILEPICKER_NSASTRING_ aDefaultString = mDefaultString; @@ -271,7 +271,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString) NS_UTF16ToCString (mDefaultString, NS_CSTRING_ENCODING_UTF8, defaultString); - LOG ("GFilePicker::SetDefaultString %s", defaultString.get()) + LOG ("GFilePicker::SetDefaultString %s", defaultString.get()); if (!defaultString.Length()) return NS_ERROR_FAILURE; @@ -290,7 +290,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension) NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension) #endif { - LOG ("GFilePicker::GetDefaultExtension") + LOG ("GFilePicker::GetDefaultExtension"); return NS_ERROR_NOT_IMPLEMENTED; } @@ -301,7 +301,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtensio NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension) #endif { - LOG ("GFilePicker::SetDefaultExtension") + LOG ("GFilePicker::SetDefaultExtension"); return NS_ERROR_NOT_IMPLEMENTED; } @@ -309,14 +309,14 @@ NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtensio /* attribute long filterIndex; */ NS_IMETHODIMP GFilePicker::GetFilterIndex(PRInt32 *aFilterIndex) { - LOG ("GFilePicker::GetFilterIndex") + LOG ("GFilePicker::GetFilterIndex"); return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP GFilePicker::SetFilterIndex(PRInt32 aFilterIndex) { - LOG ("GFilePicker::SetFilterIndex index=%d", aFilterIndex) + LOG ("GFilePicker::SetFilterIndex index=%d", aFilterIndex); return NS_ERROR_NOT_IMPLEMENTED; } @@ -326,7 +326,7 @@ NS_IMETHODIMP GFilePicker::GetDisplayDirectory(nsILocalFile **aDisplayDirectory) { NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); - LOG ("GFilePicker::GetDisplayDirectory") + LOG ("GFilePicker::GetDisplayDirectory"); char *dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (mDialog)); @@ -349,7 +349,7 @@ NS_IMETHODIMP GFilePicker::SetDisplayDirectory(nsILocalFile *aDisplayDirectory) nsEmbedCString dir; aDisplayDirectory->GetNativePath (dir); - LOG ("GFilePicker::SetDisplayDirectory to %s", dir.get()) + LOG ("GFilePicker::SetDisplayDirectory to %s", dir.get()); if (mDefaultString.Length() && mMode != nsIFilePicker::modeSave) { @@ -378,7 +378,7 @@ NS_IMETHODIMP GFilePicker::GetFile(nsILocalFile **aFile) char *filename; - LOG ("GFilePicker::GetFile") + LOG ("GFilePicker::GetFile"); filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (mDialog)); @@ -399,7 +399,7 @@ NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL) { NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); - LOG ("GFilePicker::GetFileURL") + LOG ("GFilePicker::GetFileURL"); nsCOMPtr<nsILocalFile> file; GetFile (getter_AddRefs(file)); @@ -418,7 +418,7 @@ NS_IMETHODIMP GFilePicker::GetFiles(nsISimpleEnumerator * *aFiles) // Not sure if we need to implement it at all, it's used nowhere // in mozilla, but I guess a javascript might call it? - LOG ("GFilePicker::GetFiles") + LOG ("GFilePicker::GetFiles"); return NS_ERROR_NOT_IMPLEMENTED; } @@ -426,7 +426,7 @@ NS_IMETHODIMP GFilePicker::GetFiles(nsISimpleEnumerator * *aFiles) /* short show (); */ NS_IMETHODIMP GFilePicker::Show(PRInt16 *_retval) { - LOG ("GFilePicker::Show") + LOG ("GFilePicker::Show"); gtk_window_set_modal (GTK_WINDOW (mDialog), TRUE); gtk_window_set_destroy_with_parent (GTK_WINDOW (mDialog), FALSE); @@ -443,7 +443,7 @@ NS_IMETHODIMP GFilePicker::Show(PRInt16 *_retval) g_free (filename); filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (mDialog)); - LOG ("GFilePicker::Show response=%d, filename=%s", response, filename) + LOG ("GFilePicker::Show response=%d, filename=%s", response, filename); } while (response == GTK_RESPONSE_ACCEPT && mMode == nsIFilePicker::modeSave && diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp index 3abc7d276..cbfa4b2c1 100644 --- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp +++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp @@ -63,13 +63,13 @@ GtkNSSClientAuthDialogs::GtkNSSClientAuthDialogs() { - LOG ("GtkNSSClientAuthDialogs ctor (%p)", this) + LOG ("GtkNSSClientAuthDialogs ctor (%p)", this); } GtkNSSClientAuthDialogs::~GtkNSSClientAuthDialogs() { - LOG ("GtkNSSClientAuthDialogs dtor (%p)", this) + LOG ("GtkNSSClientAuthDialogs dtor (%p)", this); } NS_IMPL_THREADSAFE_ISUPPORTS1 (GtkNSSClientAuthDialogs, diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index ed987b105..47d0eb840 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -71,12 +71,12 @@ GtkNSSKeyPairDialogs::GtkNSSKeyPairDialogs () { - LOG ("GtkNSSKeyPairDialogs ctor (%p)", this) + LOG ("GtkNSSKeyPairDialogs ctor (%p)", this); } GtkNSSKeyPairDialogs::~GtkNSSKeyPairDialogs () { - LOG ("GtkNSSKeyPairDialogs dtor (%p)", this) + LOG ("GtkNSSKeyPairDialogs dtor (%p)", this); } NS_IMPL_ISUPPORTS1 (GtkNSSKeyPairDialogs, diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp index 31051822c..05ede417e 100644 --- a/embed/mozilla/MozDownload.cpp +++ b/embed/mozilla/MozDownload.cpp @@ -69,12 +69,12 @@ MozDownload::MozDownload() : mEmbedPersist(nsnull), mDownloadState(EPHY_DOWNLOAD_INITIALISING) { - LOG ("MozDownload ctor (%p)", (void *) this) + LOG ("MozDownload ctor (%p)", (void *) this); } MozDownload::~MozDownload() { - LOG ("MozDownload dtor (%p)", (void *) this) + LOG ("MozDownload dtor (%p)", (void *) this); NS_ASSERTION (!mEphyDownload, "MozillaDownload still alive!"); } diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp index dd97c9de6..d7e14fabf 100644 --- a/embed/mozilla/PrintingPromptService.cpp +++ b/embed/mozilla/PrintingPromptService.cpp @@ -43,12 +43,12 @@ NS_IMPL_ISUPPORTS1(GPrintingPromptService, nsIPrintingPromptService) GPrintingPromptService::GPrintingPromptService() { - LOG ("GPrintingPromptService ctor (%p)", this) + LOG ("GPrintingPromptService ctor (%p)", this); } GPrintingPromptService::~GPrintingPromptService() { - LOG ("GPrintingPromptService dtor (%p)", this) + LOG ("GPrintingPromptService dtor (%p)", this); } /* void showPrintDialog (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings); */ diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp index 5db2a74f7..f7e9cf78b 100644 --- a/embed/mozilla/mozilla-download.cpp +++ b/embed/mozilla/mozilla-download.cpp @@ -226,7 +226,7 @@ mozilla_download_finalize (GObject *object) NS_RELEASE (download->priv->moz_download); - LOG ("MozillaDownload %p finalised", object) + LOG ("MozillaDownload %p finalised", object); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -306,7 +306,7 @@ mozilla_download_class_init (MozillaDownloadClass *klass) static void mozilla_download_init (MozillaDownload *download) { - LOG ("MozillaDownload %p initialising", download) + LOG ("MozillaDownload %p initialising", download); download->priv = MOZILLA_DOWNLOAD_GET_PRIVATE (download); } diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp index 685fa6f6a..cbd2802d4 100644 --- a/embed/mozilla/mozilla-embed-event.cpp +++ b/embed/mozilla/mozilla-embed-event.cpp @@ -177,7 +177,7 @@ mozilla_embed_event_init (MozillaEmbedEvent *event) { event->priv = MOZILLA_EMBED_EVENT_GET_PRIVATE (event); - LOG ("MozillaEmbedEvent %p initialising", event) + LOG ("MozillaEmbedEvent %p initialising", event); event->priv->dom_event = nsnull; event->priv->props = g_hash_table_new_full (g_str_hash, g_str_equal, @@ -194,7 +194,7 @@ mozilla_embed_event_finalize (GObject *object) NS_IF_RELEASE (event->priv->dom_event); event->priv->dom_event = nsnull; - LOG ("MozillaEmbedEvent %p finalised", object) + LOG ("MozillaEmbedEvent %p finalised", object); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/lib/ephy-dbus.c b/lib/ephy-dbus.c index 3b76b0614..835bf1e36 100644 --- a/lib/ephy-dbus.c +++ b/lib/ephy-dbus.c @@ -116,7 +116,7 @@ session_filter_func (DBusConnection *connection, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, "Disconnected")) { - LOG ("EphyDbus disconnected from session bus") + LOG ("EphyDbus disconnected from session bus"); dbus_connection_unref (dbus->priv->session_bus); dbus->priv->session_bus = NULL; @@ -140,13 +140,13 @@ system_filter_func (DBusConnection *connection, { EphyDbus *dbus = EPHY_DBUS (user_data); - LOG ("EphyDbus filtering message from system bus") + LOG ("EphyDbus filtering message from system bus"); if (dbus_message_is_signal (message, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, "Disconnected")) { - LOG ("EphyDbus disconnected from system bus") + LOG ("EphyDbus disconnected from system bus"); dbus_connection_unref (dbus->priv->system_bus); dbus->priv->system_bus = NULL; @@ -167,7 +167,7 @@ ephy_dbus_connect_to_system_bus (EphyDbus *dbus) DBusConnection *bus; DBusError error; - LOG ("EphyDbus connecting to system DBUS") + LOG ("EphyDbus connecting to system DBUS"); dbus_error_init (&error); bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error); @@ -200,7 +200,7 @@ ephy_dbus_connect_to_session_bus (EphyDbus *dbus) DBusError error; DBusConnection *bus; - LOG ("EphyDbus connecting to session DBUS") + LOG ("EphyDbus connecting to session DBUS"); dbus_error_init (&error); bus = dbus_bus_get (DBUS_BUS_SESSION, &error); @@ -250,7 +250,7 @@ path_message_func (DBusConnection *connection, { DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - LOG ("EphyDbus filtering path messagefrom session bus") + LOG ("EphyDbus filtering path messagefrom session bus"); if (dbus_message_is_method_call (message, epiphany_dbus_service, "load")) { @@ -268,7 +268,7 @@ ephy_dbus_startup (EphyDbus *dbus) { g_return_if_fail (EPHY_IS_DBUS (dbus)); - LOG ("EphyDbus startup") + LOG ("EphyDbus startup"); ephy_dbus_connect_to_session_bus (dbus); ephy_dbus_connect_to_system_bus (dbus); @@ -279,7 +279,7 @@ ephy_dbus_shutdown (EphyDbus *dbus) { g_return_if_fail (EPHY_IS_DBUS (dbus)); - LOG ("EphyDbus shutdown") + LOG ("EphyDbus shutdown"); if (dbus->priv->reconnect_timeout_id != 0) { @@ -320,7 +320,7 @@ ephy_dbus_init (EphyDbus *dbus) { dbus->priv = EPHY_DBUS_GET_PRIVATE (dbus); - LOG ("EphyDbus initialising") + LOG ("EphyDbus initialising"); } static void @@ -330,7 +330,7 @@ ephy_dbus_finalize (GObject *object) ephy_dbus_shutdown (dbus); - LOG ("EphyDbus finalised") + LOG ("EphyDbus finalised"); parent_class->finalize (object); } diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h index f2311e49b..2c49158a7 100644 --- a/lib/ephy-debug.h +++ b/lib/ephy-debug.h @@ -32,13 +32,25 @@ G_BEGIN_DECLS #define DISABLE_PROFILING #endif +#if defined(G_HAVE_GNUC_VARARGS) + #ifdef DISABLE_LOGGING -#define LOG(msg, args...) +#define LOG(msg, args...) G_STMT_START { } G_STMT_END #else -#define LOG(msg, args...) \ -g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ - "[ %s ] " msg, \ - __FILE__ , ## args); +#define LOG(msg, args...) \ +g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ + "[ %s ] " msg, \ + __FILE__ , ## args) +#endif + +#elif defined(G_HAVE_ISO_VARARGS) + +#define LOG(...) G_STMT_START { } G_STMT_END + +#else /* no varargs macros */ + +static void LOG(const char *format, ...) {} + #endif #ifdef DISABLE_PROFILING diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c index ad6f2a624..4ce3b38d4 100644 --- a/lib/ephy-file-chooser.c +++ b/lib/ephy-file-chooser.c @@ -128,7 +128,7 @@ ephy_file_chooser_finalize (GObject *object) g_free (dialog->priv->persist_key); - LOG ("EphyFileChooser finalised") + LOG ("EphyFileChooser finalised"); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c index 5be893dc6..f1f62bae5 100644 --- a/lib/ephy-file-helpers.c +++ b/lib/ephy-file-helpers.c @@ -229,7 +229,7 @@ ephy_file_helpers_shutdown (void) if (mime_table != NULL) { - LOG ("Destroying mime type hashtable") + LOG ("Destroying mime type hashtable"); g_hash_table_destroy (mime_table); mime_table = NULL; } diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c index 927c37ebe..5e2de46f1 100644 --- a/lib/ephy-langs.c +++ b/lib/ephy-langs.c @@ -316,7 +316,7 @@ load_iso_entries (int iso, char *filename; int ret = -1; - LOG ("Loading ISO-%d codes", iso) + LOG ("Loading ISO-%d codes", iso); START_PROFILER ("Loading ISO codes") diff --git a/lib/ephy-module.c b/lib/ephy-module.c index fe31e39c6..4c6731461 100644 --- a/lib/ephy-module.c +++ b/lib/ephy-module.c @@ -85,7 +85,7 @@ ephy_module_load (GTypeModule *gmodule) EphyModule *module = EPHY_MODULE (gmodule); EphyModuleRegisterFunc register_func; - LOG ("Loading %s", module->path) + LOG ("Loading %s", module->path); module->library = g_module_open (module->path, 0); @@ -123,7 +123,7 @@ ephy_module_unload (GTypeModule *gmodule) { EphyModule *module = EPHY_MODULE (gmodule); - LOG ("Unloading %s", module->path) + LOG ("Unloading %s", module->path); g_module_close (module->library); @@ -142,7 +142,7 @@ ephy_module_get_path (EphyModule *module) GObject * ephy_module_new_object (EphyModule *module) { - LOG ("Creating object of type %s", g_type_name (module->type)) + LOG ("Creating object of type %s", g_type_name (module->type)); if (module->type == 0) { @@ -155,7 +155,7 @@ ephy_module_new_object (EphyModule *module) static void ephy_module_init (EphyModule *module) { - LOG ("EphyModule %p initialising", module) + LOG ("EphyModule %p initialising", module); } static void @@ -163,7 +163,7 @@ ephy_module_finalize (GObject *object) { EphyModule *module = EPHY_MODULE (object); - LOG ("EphyModule %p finalising", module) + LOG ("EphyModule %p finalising", module); g_free (module->path); diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c index 591b7ec82..8f553491a 100644 --- a/lib/ephy-node-db.c +++ b/lib/ephy-node-db.c @@ -251,7 +251,7 @@ node_from_id_real (EphyNodeDb *db, guint id) EphyNode *ret = NULL; if (id < db->priv->id_to_node->len) - ret = g_ptr_array_index (db->priv->id_to_node, id);; + ret = g_ptr_array_index (db->priv->id_to_node, id); return ret; } @@ -380,7 +380,7 @@ ephy_node_db_load_from_file (EphyNodeDb *db, gboolean was_immutable; int ret; - LOG ("ephy_node_db_load_from_file %s", xml_file) + LOG ("ephy_node_db_load_from_file %s", xml_file); START_PROFILER ("loading node db") @@ -468,7 +468,7 @@ ephy_node_db_write_to_xml_valist (EphyNodeDb *db, EphyNode *node; int ret; - LOG ("Saving node db to %s", filename) + LOG ("Saving node db to %s", filename); START_PROFILER ("Saving node db") diff --git a/lib/ephy-shlib-loader.c b/lib/ephy-shlib-loader.c index f5b759b64..3cf731dcb 100644 --- a/lib/ephy-shlib-loader.c +++ b/lib/ephy-shlib-loader.c @@ -110,7 +110,7 @@ ephy_shlib_loader_init (EphyShlibLoader *loader) { loader->priv = EPHY_SHLIB_LOADER_GET_PRIVATE (loader); - LOG ("EphyShlibLoader initialising") + LOG ("EphyShlibLoader initialising"); } static void @@ -118,7 +118,7 @@ ephy_shlib_loader_finalize (GObject *object) { EphyShlibLoader *loader = EPHY_SHLIB_LOADER (object); - LOG ("EphyShlibLoader finalising") + LOG ("EphyShlibLoader finalising"); g_slist_foreach (loader->priv->data, (GFunc) free_loader_data, NULL); g_slist_free (loader->priv->data); diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index 39d614a45..3a922d5c3 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -488,7 +488,7 @@ entry_style_set_cb (GtkWidget *widget, GtkStyle *previous_style, EphyLocationEntry *entry) { - LOG ("entry_style_set_cb") + LOG ("entry_style_set_cb"); modify_background (entry); } @@ -497,7 +497,7 @@ static void entry_realize_cb (GtkWidget *widget, EphyLocationEntry *entry) { - LOG ("entry_realize_cb") + LOG ("entry_realize_cb"); modify_background (entry); } @@ -508,7 +508,7 @@ ephy_location_entry_construct_contents (EphyLocationEntry *entry) EphyLocationEntryPrivate *priv = entry->priv; GtkWidget *alignment, *frame, *hbox; - LOG ("EphyLocationEntry constructing contents %p", entry) + LOG ("EphyLocationEntry constructing contents %p", entry); alignment = gtk_alignment_new (0.0, 0.5, 1.0, 0.0); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 1, 1); @@ -582,7 +582,7 @@ ephy_location_entry_init (EphyLocationEntry *le) { EphyLocationEntryPrivate *p; - LOG ("EphyLocationEntry initialising %p", le) + LOG ("EphyLocationEntry initialising %p", le); p = EPHY_LOCATION_ENTRY_GET_PRIVATE (le); le->priv = p; diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c index 7172e62ab..1ad7f442b 100644 --- a/lib/widgets/ephy-spinner.c +++ b/lib/widgets/ephy-spinner.c @@ -184,7 +184,7 @@ ephy_spinner_cache_load (EphySpinnerCache *cache) int grid_width, grid_height, x, y, size, h, w; const char *icon; - LOG ("EphySpinnerCache loading") + LOG ("EphySpinnerCache loading"); ephy_spinner_cache_unload (cache); @@ -334,7 +334,7 @@ ephy_spinner_cache_get_images (EphySpinnerCache *cache, GList *element, *l; int h, w; - LOG ("Getting animation images at size %d", size) + LOG ("Getting animation images at size %d", size); if (cache->priv->images == NULL || cache->priv->originals == NULL) { @@ -388,7 +388,7 @@ ephy_spinner_cache_init (EphySpinnerCache *cache) { cache->priv = EPHY_SPINNER_CACHE_GET_PRIVATE (cache); - LOG ("EphySpinnerCache initialising") + LOG ("EphySpinnerCache initialising"); /* FIXME: icon theme is per-screen, not global */ cache->priv->icon_theme = gtk_icon_theme_get_default (); @@ -403,7 +403,7 @@ ephy_spinner_cache_finalize (GObject *object) { EphySpinnerCache *cache = EPHY_SPINNER_CACHE (object); - LOG ("EphySpinnerCache finalising") + LOG ("EphySpinnerCache finalising"); g_signal_handlers_disconnect_by_func (cache->priv->icon_theme, G_CALLBACK(ephy_spinner_cache_load), cache); diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c index 13ed2dbc8..e00ff1324 100644 --- a/lib/widgets/ephy-tree-model-node.c +++ b/lib/widgets/ephy-tree-model-node.c @@ -162,7 +162,7 @@ ephy_tree_model_node_update_node (EphyTreeModelNode *model, path = get_path_real (model, node); } - LOG ("Updating row") + LOG ("Updating row"); gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter); gtk_tree_path_free (path); diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c index 1c9ae1e4f..dc6af7982 100644 --- a/lib/widgets/ephy-tree-model-sort.c +++ b/lib/widgets/ephy-tree-model-sort.c @@ -206,7 +206,7 @@ each_property_get_data_binder (EphyDragEachSelectedItemDataGet iteratee, g_return_if_fail (base_data != NULL); - LOG ("Data get %s (%s)", base_data, extra_data) + LOG ("Data get %s (%s)", base_data, extra_data); iteratee (base_data, extra_data, data); diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index 876c386f4..61d4865bb 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -122,7 +122,7 @@ create_tool_item (GtkAction *action) { GtkWidget *item, *button, *hbox, *label, *icon, *entry; - LOG ("Creating tool item for action %p", action) + LOG ("Creating tool item for action %p", action); item = GTK_ACTION_CLASS (parent_class)->create_tool_item (action); @@ -679,7 +679,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) { GtkWidget *button, *entry; - LOG ("Connecting action %p to proxy %p", action, proxy) + LOG ("Connecting action %p to proxy %p", action, proxy); GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy); @@ -837,7 +837,7 @@ ephy_bookmark_action_finalize (GObject *object) { /* EphyBookmarkAction *eba = EPHY_BOOKMARK_ACTION (object);*/ - LOG ("Bookmark action %p finalized", object) + LOG ("Bookmark action %p finalized", object); parent_class->finalize (object); } diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index 1ad51c8e4..6749b58ec 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -134,7 +134,7 @@ static void ephy_bookmark_properties_set_bookmark (EphyBookmarkProperties *selector, EphyNode *bookmark) { - LOG ("Set bookmark") + LOG ("Set bookmark"); selector->priv->bookmark = bookmark; @@ -282,7 +282,7 @@ set_window_icon (EphyBookmarkProperties *editor) icon_location = ephy_node_get_property_string (editor->priv->bookmark, EPHY_NODE_BMK_PROP_ICON); - LOG ("Get favicon for %s", icon_location ? icon_location : "None") + LOG ("Get favicon for %s", icon_location ? icon_location : "None"); if (icon_location != NULL) { diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 11416c4ec..468dae4ab 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -1163,7 +1163,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor) GtkWidget *focus_widget; int num_bmk_selected; - LOG ("Update menu sensitivity") + LOG ("Update menu sensitivity"); bmk_focus = ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->bm_view)); @@ -1547,7 +1547,7 @@ provide_favicon (EphyNode *node, GValue *value, gpointer user_data) icon_location = ephy_node_get_property_string (node, EPHY_NODE_BMK_PROP_ICON); - LOG ("Get favicon for %s", icon_location ? icon_location : "None") + LOG ("Get favicon for %s", icon_location ? icon_location : "None"); if (icon_location) { diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c index 4ff9e50e9..e08965be3 100644 --- a/src/bookmarks/ephy-bookmarks-export.c +++ b/src/bookmarks/ephy-bookmarks-export.c @@ -329,7 +329,7 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks, char *tmp_file; int ret; - LOG ("Exporting as RDF to %s", filename) + LOG ("Exporting as RDF to %s", filename); START_PROFILER ("Exporting as RDF") @@ -366,7 +366,7 @@ out: STOP_PROFILER ("Exporting as RDF") - LOG ("Exporting as RDF %s.", ret >= 0 ? "succeeded" : "FAILED") + LOG ("Exporting as RDF %s.", ret >= 0 ? "succeeded" : "FAILED"); } void @@ -379,7 +379,7 @@ ephy_bookmarks_export_mozilla (EphyBookmarks *bookmarks, char *tmp_file, *template; int ret = -1; - LOG ("Exporting as Mozilla to %s", filename) + LOG ("Exporting as Mozilla to %s", filename); template = g_build_filename (g_get_tmp_dir (), "export-bookmarks-XXXXXX", NULL); @@ -428,5 +428,5 @@ out: STOP_PROFILER ("Exporting as Mozilla") - LOG ("Exporting as Mozilla %s.", ret >= 0 ? "succeeded" : "FAILED") + LOG ("Exporting as Mozilla %s.", ret >= 0 ? "succeeded" : "FAILED"); } diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c index bc1a5ed59..23aa493ce 100644 --- a/src/bookmarks/ephy-bookmarks-import.c +++ b/src/bookmarks/ephy-bookmarks-import.c @@ -75,7 +75,7 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks, type = gnome_vfs_get_file_mime_type (filename, NULL, FALSE); - LOG ("Importing bookmarks of type %s", type ? type : "(null)") + LOG ("Importing bookmarks of type %s", type ? type : "(null)"); if (type == NULL) { diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index 48bf8b8bf..8c54408bb 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -433,12 +433,12 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu) if (menu->priv->needs_update == FALSE) { - LOG ("No update required") + LOG ("No update required"); return; } - LOG ("Rebuilding bookmarks menu") + LOG ("Rebuilding bookmarks menu"); ephy_bookmarks_menu_clean (menu); @@ -500,7 +500,7 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu) static gboolean do_update_cb (EphyBookmarksMenu *menu) { - LOG ("do_update_cb") + LOG ("do_update_cb"); ephy_bookmarks_menu_rebuild (menu); menu->priv->update_tag = 0; @@ -574,7 +574,7 @@ static void bookmarks_tree_changed_cb (EphyBookmarks *bookmarks, EphyBookmarksMenu *menu) { - LOG ("bookmarks_tree_changed_cb") + LOG ("bookmarks_tree_changed_cb"); ephy_bookmarks_menu_maybe_update (menu); } @@ -584,7 +584,7 @@ topics_added_cb (EphyNode *keywords, EphyNode *bmk, EphyBookmarksMenu *menu) { - LOG ("topics_added_cb") + LOG ("topics_added_cb"); ephy_bookmarks_menu_maybe_update (menu); } @@ -595,7 +595,7 @@ topics_removed_cb (EphyNode *keywords, guint old_index, EphyBookmarksMenu *menu) { - LOG ("topics_removed_cb") + LOG ("topics_removed_cb"); ephy_bookmarks_menu_maybe_update (menu); } @@ -607,7 +607,7 @@ topic_child_changed_cb (EphyNode *node, EphyBookmarksMenu *menu) { LOG ("topic_child_changed_cb id=%d property=%d", - ephy_node_get_id (child), property_id) + ephy_node_get_id (child), property_id); if (property_id == EPHY_NODE_KEYWORD_PROP_NAME) { @@ -623,7 +623,7 @@ bookmark_added_cb (EphyNode *bookmarks, EphyNode *bmk, EphyBookmarksMenu *menu) { - LOG ("bookmark_added_cb id=%d", ephy_node_get_id (bmk)) + LOG ("bookmark_added_cb id=%d", ephy_node_get_id (bmk)); if (menu->priv->bmk_actions != NULL) { @@ -656,7 +656,7 @@ bookmark_removed_cb (EphyNode *bookmarks, guint old_index, EphyBookmarksMenu *menu) { - LOG ("bookmark_removed_cb id=%d", ephy_node_get_id (bmk)) + LOG ("bookmark_removed_cb id=%d", ephy_node_get_id (bmk)); if (menu->priv->bmk_actions != NULL) { @@ -675,7 +675,7 @@ static void activate_cb (GtkAction *action, EphyBookmarksMenu *menu) { - LOG ("activate_cb") + LOG ("activate_cb"); ephy_bookmarks_menu_rebuild (menu); } @@ -762,7 +762,7 @@ ephy_bookmarks_menu_finalize (GObject *o) g_free (p->path); - LOG ("EphyBookmarksMenu finalised %p", o); + LOG ("EphyBookmarksMenu finalised %p", o);; G_OBJECT_CLASS (parent_class)->finalize (o); } diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 9d24f7d76..0d055993c 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -219,7 +219,7 @@ ephy_bookmarks_get_toolbars_model (EphyBookmarks *eb) { g_return_val_if_fail (EPHY_IS_BOOKMARKS (eb), NULL); - LOG ("ephy_bookmarks_get_toolbars_model") + LOG ("ephy_bookmarks_get_toolbars_model"); if (eb->priv->toolbars_model == NULL) { @@ -313,7 +313,7 @@ static void ephy_bookmarks_save (EphyBookmarks *eb) { - LOG ("Saving bookmarks") + LOG ("Saving bookmarks"); ephy_node_db_write_to_xml_safe (eb->priv->db, @@ -914,7 +914,7 @@ ephy_bookmarks_finalize (GObject *object) ephy_bookmarks_save (eb); /* have to do this before unreffing the nodes */ - LOG ("Unref bookmarks toolbars model") + LOG ("Unref bookmarks toolbars model"); if (eb->priv->toolbars_model != NULL) { g_object_unref (eb->priv->toolbars_model); @@ -930,7 +930,7 @@ ephy_bookmarks_finalize (GObject *object) g_free (eb->priv->xml_file); g_free (eb->priv->rdf_file); - LOG ("Bookmarks finalized") + LOG ("Bookmarks finalized"); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -1375,7 +1375,7 @@ ephy_bookmarks_find_keyword (EphyBookmarks *eb, if (g_utf8_strlen (name, -1) == 0) { - LOG ("Empty name, no keyword matches.") + LOG ("Empty name, no keyword matches."); return NULL; } @@ -1435,7 +1435,7 @@ ephy_bookmarks_set_keyword (EphyBookmarks *eb, if (ephy_node_has_child (eb->priv->notcategorized, bookmark)) { - LOG ("Remove from categorized bookmarks") + LOG ("Remove from categorized bookmarks"); ephy_node_remove_child (eb->priv->notcategorized, bookmark); } @@ -1457,7 +1457,7 @@ ephy_bookmarks_unset_keyword (EphyBookmarks *eb, if (!bookmark_is_categorized (eb, bookmark) && !ephy_node_has_child (eb->priv->notcategorized, bookmark)) { - LOG ("Add to not categorized bookmarks") + LOG ("Add to not categorized bookmarks"); ephy_node_add_child (eb->priv->notcategorized, bookmark); } diff --git a/src/bookmarks/ephy-bookmarksbar-model.c b/src/bookmarks/ephy-bookmarksbar-model.c index 4b32a04ed..13928950e 100755 --- a/src/bookmarks/ephy-bookmarksbar-model.c +++ b/src/bookmarks/ephy-bookmarksbar-model.c @@ -232,7 +232,7 @@ ephy_bookmarksbar_model_has_bookmark (EphyBookmarksBarModel *model, static gboolean save_changes_idle (EphyBookmarksBarModel *model) { - LOG ("Saving bookmarks toolbars model") + LOG ("Saving bookmarks toolbars model"); egg_toolbars_model_save (EGG_TOOLBARS_MODEL (model), @@ -418,7 +418,7 @@ load_toolbars (EphyBookmarksBarModel *model) gboolean success = FALSE; success = egg_toolbars_model_load (eggmodel, model->priv->xml_file); - LOG ("Loading the toolbars was %ssuccessful", success ? "" : "un") + LOG ("Loading the toolbars was %ssuccessful", success ? "" : "un"); /* Try migration first: load the old layout, and remove every toolbar * except the BookmarksBar toolbar @@ -452,7 +452,7 @@ load_toolbars (EphyBookmarksBarModel *model) } } - LOG ("Migration was %ssuccessful", success ? "" : "un") + LOG ("Migration was %ssuccessful", success ? "" : "un"); } /* Load default set */ @@ -460,7 +460,7 @@ load_toolbars (EphyBookmarksBarModel *model) { egg_toolbars_model_load (eggmodel, ephy_file ("epiphany-bookmarksbar.xml")); - LOG ("Loading the default toolbars was %ssuccessful", success ? "" : "un") + LOG ("Loading the default toolbars was %ssuccessful", success ? "" : "un"); } /* Ensure that we have a BookmarksBar */ @@ -476,7 +476,7 @@ ephy_bookmarksbar_model_init (EphyBookmarksBarModel *model) { model->priv = EPHY_BOOKMARKSBAR_MODEL_GET_PRIVATE (model); - LOG ("EphyBookmarksBarModel initialising") + LOG ("EphyBookmarksBarModel initialising"); model->priv->xml_file = g_build_filename (ephy_dot_dir (), EPHY_BOOKMARKSBARS_XML_FILE, @@ -497,7 +497,7 @@ ephy_bookmarksbar_model_dispose (GObject *object) { EphyBookmarksBarModel *model = EPHY_BOOKMARKSBAR_MODEL (object); - LOG ("EphyBookmarksBarModel disposing") + LOG ("EphyBookmarksBarModel disposing"); if (model->priv->timeout != 0) { @@ -517,7 +517,7 @@ ephy_bookmarksbar_model_finalize (GObject *object) g_free (model->priv->xml_file); - LOG ("EphyBookmarksBarModel finalised") + LOG ("EphyBookmarksBarModel finalised"); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c index 81202e670..d34dcf86c 100644 --- a/src/bookmarks/ephy-bookmarksbar.c +++ b/src/bookmarks/ephy-bookmarksbar.c @@ -181,7 +181,7 @@ ephy_bookmarksbar_action_request (EggEditableToolbar *eggtoolbar, bmks = ephy_bookmarks_get_bookmarks (toolbar->priv->bookmarks); topics = ephy_bookmarks_get_keywords (toolbar->priv->bookmarks); - LOG ("Action request for action '%s'", name) + LOG ("Action request for action '%s'", name); if (g_str_has_prefix (name, "GoBookmark-")) { @@ -295,7 +295,7 @@ ephy_bookmarksbar_finalize (GObject *object) G_CALLBACK (toolbar_added_cb), toolbar); - LOG ("EphyBookmarksBar %p finalised", object) + LOG ("EphyBookmarksBar %p finalised", object); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/src/bookmarks/ephy-favorites-menu.c b/src/bookmarks/ephy-favorites-menu.c index 8b1988633..d6f93d6c8 100644 --- a/src/bookmarks/ephy-favorites-menu.c +++ b/src/bookmarks/ephy-favorites-menu.c @@ -139,7 +139,7 @@ ephy_favorites_menu_rebuild (EphyFavoritesMenu *menu) GPtrArray *children; GtkUIManager *merge = GTK_UI_MANAGER (ephy_window_get_ui_manager (p->window)); - LOG ("Rebuilding favorites menu") + LOG ("Rebuilding favorites menu"); START_PROFILER ("Rebuild favorites menu") diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c index 55a129776..46c05b216 100644 --- a/src/bookmarks/ephy-new-bookmark.c +++ b/src/bookmarks/ephy-new-bookmark.c @@ -466,7 +466,7 @@ ephy_new_bookmark_set_title (EphyNewBookmark *bookmark, { const char *real_title; - LOG ("Setting new bookmark title to: \"%s\"", title) + LOG ("Setting new bookmark title to: \"%s\"", title); if (title == NULL || strlen (title) == 0) { diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c index 231e0e729..d170c634c 100644 --- a/src/bookmarks/ephy-topic-action.c +++ b/src/bookmarks/ephy-topic-action.c @@ -885,7 +885,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) { GtkWidget *button; - LOG ("connect_proxy action %p, proxy %p", action, proxy) + LOG ("connect_proxy action %p, proxy %p", action, proxy); (* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy); diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c index 57cee2cd0..b0c618d67 100644 --- a/src/bookmarks/ephy-topics-selector.c +++ b/src/bookmarks/ephy-topics-selector.c @@ -81,7 +81,7 @@ static void ephy_topics_selector_set_bookmark (EphyTopicsSelector *selector, EphyNode *bookmark) { - LOG ("Set bookmark") + LOG ("Set bookmark"); selector->priv->bookmark = bookmark; diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index 9a31a0006..58862fdda 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -290,7 +290,7 @@ add_action (EphyNode *encodings, EphyNode *node, EphyEncodingMenu *menu) title = ephy_node_get_property_string (node, EPHY_NODE_ENCODING_PROP_TITLE); - LOG ("add_action for encoding '%s'", encoding) + LOG ("add_action for encoding '%s'", encoding); g_snprintf (name, sizeof (name), "Encoding%s", encoding); diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c index 245c72dfe..927d72fd8 100644 --- a/src/ephy-extensions-manager.c +++ b/src/ephy-extensions-manager.c @@ -167,7 +167,7 @@ ephy_extensions_manager_load (EphyExtensionsManager *manager, g_return_if_fail (EPHY_IS_EXTENSIONS_MANAGER (manager)); g_return_if_fail (identifier != NULL); - LOG ("Adding '%s' to extensions", identifier) + LOG ("Adding '%s' to extensions", identifier); gconf_exts = eel_gconf_get_string_list (CONF_LOADED_EXTENSIONS); @@ -203,7 +203,7 @@ ephy_extensions_manager_unload (EphyExtensionsManager *manager, g_return_if_fail (EPHY_IS_EXTENSIONS_MANAGER (manager)); g_return_if_fail (identifier != NULL); - LOG ("Removing '%s' from extensions", identifier) + LOG ("Removing '%s' from extensions", identifier); gconf_exts = eel_gconf_get_string_list (CONF_LOADED_EXTENSIONS); @@ -371,7 +371,7 @@ ephy_extensions_manager_load_string (EphyExtensionsManager *manager, LocalisedString description = { NULL, G_MAXUINT }; LocalisedString name = { NULL, G_MAXUINT }; - LOG ("Loading description file for '%s'", identifier) + LOG ("Loading description file for '%s'", identifier); if (g_list_find_custom (manager->priv->data, identifier, (GCompareFunc) find_extension_info) != NULL) @@ -732,7 +732,7 @@ get_loader_for_type (EphyExtensionsManager *manager, EphyLoader *shlib_loader; GObject *loader; - LOG ("Looking for loader for type '%s'", type) + LOG ("Looking for loader for type '%s'", type); l = g_list_find_custom (manager->priv->factories, type, (GCompareFunc) find_loader); @@ -811,7 +811,7 @@ load_extension (EphyExtensionsManager *manager, g_return_if_fail (info->extension == NULL); - LOG ("Loading extension '%s'", info->info.identifier) + LOG ("Loading extension '%s'", info->info.identifier); /* don't try again */ if (info->load_failed) return; @@ -886,7 +886,7 @@ unload_extension (EphyExtensionsManager *manager, g_return_if_fail (info->loader != NULL); g_return_if_fail (info->extension != NULL || info->load_failed); - LOG ("Unloading extension '%s'", info->info.identifier) + LOG ("Unloading extension '%s'", info->info.identifier); if (info->load_failed) return; @@ -926,7 +926,7 @@ sync_loaded_extensions (EphyExtensionsManager *manager) gboolean active; ExtensionInfo *info; - LOG ("Synching changed list of active extensions") + LOG ("Synching changed list of active extensions"); client = gconf_client_get_default (); g_return_if_fail (client != NULL); @@ -958,7 +958,7 @@ sync_loaded_extensions (EphyExtensionsManager *manager) LOG ("Extension '%s' is %sactive and %sloaded", info->info.identifier, active ? "" : "not ", - info->info.active ? "" : "not ") + info->info.active ? "" : "not "); if (active != info->info.active) { @@ -1112,7 +1112,7 @@ ephy_extensions_manager_load_dir (EphyExtensionsManager *manager, GnomeVFSMonitorHandle *monitor; GnomeVFSResult res; - LOG ("Scanning directory '%s'", path) + LOG ("Scanning directory '%s'", path); START_PROFILER ("Scanning directory") @@ -1222,7 +1222,7 @@ ephy_extensions_manager_init (EphyExtensionsManager *manager) { manager->priv = EPHY_EXTENSIONS_MANAGER_GET_PRIVATE (manager); - LOG ("EphyExtensionsManager initialising") + LOG ("EphyExtensionsManager initialising"); } void @@ -1232,7 +1232,7 @@ ephy_extensions_manager_startup (EphyExtensionsManager *manager) g_return_if_fail (EPHY_IS_EXTENSIONS_MANAGER (manager)); - LOG ("EphyExtensionsManager startup") + LOG ("EphyExtensionsManager startup"); #ifdef ENABLE_VALIDATION init_schema_ctxt (manager); @@ -1259,7 +1259,7 @@ ephy_extensions_manager_finalize (GObject *object) EphyExtensionsManager *manager = EPHY_EXTENSIONS_MANAGER (object); EphyExtensionsManagerPrivate *priv = manager->priv; - LOG ("EphyExtensionsManager finalising") + LOG ("EphyExtensionsManager finalising"); eel_gconf_notification_remove (manager->priv->active_extensions_notifier_id); @@ -1305,7 +1305,7 @@ impl_attach_window (EphyExtension *extension, { EphyExtensionsManager *manager = EPHY_EXTENSIONS_MANAGER (extension); - LOG ("Attach") + LOG ("Attach"); g_list_foreach (manager->priv->extensions, (GFunc) attach_extension_to_window, window); @@ -1320,7 +1320,7 @@ impl_detach_window (EphyExtension *extension, EphyExtensionsManager *manager = EPHY_EXTENSIONS_MANAGER (extension); GList *tabs, *l; - LOG ("Detach") + LOG ("Detach"); manager->priv->windows = g_list_remove (manager->priv->windows, window); diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 3343c5a04..1147db4af 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -1128,7 +1128,7 @@ provide_favicon (EphyNode *node, GValue *value, gpointer user_data) icon_location = ephy_node_get_property_string (node, EPHY_NODE_PAGE_PROP_ICON); - LOG ("Get favicon for %s", icon_location ? icon_location : "None") + LOG ("Get favicon for %s", icon_location ? icon_location : "None"); if (icon_location) { diff --git a/src/ephy-link.c b/src/ephy-link.c index 4b1ec7288..6fb34e878 100644 --- a/src/ephy-link.c +++ b/src/ephy-link.c @@ -89,7 +89,7 @@ ephy_link_open (EphyLink *link, {
EphyTab *new_tab = NULL;
- LOG ("ephy_link_open address \"%s\" parent-tab %p flags %u", address, tab, flags)
+ LOG ("ephy_link_open address \"%s\" parent-tab %p flags %u", address, tab, flags)
; g_signal_emit (link, signals[OPEN_LINK], 0,
address, tab, flags,
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index a111559ea..402abb4cd 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -154,7 +154,7 @@ user_changed_cb (GtkWidget *proxy, EphyLocationAction *action) address = ephy_location_entry_get_location (EPHY_LOCATION_ENTRY (proxy)); - LOG ("user_changed_cb, new address %s", address) + LOG ("user_changed_cb, new address %s", address); g_signal_handlers_block_by_func (action, G_CALLBACK (sync_address), proxy); ephy_location_action_set_address (action, address); @@ -169,7 +169,7 @@ sync_address (GtkAction *gaction, EphyLocationAction *action = EPHY_LOCATION_ACTION (gaction); EphyLocationEntry *lentry = EPHY_LOCATION_ENTRY (proxy); - LOG ("sync_address %s", action->priv->address) + LOG ("sync_address %s", action->priv->address); g_signal_handlers_block_by_func (proxy, G_CALLBACK (user_changed_cb), action); ephy_location_entry_set_location (lentry, action->priv->address); @@ -703,7 +703,7 @@ ephy_location_action_set_address (EphyLocationAction *action, { g_return_if_fail (EPHY_IS_LOCATION_ACTION (action)); - LOG ("set_address %s", address) + LOG ("set_address %s", address); g_free (action->priv->address); action->priv->address = g_strdup (address); diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index bd094f0ed..4a5c17dbe 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -279,7 +279,7 @@ menu_activated_cb (GtkMenuToolButton *button, { GtkWidget *menu = NULL; - LOG ("menu_activated_cb dir %d", action->priv->direction) + LOG ("menu_activated_cb dir %d", action->priv->direction); switch (action->priv->direction) { @@ -316,7 +316,7 @@ set_tooltip_cb (GtkMenuToolButton *proxy, static void connect_proxy (GtkAction *action, GtkWidget *proxy) { - LOG ("Connect navigation action proxy") + LOG ("Connect navigation action proxy"); if (GTK_IS_MENU_TOOL_BUTTON (proxy)) { diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c index 0f73b586a..8f8cdc5d9 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -730,7 +730,7 @@ ephy_notebook_finalize (GObject *object) } g_object_unref (notebook->priv->title_tips); - LOG ("EphyNotebook finalised %p", object) + LOG ("EphyNotebook finalised %p", object); G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/src/ephy-session.c b/src/ephy-session.c index e111ebaca..117081c83 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -190,7 +190,7 @@ window_focus_in_event_cb (EphyWindow *window, GdkEventFocus *event, EphySession *session) { - LOG ("focus-in-event for window %p", window) + LOG ("focus-in-event for window %p", window); g_return_val_if_fail (g_list_find (session->priv->windows, window) != NULL, FALSE); @@ -211,7 +211,7 @@ impl_attach_window (EphyExtension *extension, EphySession *session = EPHY_SESSION (extension); GtkWidget *notebook; - LOG ("impl_attach_window") + LOG ("impl_attach_window"); session->priv->windows = g_list_append (session->priv->windows, window); ephy_session_save (session, SESSION_CRASHED); @@ -234,7 +234,7 @@ impl_detach_window (EphyExtension *extension, { EphySession *session = EPHY_SESSION (extension); - LOG ("impl_detach_window") + LOG ("impl_detach_window"); session->priv->windows = g_list_remove (session->priv->windows, window); ephy_session_save (session, SESSION_CRASHED); @@ -266,7 +266,7 @@ ephy_session_init (EphySession *session) { session->priv = EPHY_SESSION_GET_PRIVATE (session); - LOG ("EphySession initialising") + LOG ("EphySession initialising"); ensure_session_directory (); } @@ -276,7 +276,7 @@ ephy_session_dispose (GObject *object) { EphySession *session = EPHY_SESSION(object); - LOG ("EphySession disposing") + LOG ("EphySession disposing"); session_delete (session, SESSION_CRASHED); @@ -288,7 +288,7 @@ ephy_session_finalize (GObject *object) { EphySession *session = EPHY_SESSION (object); - LOG ("EphySession finalising") + LOG ("EphySession finalising"); /* FIXME: those should be NULL already!? */ g_list_free (session->priv->windows); @@ -410,7 +410,7 @@ ephy_session_autoresume (EphySession *session) char *saved_session; gboolean retval = FALSE; - LOG ("ephy_session_autoresume") + LOG ("ephy_session_autoresume"); if (session->priv->windows != NULL || session->priv->tool_windows != NULL) return FALSE; @@ -441,7 +441,7 @@ ephy_session_close (EphySession *session) { GList *windows; - LOG ("ephy_session_close") + LOG ("ephy_session_close"); /* we have to ref the shell or else we may get finalised between * destroying the windows and destroying the tool windows @@ -587,7 +587,7 @@ ephy_session_save (EphySession *session, return TRUE; } - LOG ("ephy_sesion_save %s", filename) + LOG ("ephy_sesion_save %s", filename); if (session->priv->windows == NULL && session->priv->tool_windows == NULL) { @@ -752,7 +752,7 @@ ephy_session_load (EphySession *session, GtkWidget *widget = NULL; char *save_to; - LOG ("ephy_sesion_load %s", filename) + LOG ("ephy_sesion_load %s", filename); save_to = get_session_filename (filename); @@ -837,7 +837,7 @@ void ephy_session_add_window (EphySession *session, GtkWindow *window) { - LOG ("ephy_session_add_window %p", window) + LOG ("ephy_session_add_window %p", window); session->priv->tool_windows = g_list_append (session->priv->tool_windows, window); @@ -857,7 +857,7 @@ void ephy_session_remove_window (EphySession *session, GtkWindow *window) { - LOG ("ephy_session_remove_window %p", window) + LOG ("ephy_session_remove_window %p", window); session->priv->tool_windows = g_list_remove (session->priv->tool_windows, window); diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 08e493ab0..1fc08162a 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -318,7 +318,7 @@ save_yourself_cb (GnomeClient *client, EphySession *session; char *tmp, *save_to; - LOG ("save_yourself_cb") + LOG ("save_yourself_cb"); tmp = g_build_filename (ephy_dot_dir (), "session_gnome-XXXXXX", @@ -350,7 +350,7 @@ die_cb (GnomeClient* client, { EphySession *session; - LOG ("die_cb") + LOG ("die_cb"); session = EPHY_SESSION (ephy_shell_get_session (shell)); ephy_session_close (session); @@ -479,27 +479,27 @@ ephy_shell_finalize (GObject *object) g_assert (ephy_shell == NULL); /* this will unload the extensions */ - LOG ("Unref extension manager") + LOG ("Unref extension manager"); if (shell->priv->extensions_manager) { g_object_unref (shell->priv->extensions_manager); } #ifdef ENABLE_DBUS - LOG ("Shutting down DBUS service") + LOG ("Shutting down DBUS service"); if (shell->priv->dbus_service) { g_object_unref (shell->priv->dbus_service); } #endif - LOG ("Unref session manager") + LOG ("Unref session manager"); if (shell->priv->session) { g_object_unref (shell->priv->session); } - LOG ("Unref toolbars model") + LOG ("Unref toolbars model"); if (shell->priv->toolbars_model) if (shell->priv->toolbar_style_notifier_id != 0) { @@ -509,7 +509,7 @@ ephy_shell_finalize (GObject *object) g_object_unref (shell->priv->toolbars_model); } - LOG ("Unref fullscreen toolbars model") + LOG ("Unref fullscreen toolbars model"); if (shell->priv->fs_toolbars_model) { g_object_unref (shell->priv->fs_toolbars_model); @@ -527,25 +527,25 @@ ephy_shell_finalize (GObject *object) gtk_widget_destroy (GTK_WIDGET (shell->priv->history_window)); } - LOG ("Unref PDM Dialog") + LOG ("Unref PDM Dialog"); if (shell->priv->pdm_dialog) { g_object_unref (shell->priv->pdm_dialog); } - LOG ("Unref prefs dialog") + LOG ("Unref prefs dialog"); if (shell->priv->prefs_dialog) { g_object_unref (shell->priv->prefs_dialog); } - LOG ("Unref print setup dialog") + LOG ("Unref print setup dialog"); if (shell->priv->print_setup_dialog) { g_object_unref (shell->priv->print_setup_dialog); } - LOG ("Unref bookmarks") + LOG ("Unref bookmarks"); if (shell->priv->bookmarks) { g_object_unref (shell->priv->bookmarks); @@ -561,7 +561,7 @@ ephy_shell_finalize (GObject *object) bonobo_object_unref (shell->priv->automation_factory); } - LOG ("Ephy shell finalized") + LOG ("Ephy shell finalized"); } @@ -640,7 +640,7 @@ ephy_shell_new_tab (EphyShell *shell, jump_to = (flags & EPHY_NEW_TAB_JUMP) != 0; LOG ("Opening new tab parent-window %p parent-tab %p in-new-window:%s jump-to:%s", - parent_window, previous_tab, in_new_window ? "t" : "f", jump_to ? "t" : "f") + parent_window, previous_tab, in_new_window ? "t" : "f", jump_to ? "t" : "f"); if (!in_new_window && parent_window != NULL) { @@ -773,7 +773,7 @@ toolbar_style_notifier (GConfClient *client, GObject * ephy_shell_get_toolbars_model (EphyShell *shell, gboolean fullscreen) { - LOG ("ephy_shell_get_toolbars_model fs=%d", fullscreen) + LOG ("ephy_shell_get_toolbars_model fs=%d", fullscreen); if (fullscreen) { @@ -846,7 +846,7 @@ toolwindow_show_cb (GtkWidget *widget, EphyShell *es) { EphySession *session; - LOG ("Ref shell for %s", G_OBJECT_TYPE_NAME (widget)) + LOG ("Ref shell for %s", G_OBJECT_TYPE_NAME (widget)); session = EPHY_SESSION (ephy_shell_get_session (es)); ephy_session_add_window (ephy_shell->priv->session, GTK_WINDOW (widget)); @@ -858,7 +858,7 @@ toolwindow_hide_cb (GtkWidget *widget, EphyShell *es) { EphySession *session; - LOG ("Unref shell for %s", G_OBJECT_TYPE_NAME (widget)) + LOG ("Unref shell for %s", G_OBJECT_TYPE_NAME (widget)); session = EPHY_SESSION (ephy_shell_get_session (es)); ephy_session_remove_window (ephy_shell->priv->session, GTK_WINDOW (widget)); diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 11ec9168a..009dbe2e3 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -494,7 +494,7 @@ popups_manager_add (EphyTab *tab, PopupInfo *popup; LOG ("popups_manager_add: tab %p, url %s, features %s", - tab, url, features) + tab, url, features); g_return_if_fail (EPHY_IS_TAB (tab)); @@ -549,7 +549,7 @@ static void popups_manager_add_window (EphyTab *tab, EphyWindow *window) { - LOG ("popups_manager_add_window: tab %p, window %p", tab, window) + LOG ("popups_manager_add_window: tab %p, window %p", tab, window); g_return_if_fail (EPHY_IS_TAB (tab)); g_return_if_fail (EPHY_IS_WINDOW (window)); @@ -604,7 +604,7 @@ ephy_tab_get_popups_allowed (EphyTab *tab) g_free (location); - LOG ("ephy_tab_get_popups_allowed: tab %p, allowed: %d", tab, allow) + LOG ("ephy_tab_get_popups_allowed: tab %p, allowed: %d", tab, allow); return allow; } @@ -630,7 +630,7 @@ popups_manager_show (PopupInfo *popup, static void popups_manager_show_all (EphyTab *tab) { - LOG ("popup_blocker_show_all: tab %p", tab) + LOG ("popup_blocker_show_all: tab %p", tab); g_slist_foreach (tab->priv->hidden_popups, (GFunc) popups_manager_show, tab); @@ -687,7 +687,7 @@ popups_manager_hide (EphyWindow *window, static void popups_manager_hide_all (EphyTab *tab) { - LOG ("popup_blocker_hide_all: tab %p", tab) + LOG ("popup_blocker_hide_all: tab %p", tab); g_slist_foreach (tab->priv->shown_popups, (GFunc) popups_manager_hide, tab); @@ -777,7 +777,7 @@ ephy_tab_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); - LOG ("EphyTab finalized %p", tab) + LOG ("EphyTab finalized %p", tab); } static gboolean @@ -1049,7 +1049,7 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab) { const char *uv_address; - LOG ("ephy_tab_address_cb tab %p address %s", tab, address) + LOG ("ephy_tab_address_cb tab %p address %s", tab, address); /* Do not expose about:blank to the user, an empty address bar will do better */ @@ -1125,7 +1125,7 @@ ephy_tab_zoom_changed_cb (EphyEmbed *embed, float zoom, EphyTab *tab) { char *address; - LOG ("ephy_tab_zoom_changed_cb tab %p zoom %f", tab, zoom) + LOG ("ephy_tab_zoom_changed_cb tab %p zoom %f", tab, zoom); ephy_tab_set_zoom (tab, zoom); @@ -1335,7 +1335,7 @@ ephy_tab_new_window_cb (EphyEmbed *embed, EphyWindow *window; LOG ("ephy_tab_new_window_cb tab %p with parent %p chrome %d", - tab, ((GtkWidget *) tab)->parent, chromemask) + tab, ((GtkWidget *) tab)->parent, chromemask); if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_JAVASCRIPT_CHROME)) { @@ -1376,7 +1376,7 @@ ephy_tab_visibility_cb (EphyEmbed *embed, gboolean visibility, EphyTab *tab) { LOG ("ephy_tab_visibility_cb tab %p visibility %d", - tab, visibility) + tab, visibility); if (visibility) { @@ -1401,7 +1401,7 @@ ephy_tab_destroy_brsr_cb (EphyEmbed *embed, EphyTab *tab) g_return_if_fail (EPHY_IS_TAB (tab)); LOG ("ephy_tab_destroy_browser_cb tab %p parent %p", - tab, ((GtkWidget *) tab)->parent) + tab, ((GtkWidget *) tab)->parent); window = ephy_tab_get_window (tab); g_return_if_fail (window != NULL); @@ -1419,7 +1419,7 @@ ephy_tab_size_to_cb (EphyEmbed *embed, gint width, gint height, GtkWidget *notebook; EphyWindow *window; - LOG ("ephy_tab_size_to_cb tab %p width %d height %d", tab, width, height) + LOG ("ephy_tab_size_to_cb tab %p width %d height %d", tab, width, height); tab->priv->width = width; tab->priv->height = height; @@ -1536,7 +1536,7 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed, modifier = ephy_embed_event_get_modifier (event); LOG ("ephy_tab_dom_mouse_click_cb: button %d, context %x, modifier %x", - button, context, modifier) + button, context, modifier); with_control = (modifier & GDK_CONTROL_MASK) != 0; with_shift = (modifier & GDK_SHIFT_MASK) != 0; @@ -1619,7 +1619,7 @@ ephy_tab_init (EphyTab *tab) EphyFaviconCache *cache; char *id; - LOG ("EphyTab initialising %p", tab) + LOG ("EphyTab initialising %p", tab); tab->priv = EPHY_TAB_GET_PRIVATE (tab); diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index d6611db76..212a9e6e0 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -301,7 +301,7 @@ ephy_tabs_menu_update (EphyTabsMenu *menu) guint i = 0; GList *tabs = NULL, *l; - LOG ("Rebuilding open tabs menu") + LOG ("Rebuilding open tabs menu"); START_PROFILER ("Rebuilding tabs menu") diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index a92b22a68..abb2cf8c6 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -238,7 +238,7 @@ sync_user_input_cb (EphyLocationAction *action, EphyTab *tab; const char *address; - LOG ("sync_user_input_cb") + LOG ("sync_user_input_cb"); if (priv->updating_address) return; diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c index b9d50140a..785974877 100755 --- a/src/ephy-toolbars-model.c +++ b/src/ephy-toolbars-model.c @@ -73,7 +73,7 @@ ephy_toolbars_model_get_type (void) static gboolean save_changes_idle (EphyToolbarsModel *model) { - LOG ("Saving toolbars model") + LOG ("Saving toolbars model"); egg_toolbars_model_save (EGG_TOOLBARS_MODEL (model), @@ -157,7 +157,7 @@ ephy_toolbars_model_load (EphyToolbarsModel *model) gboolean success; success = egg_toolbars_model_load (eggmodel, model->priv->xml_file); - LOG ("Loading the toolbars was %ssuccessful", success ? "" : "un") + LOG ("Loading the toolbars was %ssuccessful", success ? "" : "un"); /* maybe an old format, try to migrate: load the old layout, and * remove the BookmarksBar toolbar @@ -182,7 +182,7 @@ ephy_toolbars_model_load (EphyToolbarsModel *model) } } - LOG ("Migration was %ssuccessful", success ? "" : "un") + LOG ("Migration was %ssuccessful", success ? "" : "un"); } /* Still no success, load the default toolbars */ @@ -190,7 +190,7 @@ ephy_toolbars_model_load (EphyToolbarsModel *model) { success = egg_toolbars_model_load (eggmodel, ephy_file ("epiphany-toolbar.xml")); - LOG ("Loading the default toolbars was %ssuccessful", success ? "" : "un") + LOG ("Loading the default toolbars was %ssuccessful", success ? "" : "un"); } /* Ensure we have at least 1 toolbar */ diff --git a/src/ephy-window.c b/src/ephy-window.c index 8f6e2641d..c7e8c60c3 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -455,7 +455,7 @@ ephy_window_destroy (GtkObject *gtkobject) EphyWindow *window = EPHY_WINDOW (gtkobject); GSList *popups; - LOG ("EphyWindow destroy %p", window) + LOG ("EphyWindow destroy %p", window); if (window->priv->closing == FALSE) { @@ -1728,7 +1728,7 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event) context = ephy_embed_event_get_context (event); - LOG ("show_embed_popup context %x", context) + LOG ("show_embed_popup context %x", context); if ((context & EPHY_EMBED_CONTEXT_EMAIL_LINK) && (context & EPHY_EMBED_CONTEXT_IMAGE)) @@ -2515,7 +2515,7 @@ ephy_window_init (EphyWindow *window) EggToolbarsModel *model; GError *error = NULL; - LOG ("EphyWindow initialising %p", window) + LOG ("EphyWindow initialising %p", window); g_object_ref (ephy_shell); @@ -2723,7 +2723,7 @@ ephy_window_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); - LOG ("Ephy Window finalized %p", window) + LOG ("Ephy Window finalized %p", window); g_object_unref (ephy_shell); } diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index a0bf41712..199414d22 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -382,7 +382,7 @@ pdm_dialog_cookies_construct (PdmActionInfo *info) GtkTreeViewColumn *column; GtkTreeSelection *selection; - LOG ("pdm_dialog_cookies_construct") + LOG ("pdm_dialog_cookies_construct"); treeview = GTK_TREE_VIEW (ephy_dialog_get_control (EPHY_DIALOG (dialog), properties[PROP_COOKIES_TREEVIEW].id)); @@ -486,7 +486,7 @@ cookie_added_cb (EphyCookieManager *manager, { PdmActionInfo *info = dialog->priv->cookies; - LOG ("cookie_added_cb") + LOG ("cookie_added_cb"); info->add (info, (gpointer) ephy_cookie_copy (cookie)); } @@ -499,7 +499,7 @@ cookie_changed_cb (EphyCookieManager *manager, PdmActionInfo *info = dialog->priv->cookies; GtkTreeIter iter; - LOG ("cookie_changed_cb") + LOG ("cookie_changed_cb"); if (cookie_to_iter (info->model, cookie, &iter)) { @@ -520,7 +520,7 @@ cookie_deleted_cb (EphyCookieManager *manager, PdmActionInfo *info = dialog->priv->cookies; GtkTreeIter iter; - LOG ("cookie_deleted_cb") + LOG ("cookie_deleted_cb"); if (cookie_to_iter (info->model, cookie, &iter)) { @@ -538,7 +538,7 @@ cookies_cleared_cb (EphyCookieManager *manager, { PdmActionInfo *info = dialog->priv->cookies; - LOG ("cookies_cleared_cb") + LOG ("cookies_cleared_cb"); gtk_list_store_clear (GTK_LIST_STORE (info->model)); } @@ -631,7 +631,7 @@ pdm_dialog_passwords_construct (PdmActionInfo *info) GtkTreeViewColumn *column; GtkTreeSelection *selection; - LOG ("pdm_dialog_passwords_construct") + LOG ("pdm_dialog_passwords_construct"); treeview = GTK_TREE_VIEW (ephy_dialog_get_control (EPHY_DIALOG(dialog), properties[PROP_PASSWORDS_TREEVIEW].id)); @@ -686,7 +686,7 @@ static void passwords_changed_cb (EphyPasswordManager *manager, PdmDialog *dialog) { - LOG ("passwords changed") + LOG ("passwords changed"); /* since the callback doesn't carry any information about what * exactly has changed, we have to rebuild the list from scratch. diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 7186caca6..6e631de76 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -688,7 +688,7 @@ fonts_language_changed_cb (EphyDialog *dialog, code = g_value_get_string (value); - LOG ("fonts language combo changed, new code '%s'", code) + LOG ("fonts language combo changed, new code '%s'", code); setup_font_combo (dialog, "variable", code, VARIABLE_PROP); setup_font_combo (dialog, "monospace", code, MONOSPACE_PROP); @@ -1176,7 +1176,7 @@ language_editor_add_button_clicked_cb (GtkWidget *button, g_object_add_weak_pointer (G_OBJECT (pd->priv->add_lang_dialog), - (gpointer *) &pd->priv->add_lang_dialog);; + (gpointer *) &pd->priv->add_lang_dialog); } ephy_dialog_show (pd->priv->add_lang_dialog); |