diff options
| author | Bastien Nocera <hadess@hadess.net> | 2006-06-19 18:04:51 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2006-06-19 18:04:51 +0000 |
| commit | 17ee1ed04e8cf67e1ced77753a927511e032aad0 (patch) | |
| tree | bcad3def06ab4542e30cc3cf87f15f871b5ea662 /src | |
| parent | c9cf4975facbb0e454983af83478520cc1e6cb7b (diff) | |
patch from Christian Persch to fix the relative path resolver broken by
2006-06-19 Bastien Nocera <hadess@hadess.net>
* src/totem-mozilla-plugin.cpp: patch from Christian Persch to fix
the relative path resolver broken by the patch from #321254
(Closes: #300510)
Diffstat (limited to 'src')
| -rw-r--r-- | src/totem-mozilla-plugin.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/totem-mozilla-plugin.cpp b/src/totem-mozilla-plugin.cpp index 73ed9152..fd7697cd 100644 --- a/src/totem-mozilla-plugin.cpp +++ b/src/totem-mozilla-plugin.cpp @@ -46,6 +46,7 @@ #include <nsIDOMWindow.h> #include <nsIURI.h> #include <nsEmbedString.h> +#include <nsIInterfaceRequestor.h> #include <nsIInterfaceRequestorUtils.h> #include <docshell/nsIWebNavigation.h> @@ -297,13 +298,20 @@ static NPError totem_plugin_new_instance (NPMIMEType mime_type, NPP instance, nsIDOMWindow *domWin = nsnull; mozilla_functions.getvalue (instance, NPNVDOMWindow, NS_REINTERPRET_CAST (void**, &domWin)); - nsIWebNavigation *webNav = nsnull; + nsIInterfaceRequestor *irq = nsnull; if (domWin) { - domWin->QueryInterface (NS_GET_IID (nsIWebNavigation), - NS_REINTERPRET_CAST (void**, &webNav)); + domWin->QueryInterface (NS_GET_IID (nsIInterfaceRequestor), + NS_REINTERPRET_CAST (void**, &irq)); NS_RELEASE (domWin); } + nsIWebNavigation *webNav = nsnull; + if (irq) { + irq->GetInterface (NS_GET_IID (nsIWebNavigation), + NS_REINTERPRET_CAST (void**, &webNav)); + NS_RELEASE (irq); + } + nsIURI *docURI = nsnull; if (webNav) { webNav->GetCurrentURI (&docURI); |