aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorCarlos Garcia Campos <cgarcia@igalia.com>2012-01-18 23:17:53 +0800
committerCarlos Garcia Campos <carlosgc@gnome.org>2012-01-18 23:40:10 +0800
commit3cc93b5ec64d97739cf5065e19b31759d1495b9e (patch)
tree573db2c6ec58b83bbeeb8db2659ac5ab0b569c43 /embed
parent066acbea3d32c04f15b6754310c8ba422f7c2f36 (diff)
downloadgsoc2013-epiphany-3cc93b5ec64d97739cf5065e19b31759d1495b9e.tar
gsoc2013-epiphany-3cc93b5ec64d97739cf5065e19b31759d1495b9e.tar.gz
gsoc2013-epiphany-3cc93b5ec64d97739cf5065e19b31759d1495b9e.tar.bz2
gsoc2013-epiphany-3cc93b5ec64d97739cf5065e19b31759d1495b9e.tar.lz
gsoc2013-epiphany-3cc93b5ec64d97739cf5065e19b31759d1495b9e.tar.xz
gsoc2013-epiphany-3cc93b5ec64d97739cf5065e19b31759d1495b9e.tar.zst
gsoc2013-epiphany-3cc93b5ec64d97739cf5065e19b31759d1495b9e.zip
Remove Print Setup item from the super menu and embed it into print dialog
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-web-view.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 638640ba9..9fe4f1fdb 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -3277,10 +3277,10 @@ ephy_web_view_run_print_action (EphyWebView *view, GtkPrintOperationAction actio
main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view));
operation = gtk_print_operation_new ();
- gtk_print_operation_set_default_page_setup (operation, ephy_embed_shell_get_page_setup (shell));
+ gtk_print_operation_set_embed_page_setup (operation, TRUE);
+ gtk_print_operation_set_default_page_setup (operation, ephy_embed_shell_get_page_setup (shell));
webkit_web_frame_print_full (main_frame, operation, action, &error);
- g_object_unref (operation);
if (error) {
GtkWidget *info_bar;
@@ -3300,7 +3300,10 @@ ephy_web_view_run_print_action (EphyWebView *view, GtkPrintOperationAction actio
ephy_embed_add_top_widget (embed, info_bar, FALSE);
gtk_widget_show_all (info_bar);
- }
+ } else
+ ephy_embed_shell_set_page_setup (shell, gtk_print_operation_get_default_page_setup (operation));
+
+ g_object_unref (operation);
}
/**