Merge r176316 - [GTK] Error in documentation of webkit_print_operatio…

…n_get_page_setup() https://bugs.webkit.org/show_bug.cgi?id=138868 Patch by Michael Catanzaro <mcatanzaro@igalia.com> on 2014-11-19 Reviewed by Carlos Garcia Campos. Fix copypaste error in documentation of webkit_print_operation_get_page_setup(). * UIProcess/API/gtk/WebKitPrintOperation.cpp:
WebKit · Jan 5, 2015 · 3ed2edf · 3ed2edf
1 parent 89588c3
commit 3ed2edf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2014-11-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Error in documentation of webkit_print_operation_get_page_setup()
+        https://bugs.webkit.org/show_bug.cgi?id=138868
+
+        Reviewed by Carlos Garcia Campos.
+
+        Fix copypaste error in documentation of
+        webkit_print_operation_get_page_setup().
+
+        * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+
 2014-11-15  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Network process crash when running http/tests/appcache/fallback.html

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp
@@ -357,7 +357,7 @@ void webkit_print_operation_set_print_settings(WebKitPrintOperation* printOperat
  * @print_operation: a #WebKitPrintOperation
  *
  * Return the current page setup of @print_operation. It returns %NULL until
- * either webkit_print_operation_set_print_settings() or webkit_print_operation_run_dialog()
+ * either webkit_print_operation_set_page_setup() or webkit_print_operation_run_dialog()
  * have been called.
  *
  * Returns: (transfer none): the current #GtkPageSetup of @print_operation.