Midori Web Browser

Merge lp:~midori/midori/printerHappy into lp:midori

  1. printerHappy
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6602
Merged at revision: 6610
Proposed branch: lp:~midori/midori/printerHappy
Merge into: lp:midori
Diff against target: 32 lines (+7/-3)
1 file modified
midori/midori-view.c (+7/-3)
To merge this branch: bzr merge lp:~midori/midori/printerHappy
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+211208@code.launchpad.net

Commit message

Set page title as basis for print filename

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-view.c'
2--- midori/midori-view.c 2014-03-06 23:51:01 +0000
3+++ midori/midori-view.c 2014-03-16 14:14:44 +0000
4@@ -4745,9 +4745,13 @@
5 {
6 g_return_if_fail (MIDORI_IS_VIEW (view));
7
8+ GtkPrintSettings* settings = gtk_print_settings_new ();
9+ #if GTK_CHECK_VERSION (3, 6, 0)
10+ gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_BASENAME, midori_view_get_display_title (view));
11+ #endif
12+
13 #ifdef HAVE_WEBKIT2
14 WebKitPrintOperation* operation = webkit_print_operation_new (WEBKIT_WEB_VIEW (view->web_view));
15- GtkPrintSettings* settings = gtk_print_settings_new ();
16 webkit_print_operation_set_print_settings (operation, settings);
17 g_object_unref (settings);
18
19@@ -4759,11 +4763,11 @@
20 GTK_WINDOW (midori_browser_get_for_widget (view->web_view)));
21 }
22 g_object_unref (operation);
23-
24-
25 #else
26 WebKitWebFrame* frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
27 GtkPrintOperation* operation = gtk_print_operation_new ();
28+ gtk_print_operation_set_print_settings (operation, settings);
29+ g_object_unref (settings);
30 gtk_print_operation_set_custom_tab_label (operation, _("Features"));
31 gtk_print_operation_set_embed_page_setup (operation, TRUE);
32 g_signal_connect (operation, "create-custom-widget",

Subscribers

People subscribed via source and target branches

to all changes: