aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--embed/ephy-embed.h36
-rw-r--r--embed/mozilla/MozillaPrivate.h2
-rw-r--r--embed/print-dialog.h36
4 files changed, 46 insertions, 37 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ec0f7d7e..573ea4232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2004-06-25 Marco Pesenti Gritti <marco@gnome.org>
+ * embed/ephy-embed.h:
+ * embed/mozilla/MozillaPrivate.h:
+ * embed/print-dialog.h:
+
+ Move PrintInfo to print-dialog since
+ it's no more use by embed api.
+
+2004-06-25 Marco Pesenti Gritti <marco@gnome.org>
+
* embed/MozillaPrivate.cpp:
Fix typo in the printer name
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 0e82f5545..56c6b8a63 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -70,42 +70,6 @@ typedef enum
EPHY_EMBED_CHROME_STATUSBAR | \
EPHY_EMBED_CHROME_BOOKMARKSBAR)
-typedef struct
-{
- gboolean print_to_file;
- char *printer;
- char *file;
- char *paper;
- int top_margin;
- int bottom_margin;
- int left_margin;
- int right_margin;
- int pages;
- int from_page;
- int to_page;
- int frame_type;
- int orientation;
- gboolean print_color;
-
- /*
- * &T - title
- * &U - Document URL
- * &D - Date/Time
- * &P - Page Number
- * &PT - Page Number with total Number of Pages (example: 1 of 34)
- *
- * So, if headerLeftStr = "&T" the title and the document URL
- * will be printed out on the top left-hand side of each page.
- */
- char *header_left_string;
- char *header_center_string;
- char *header_right_string;
- char *footer_left_string;
- char *footer_center_string;
- char *footer_right_string;
-}
-EmbedPrintInfo;
-
typedef enum
{
PRINTPREVIEW_GOTO_PAGENUM = 0,
diff --git a/embed/mozilla/MozillaPrivate.h b/embed/mozilla/MozillaPrivate.h
index 498461421..83966097a 100644
--- a/embed/mozilla/MozillaPrivate.h
+++ b/embed/mozilla/MozillaPrivate.h
@@ -20,7 +20,7 @@
#include <nsIPrintSettings.h>
#include <nsIDOMWindow.h>
-#include "ephy-embed.h"
+#include "print-dialog.h"
GtkWidget *MozillaFindEmbed (nsIDOMWindow *aDOMWindow);
diff --git a/embed/print-dialog.h b/embed/print-dialog.h
index 000a76154..81a5d5f24 100644
--- a/embed/print-dialog.h
+++ b/embed/print-dialog.h
@@ -31,6 +31,42 @@
G_BEGIN_DECLS
+typedef struct
+{
+ gboolean print_to_file;
+ char *printer;
+ char *file;
+ char *paper;
+ int top_margin;
+ int bottom_margin;
+ int left_margin;
+ int right_margin;
+ int pages;
+ int from_page;
+ int to_page;
+ int frame_type;
+ int orientation;
+ gboolean print_color;
+
+ /*
+ * &T - title
+ * &U - Document URL
+ * &D - Date/Time
+ * &P - Page Number
+ * &PT - Page Number with total Number of Pages (example: 1 of 34)
+ *
+ * So, if headerLeftStr = "&T" the title and the document URL
+ * will be printed out on the top left-hand side of each page.
+ */
+ char *header_left_string;
+ char *header_center_string;
+ char *header_right_string;
+ char *footer_left_string;
+ char *footer_center_string;
+ char *footer_right_string;
+}
+EmbedPrintInfo;
+
EphyDialog *ephy_print_dialog_new (GtkWidget *parent,
EphyEmbed *embed);