aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xembed/print-dialog.c10
-rw-r--r--lib/ephy-dialog.c2
3 files changed, 8 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a821f853..d36402d9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-10-27 Christian Persch <chpe@cvs.gnome.org>
+ * embed/print-dialog.c: (ephy_print_dialog_new):
+
+ Print dialogue isn't an EphyEmbedDialog anymore, remove the
+ include.
+
+2004-10-27 Christian Persch <chpe@cvs.gnome.org>
+
* embed/ephy-embed-dialog.c: (ephy_embed_dialog_init):
* embed/ephy-embed-persist.c: (ephy_embed_persist_init),
(ephy_embed_persist_to_string):
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 20132b973..962e93122 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -24,7 +24,6 @@
#endif
#include "print-dialog.h"
-#include "ephy-embed-dialog.h"
#include "ephy-embed-single.h"
#include "ephy-embed-shell.h"
#include "ephy-file-chooser.h"
@@ -374,14 +373,7 @@ ephy_print_dialog_new (GtkWidget *parent,
GtkCellRenderer *renderer;
EphyEmbedSingle *single;
- dialog = EPHY_DIALOG (g_object_new (EPHY_TYPE_EMBED_DIALOG,
- "embed", embed,
- NULL));
-
- if (parent != NULL)
- {
- g_object_set (G_OBJECT (dialog), "parent-window", parent, NULL);
- }
+ dialog = ephy_dialog_new_with_parent (parent);
ephy_dialog_construct (dialog,
print_props,
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 114658828..bf76ba069 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -1491,8 +1491,6 @@ ephy_dialog_new (void)
EphyDialog *
ephy_dialog_new_with_parent (GtkWidget *parent_window)
{
- g_return_val_if_fail (parent_window != NULL, NULL);
-
return EPHY_DIALOG (g_object_new (EPHY_TYPE_DIALOG,
"parent-window", parent_window,
NULL));