aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-François Rameau <jframeau@cvs.gnome.org>2006-02-03 21:35:53 +0800
committerJean-François Rameau <jframeau@src.gnome.org>2006-02-03 21:35:53 +0800
commita1c576b83ce096538574b16a968c867d0cabc566 (patch)
tree410f2751de274c22352226fc83c156f330fe29f2
parent11fd2b75f2afdbcc0b61edd801dd0f22b12e09c3 (diff)
downloadgsoc2013-epiphany-a1c576b83ce096538574b16a968c867d0cabc566.tar
gsoc2013-epiphany-a1c576b83ce096538574b16a968c867d0cabc566.tar.gz
gsoc2013-epiphany-a1c576b83ce096538574b16a968c867d0cabc566.tar.bz2
gsoc2013-epiphany-a1c576b83ce096538574b16a968c867d0cabc566.tar.lz
gsoc2013-epiphany-a1c576b83ce096538574b16a968c867d0cabc566.tar.xz
gsoc2013-epiphany-a1c576b83ce096538574b16a968c867d0cabc566.tar.zst
gsoc2013-epiphany-a1c576b83ce096538574b16a968c867d0cabc566.zip
Fix compilation against trunk + some typos.
2006-02-03 Jean-François Rameau <jframeau@cvs.gnome.org> * embed/mozilla/EphyPromptService.h: * embed/mozilla/EphyPromptService.cpp: (ShowNonBlockingAlert): * embed/mozilla/AutoJSContextStack.cpp: Fix compilation against trunk + some typos.
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/AutoJSContextStack.cpp1
-rw-r--r--embed/mozilla/EphyPromptService.cpp2
-rw-r--r--embed/mozilla/EphyPromptService.h2
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f7aae660..3249f8af6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-03 Jean-François Rameau <jframeau@cvs.gnome.org>
+
+ * embed/mozilla/EphyPromptService.h:
+ * embed/mozilla/EphyPromptService.cpp: (ShowNonBlockingAlert):
+ * embed/mozilla/AutoJSContextStack.cpp:
+
+ Fix compilation against trunk + some typos.
+
2006-02-03 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-main.c:
diff --git a/embed/mozilla/AutoJSContextStack.cpp b/embed/mozilla/AutoJSContextStack.cpp
index 77bbb81eb..0098f19eb 100644
--- a/embed/mozilla/AutoJSContextStack.cpp
+++ b/embed/mozilla/AutoJSContextStack.cpp
@@ -24,7 +24,6 @@
#include "AutoJSContextStack.h"
#include <nsIServiceManager.h>
-#include <nsIServiceManagerUtils.h>
AutoJSContextStack::~AutoJSContextStack()
{
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index 1d251d051..32a158b09 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -878,7 +878,7 @@ EphyPromptService::ShowNonBlockingAlert (nsIDOMWindow *aParent,
if (!prompt) return NS_ERROR_OUT_OF_MEMORY;
prompt->AddStockButton (GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
- prompt->ShowAndForget ();
+ Prompter::ShowAndForget (prompt);
return NS_OK;
}
diff --git a/embed/mozilla/EphyPromptService.h b/embed/mozilla/EphyPromptService.h
index 915ecf947..064ccf402 100644
--- a/embed/mozilla/EphyPromptService.h
+++ b/embed/mozilla/EphyPromptService.h
@@ -43,7 +43,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIPROMPTSERVICE
#if HAVE_NSINONBLOCKINGALERTSERVICE_H
- NS_DECL_NSINONBLOCKINALERTSERVICE
+ NS_DECL_NSINONBLOCKINGALERTSERVICE
#endif
EphyPromptService();