diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | embed/ephy-embed-shell.c | 4 | ||||
| -rw-r--r-- | embed/mozilla/MozDownload.cpp | 3 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,15 @@ +2006-07-06 Jean-François Rameau <jframeau@cvs.gnome.org> + + * embed/mozilla/MozDownload.cpp: (OnProgressChange64): + + Don't hammer the cpu when downloading file with an unknown size. + Fix bug 346671. + + * embed/ephy-embed-shell.c: (ephy_embed_shell_set_page_setup), + (ephy_embed_shell_set_print_settings): + + Fix compiler warnings. + 2006-07-06 Christian Persch <chpe@cvs.gnome.org> * src/window-commands.c: diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 45c48fa2e..d4a1e4c38 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -379,7 +379,7 @@ ephy_embed_shell_set_page_setup (EphyEmbedShell *shell, { EphyEmbedShellPrivate *priv; - g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL); + g_return_if_fail (EPHY_IS_EMBED_SHELL (shell)); priv = shell->priv; if (page_setup != NULL) @@ -420,7 +420,7 @@ ephy_embed_shell_set_print_settings (EphyEmbedShell *shell, { EphyEmbedShellPrivate *priv; - g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL); + g_return_if_fail (EPHY_IS_EMBED_SHELL (shell)); priv = shell->priv; if (settings != NULL) diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp index 5c8ee71ec..198d6e0bb 100644 --- a/embed/mozilla/MozDownload.cpp +++ b/embed/mozilla/MozDownload.cpp @@ -396,8 +396,7 @@ MozDownload::OnProgressChange64 (nsIWebProgress *aWebProgress, PRInt64 now = PR_Now (); if ((now - mLastUpdate < mInterval) && - (aMaxTotalProgress != -1) && - (aCurTotalProgress < aMaxTotalProgress)) + (aMaxTotalProgress == -1 || aCurTotalProgress < aMaxTotalProgress)) return NS_OK; mLastUpdate = now; |