r17174 - in /desktop/unstable/epiphany-browser/debian: changelog patches/14_zoom-crash.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Sep 29 09:55:13 UTC 2008
Author: joss
Date: Mon Sep 29 09:55:13 2008
New Revision: 17174
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17174
Log:
14_zoom-crash.patch: patch from Mike Hommey to fix crash when
changing the zoom factor. Closes: #486744.
Added:
desktop/unstable/epiphany-browser/debian/patches/14_zoom-crash.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/patches/series
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=17174&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Mon Sep 29 09:55:13 2008
@@ -1,10 +1,15 @@
epiphany-browser (2.22.3-4) UNRELEASED; urgency=low
+ [ Sam Morris ]
* 18_gnome-vfs-for-helper-display.patch: Use gnome-vfs to display which
helper application a downloaded file will be opened with (closes:
#498913).
* Build-depend on gnome-vfs for the above patch.
* 99_autoreconf.patch: refresh.
+
+ [ Josselin Mouette ]
+ * 14_zoom-crash.patch: patch from Mike Hommey to fix crash when
+ changing the zoom factor. Closes: #486744.
-- Sam Morris <sam at robots.org.uk> Sun, 14 Sep 2008 15:55:56 +0100
Added: desktop/unstable/epiphany-browser/debian/patches/14_zoom-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/14_zoom-crash.patch?rev=17174&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/14_zoom-crash.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/14_zoom-crash.patch Mon Sep 29 09:55:13 2008
@@ -1,0 +1,58 @@
+Debian #486744
+GNOME #525357
+Mozilla #444894
+Patch from Mike Hommey
+
+--- epiphany-browser-2.22.3.orig/embed/mozilla/EphyBrowser.h
++++ epiphany-browser-2.22.3/embed/mozilla/EphyBrowser.h
+@@ -208,6 +208,7 @@
+ nsCOMPtr<nsIWebBrowser> mWebBrowser;
+ private:
+ GtkWidget *mEmbed;
++ float mZoom;
+
+ nsCOMPtr<nsIWebBrowserFocus> mWebBrowserFocus;
+ nsCOMPtr<nsIDOMDocument> mTargetDocument;
+--- epiphany-browser-2.22.3.orig/embed/mozilla/EphyBrowser.cpp
++++ epiphany-browser-2.22.3/embed/mozilla/EphyBrowser.cpp
+@@ -830,6 +830,7 @@
+ #endif
+ , mContextMenuListener(nsnull)
+ , mInitialized(PR_FALSE)
++, mZoom(0.0)
+ {
+ LOG ("EphyBrowser ctor (%p)", this);
+ }
+@@ -1192,7 +1193,9 @@
+ nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer);
+ NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE);
+
+- return mdv->SetTextZoom (aZoom);
++ nsresult rv = mdv->SetTextZoom (aZoom);
++ mZoom = aZoom;
++ return rv;
+ }
+
+ nsresult EphyBrowser::GetContentViewer (nsIContentViewer **aViewer)
+@@ -1207,6 +1210,10 @@
+
+ nsresult EphyBrowser::GetZoom (float *aZoom)
+ {
++ if (mZoom != 0) {
++ *aZoom = mZoom;
++ return NS_OK;
++ }
+ NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+
+ nsCOMPtr<nsIContentViewer> contentViewer;
+@@ -1216,7 +1223,9 @@
+ nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer);
+ NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE);
+
+- return mdv->GetTextZoom (aZoom);
++ nsresult rv = mdv->GetTextZoom (aZoom);
++ mZoom = *aZoom;
++ return rv;
+ }
+
+ nsresult
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=17174&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Mon Sep 29 09:55:13 2008
@@ -12,6 +12,7 @@
11_useragent-weasel.patch
12_safetypes.patch
13_extensions_need_xpcom.patch
+14_zoom-crash.patch
15_certificates_oldapi.patch
16_fix-notify-uninit-crash.patch
17_print-scaling.patch
More information about the pkg-gnome-commits
mailing list