aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/EphyUtils.cpp2
-rw-r--r--embed/mozilla/EphyUtils.h7
-rw-r--r--embed/print-dialog.h2
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 57fa8d10d..e53e6bfa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-21 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/EphyUtils.cpp:
+ * embed/mozilla/EphyUtils.h:
+ * embed/print-dialog.h:
+
+ Don't include print-dialog.h in EphyUtils.h.
+
2004-11-19 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 89354b499..c8d296737 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -25,6 +25,7 @@
#include "EphyUtils.h"
#include "ephy-embed-shell.h"
#include "ephy-embed-single.h"
+#include "print-dialog.h"
#include <nsIServiceManager.h>
#define MOZILLA_STRICT_API
@@ -34,6 +35,7 @@
#include <nsIEmbeddingSiteWindow.h>
#include <nsIWebBrowserChrome.h>
#include <gtkmozembed.h>
+#include <nsIPrintSettings.h>
nsresult
EphyUtils::GetIOService (nsIIOService **ioService)
diff --git a/embed/mozilla/EphyUtils.h b/embed/mozilla/EphyUtils.h
index 2f81e0b4d..d180664ae 100644
--- a/embed/mozilla/EphyUtils.h
+++ b/embed/mozilla/EphyUtils.h
@@ -23,9 +23,10 @@
#include <nsIIOService.h>
#include <nsIURI.h>
#include <nsIDOMWindow.h>
-#include <nsIPrintSettings.h>
+#include <gtk/gtkwidget.h>
-#include "print-dialog.h"
+class nsIPrintSettings;
+struct _EmbedPrintInfo;
namespace EphyUtils
{
@@ -39,7 +40,7 @@ namespace EphyUtils
GtkWidget *FindGtkParent (nsIDOMWindow *aDOMWindow);
- nsresult CollatePrintSettings (const EmbedPrintInfo *info,
+ nsresult CollatePrintSettings (const _EmbedPrintInfo *info,
nsIPrintSettings *settings,
gboolean preview);
}
diff --git a/embed/print-dialog.h b/embed/print-dialog.h
index 81a5d5f24..1ca09db8b 100644
--- a/embed/print-dialog.h
+++ b/embed/print-dialog.h
@@ -31,7 +31,7 @@
G_BEGIN_DECLS
-typedef struct
+typedef struct _EmbedPrintInfo
{
gboolean print_to_file;
char *printer;