aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/Makefile.am14
-rw-r--r--embed/mozilla/Makefile.am4
-rwxr-xr-xembed/print-dialog.c12
3 files changed, 16 insertions, 14 deletions
diff --git a/embed/Makefile.am b/embed/Makefile.am
index b97b81d54..3be8a73b2 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -31,6 +31,10 @@ INST_H_FILES = \
ephy-password-manager.h \
ephy-permission-manager.h
+BUILT_SOURCES = \
+ ephy-embed-type-builtins.c \
+ ephy-embed-type-builtins.h
+
libephyembed_la_SOURCES = \
ephy-adblock-manager.c \
downloader-view.c \
@@ -51,8 +55,7 @@ libephyembed_la_SOURCES = \
ephy-permission-manager.c \
print-dialog.c \
$(INST_H_FILES) \
- $(NOINST_H_FILES) \
- $(BUILT_SOURCES)
+ $(NOINST_H_FILES)
if ENABLE_CERTIFICATE_MANAGER
INST_H_FILES += \
@@ -64,6 +67,9 @@ libephyembed_la_SOURCES += \
ephy-x509-cert.c
endif
+nodist_libephyembed_la_SOURCES = \
+ $(BUILT_SOURCES)
+
libephyembed_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/embed/mozilla \
@@ -91,10 +97,6 @@ libephyembedfactory_la_CFLAGS = \
$(DEPENDENCIES_CFLAGS) \
$(AM_CFLAGS)
-BUILT_SOURCES = \
- ephy-embed-type-builtins.c \
- ephy-embed-type-builtins.h
-
CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index dff497be4..a1dedc6c7 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -117,7 +117,9 @@ mozilla_include_subdirs = \
# Grr, damn gentoo has a dodgy header layout
# http://bugs.gentoo.org/show_bug.cgi?id=100804
-mozilla_include_subdirs += find pref
+mozilla_include_subdirs += \
+ find \
+ pref
libephymozillaembed_la_CPPFLAGS = \
-I$(top_srcdir)/lib \
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 7dfd0525b..18162c4c9 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -270,9 +270,8 @@ ephy_print_verify_postscript (GnomePrintDialog *print_dialog)
config, (guchar *)"Settings.Engine.Backend.Driver"));
}
- if (GTK_WINDOW (print_dialog)->group)
- gtk_window_group_add_window (GTK_WINDOW (print_dialog)->group,
- GTK_WINDOW (dialog));
+ gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (print_dialog)),
+ GTK_WINDOW (dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -423,10 +422,9 @@ ephy_print_dialog_new (GtkWidget *parent,
G_CALLBACK (ephy_print_dialog_response_cb), info);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
-
- if (GTK_WINDOW (parent)->group)
- gtk_window_group_add_window (GTK_WINDOW (parent)->group,
- GTK_WINDOW (dialog));
+
+ gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (parent)),
+ GTK_WINDOW (dialog));
return dialog;
}