Merge lp:~midori/midori/valaDocs into lp:midori

Proposed by Christian Dywan
Status: Work in progress
Proposed branch: lp:~midori/midori/valaDocs
Merge into: lp:midori
Diff against target: 558 lines (+120/-96)
19 files modified
CMakeLists.txt (+10/-9)
docs/CMakeLists.txt (+51/-0)
docs/api/CMakeLists.txt (+0/-14)
extensions/CMakeLists.txt (+8/-4)
extensions/apps.vala (+2/-0)
extensions/devpet.vala (+1/-1)
extensions/history-list.vala (+1/-1)
extensions/tabby.vala (+1/-1)
katze/katze-item.c (+2/-5)
katze/katze-preferences.c (+2/-6)
katze/katze.vapi (+1/-0)
midori/CMakeLists.txt (+2/-1)
midori/midori-browser.c (+1/-2)
midori/midori-download.vala (+4/-10)
midori/midori-speeddial.vala (+0/-8)
midori/midori-view.c (+1/-3)
midori/midori.vapi (+10/-29)
midori/sokoke.vapi (+22/-0)
tests/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~midori/midori/valaDocs
Reviewer Review Type Date Requested Status
Midori Devs Pending
Review via email: mp+208676@code.launchpad.net

Commit message

Replace gtk-doc with valadoc

Description of the change

TODO:
 - cross-link valadoc.org
 - comments from genuine .c files aren't included

To post a comment you must log in.
lp:~midori/midori/valaDocs updated
6574. By Christian Dywan

Fix relation between vapi's and namespaces

Unmerged revisions

6574. By Christian Dywan

Fix relation between vapi's and namespaces

6573. By Christian Dywan

Replace gtk-doc with valadoc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-02-25 23:30:51 +0000
+++ CMakeLists.txt 2014-02-28 21:47:46 +0000
@@ -26,10 +26,14 @@
26 OUTPUT_VARIABLE REVISION26 OUTPUT_VARIABLE REVISION
27 ERROR_QUIET27 ERROR_QUIET
28 OUTPUT_STRIP_TRAILING_WHITESPACE)28 OUTPUT_STRIP_TRAILING_WHITESPACE)
29set(VALACFLAGS
30 --enable-deprecated
31 --debug
32 )
29if (REVISION)33if (REVISION)
30 set(VERSION "${VERSION}~r${REVISION}")34 set(VERSION "${VERSION}~r${REVISION}")
31 # All warnings are errors in development builds35 # All warnings are errors in development builds
32 set(VALAFLAGS ${VALAFLAGS} --fatal-warnings)36 set(VALACFLAGS ${VALACFLAGS} --fatal-warnings)
33 set(CFLAGS "${CFLAGS}")37 set(CFLAGS "${CFLAGS}")
34endif ()38endif ()
35add_definitions("-DPACKAGE_VERSION=\"${VERSION}\"")39add_definitions("-DPACKAGE_VERSION=\"${VERSION}\"")
@@ -40,10 +44,6 @@
4044
41find_package(Vala REQUIRED)45find_package(Vala REQUIRED)
42vala_require("0.16.0")46vala_require("0.16.0")
43set(VALAFLAGS ${VALAFLAGS}
44 --enable-deprecated
45 --debug
46 )
4747
48include(GNUInstallDirs)48include(GNUInstallDirs)
49set(DATADIR ${CMAKE_INSTALL_FULL_DATADIR})49set(DATADIR ${CMAKE_INSTALL_FULL_DATADIR})
@@ -237,6 +237,8 @@
237 set(PKGS ${PKGS} gtk+-2.0)237 set(PKGS ${PKGS} gtk+-2.0)
238 set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")238 set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
239endif ()239endif ()
240set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/katze/katze.vapi")
241set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/sokoke.vapi")
240242
241# dh_translations detects this if there's no variable used243# dh_translations detects this if there's no variable used
242set (GETTEXT_PACKAGE "midori")244set (GETTEXT_PACKAGE "midori")
@@ -268,6 +270,8 @@
268# Explicitly add -fPIC for older toolchains270# Explicitly add -fPIC for older toolchains
269set(VALA_CFLAGS "-w -g -fPIC")271set(VALA_CFLAGS "-w -g -fPIC")
270272
273set(VALACFLAGS ${VALACFLAGS} ${VALAFLAGS})
274
271set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core")275set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core")
272276
273# CMake provides no uninstall target by design277# CMake provides no uninstall target by design
@@ -284,7 +288,4 @@
284add_subdirectory (icons)288add_subdirectory (icons)
285add_subdirectory (data)289add_subdirectory (data)
286add_subdirectory (config)290add_subdirectory (config)
287291add_subdirectory (docs)
288if (USE_APIDOCS)
289 add_subdirectory (docs/api)
290endif ()
291292
=== added file 'docs/CMakeLists.txt'
--- docs/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ docs/CMakeLists.txt 2014-02-28 21:47:46 +0000
@@ -0,0 +1,51 @@
1# Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
2
3# Serialize deps packages for valadoc
4foreach(pkg ${PKGS})
5 list(APPEND VALADOC_PKG_OPTS "--pkg=${pkg}")
6endforeach()
7
8# Source files to scan
9file(GLOB SRC_FILES
10 ${CMAKE_SOURCE_DIR}/katze/*.c
11 ${CMAKE_SOURCE_DIR}/midori/*.c
12 ${CMAKE_SOURCE_DIR}/katze/*.vala
13 ${CMAKE_SOURCE_DIR}/midori/*.vala
14 ${EXTRA_VAPIS}
15 ${CMAKE_SOURCE_DIR}/midori/midori.vapi
16 )
17
18set(BASE_VALADOC_COMMAND
19 valadoc
20 ${VALAFLAGS}
21 ${VALADOC_PKG_OPTS}
22 ${SRC_FILES}
23 --target-glib=2.32.3
24 --package-name=${CMAKE_PROJECT_NAME}
25 --package-version=${VERSION})
26
27# C API Documentation
28
29add_custom_target(cdocs)
30set(C_API_DOC_DIR "${CMAKE_CURRENT_BINARY_DIR}/api/c")
31add_custom_command(TARGET cdocs
32 DEPENDS ${LIBMIDORI}
33 COMMAND rm ${C_API_DOC_DIR} -R -f # delete previous files
34 COMMAND ${BASE_VALADOC_COMMAND} ${VALADOC_PKG_OPTS} -o ${C_API_DOC_DIR}
35 --doclet-arg=${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.h --doclet=gtkdoc
36 )
37
38# Vala API documentation
39
40add_custom_target(valadocs)
41set(VALA_API_DOC_DIR "${CMAKE_CURRENT_BINARY_DIR}/api/vala")
42add_custom_command(TARGET valadocs
43 COMMAND rm ${VALA_API_DOC_DIR} -R -f # delete previous files
44 COMMAND ${BASE_VALADOC_COMMAND} --doclet=html -o ${VALA_API_DOC_DIR}
45 )
46
47# All the documents
48if (USE_APIDOCS)
49 set(DOCS_IN_ALL "ALL")
50endif ()
51add_custom_target(docs ${DOCS_IN_ALL} DEPENDS cdocs valadocs)
052
=== removed file 'docs/api/CMakeLists.txt'
--- docs/api/CMakeLists.txt 2013-09-26 21:57:12 +0000
+++ docs/api/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1# Copyright (C) 2013 Olivier Duchateau
2
3include (GtkDoc)
4
5if (GTKDOC_FOUND)
6 list (APPEND MODULES "katze" "midori")
7 foreach (MOD ${MODULES})
8 if (EXISTS "${CMAKE_SOURCE_DIR}/${MOD}")
9 gtkdoc (${MOD})
10 endif ()
11 endforeach ()
12else ()
13 message (FATAL_ERROR "gtk-doc not found")
14endif ()
150
=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt 2014-02-12 20:29:54 +0000
+++ extensions/CMakeLists.txt 2014-02-28 21:47:46 +0000
@@ -53,11 +53,13 @@
53 PACKAGES53 PACKAGES
54 ${PKGS}54 ${PKGS}
55 OPTIONS55 OPTIONS
56 ${VALAFLAGS}56 ${VALACFLAGS}
57 --use-header="${CMAKE_PROJECT_NAME}-core.h"
58 GENERATE_HEADER
59 "${UNIT_SRC}"
57 CUSTOM_VAPIS60 CUSTOM_VAPIS
58 ${EXTRA_VAPIS}61 ${EXTRA_VAPIS}
59 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"62 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
60 "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
61 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"63 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
62 )64 )
63 set(UNIT_FILES ${UNIT_FILES} ${UNIT_SRC_C})65 set(UNIT_FILES ${UNIT_FILES} ${UNIT_SRC_C})
@@ -87,11 +89,13 @@
87 PACKAGES89 PACKAGES
88 ${PKGS}90 ${PKGS}
89 OPTIONS91 OPTIONS
90 ${VALAFLAGS}92 ${VALACFLAGS}
93 --use-header="${CMAKE_PROJECT_NAME}-core.h"
94 GENERATE_HEADER
95 "${UNIT}"
91 CUSTOM_VAPIS96 CUSTOM_VAPIS
92 ${EXTRA_VAPIS}97 ${EXTRA_VAPIS}
93 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"98 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
94 "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
95 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"99 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
96 )100 )
97 add_library(${UNIT} MODULE ${UNIT_SRC_C})101 add_library(${UNIT} MODULE ${UNIT_SRC_C})
98102
=== modified file 'extensions/apps.vala'
--- extensions/apps.vala 2014-01-25 21:34:30 +0000
+++ extensions/apps.vala 2014-02-28 21:47:46 +0000
@@ -9,6 +9,8 @@
9 See the file COPYING for the full license text.9 See the file COPYING for the full license text.
10*/10*/
1111
12extern const string PACKAGE_NAME;
13
12namespace Apps {14namespace Apps {
13 const string APP_PREFIX = PACKAGE_NAME + " -a ";15 const string APP_PREFIX = PACKAGE_NAME + " -a ";
14 const string PROFILE_PREFIX = PACKAGE_NAME + " -c ";16 const string PROFILE_PREFIX = PACKAGE_NAME + " -c ";
1517
=== modified file 'extensions/devpet.vala'
--- extensions/devpet.vala 2013-11-17 22:47:25 +0000
+++ extensions/devpet.vala 2014-02-28 21:47:46 +0000
@@ -193,7 +193,7 @@
193 void* buffer[100];193 void* buffer[100];
194 int num = Linux.backtrace (buffer, 100);194 int num = Linux.backtrace (buffer, 100);
195 /* Upstream bug: https://git.gnome.org/browse/vala/commit/?id=f402af94e8471c8314ee7a312260a776e4d6fbe2 */195 /* Upstream bug: https://git.gnome.org/browse/vala/commit/?id=f402af94e8471c8314ee7a312260a776e4d6fbe2 */
196 unowned string[] symbols = Midori.Linux.backtrace_symbols (buffer, num);196 unowned string[] symbols = NotLinux.backtrace_symbols (buffer, num);
197 if (symbols != null) {197 if (symbols != null) {
198 /* we don't need the first three lines */198 /* we don't need the first three lines */
199 for (int i = 3; i < num; i++) {199 for (int i = 3; i < num; i++) {
200200
=== modified file 'extensions/history-list.vala'
--- extensions/history-list.vala 2013-10-28 22:33:16 +0000
+++ extensions/history-list.vala 2014-02-28 21:47:46 +0000
@@ -442,7 +442,7 @@
442442
443 if (this.history_window == null || this.history_window.get_type () != type) {443 if (this.history_window == null || this.history_window.get_type () != type) {
444 if (this.history_window == null) {444 if (this.history_window == null) {
445 this.modifier_count = Midori.Sokoke.gtk_action_count_modifiers (action);445 this.modifier_count = Sokoke.gtk_action_count_modifiers (action);
446 this.tmp_sig_ids[0] = browser.key_press_event.connect ((ek) => {446 this.tmp_sig_ids[0] = browser.key_press_event.connect ((ek) => {
447 return this.key_press (ek);447 return this.key_press (ek);
448 });448 });
449449
=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala 2014-01-12 18:15:53 +0000
+++ extensions/tabby.vala 2014-02-28 21:47:46 +0000
@@ -710,7 +710,7 @@
710 for(int i = 0; uris[i] != null; i++) {710 for(int i = 0; uris[i] != null; i++) {
711 Katze.Item item = new Katze.Item ();711 Katze.Item item = new Katze.Item ();
712 item.name = uris[i];712 item.name = uris[i];
713 item.uri = Midori.Sokoke.magic_uri (uris[i], true, true);713 item.uri = Sokoke.magic_uri (uris[i], true, true);
714 if (item.uri != null) {714 if (item.uri != null) {
715 tabs.add_item (item);715 tabs.add_item (item);
716 }716 }
717717
=== modified file 'katze/katze-item.c'
--- katze/katze-item.c 2013-08-05 19:52:52 +0000
+++ katze/katze-item.c 2014-02-28 21:47:46 +0000
@@ -499,8 +499,7 @@
499 *499 *
500 * Return value: the icon of the item500 * Return value: the icon of the item
501 *501 *
502 * Since: 0.4.4502 * Since: 0.4.4: as of 0.4.8 a @widget was added and the image is visible.
503 * Since 0.4.8 a @widget was added and the image is visible.
504 **/503 **/
505GtkWidget*504GtkWidget*
506katze_item_get_image (KatzeItem* item,505katze_item_get_image (KatzeItem* item,
@@ -637,9 +636,7 @@
637 *636 *
638 * Return value: a string, or %NULL637 * Return value: a string, or %NULL
639 *638 *
640 * Since: 0.1.8639 * Since: 0.1.8: as of 0.4.4 "" is treated like %NULL.
641 *
642 * Since 0.4.4 "" is treated like %NULL.
643 **/640 **/
644const gchar*641const gchar*
645katze_item_get_meta_string (KatzeItem* item,642katze_item_get_meta_string (KatzeItem* item,
646643
=== modified file 'katze/katze-preferences.c'
--- katze/katze-preferences.c 2013-12-09 20:17:51 +0000
+++ katze/katze-preferences.c 2014-02-28 21:47:46 +0000
@@ -195,9 +195,7 @@
195 *195 *
196 * Adds a new category with the specified label to the dialog.196 * Adds a new category with the specified label to the dialog.
197 *197 *
198 * Since: 0.2.1198 * Since: 0.2.1: as of 0.3.4 a #GtkBox is returned that can be packed into.
199 *
200 * Since 0.3.4 a #GtkBox is returned that can be packed into.
201 **/199 **/
202GtkWidget*200GtkWidget*
203katze_preferences_add_category (KatzePreferences* preferences,201katze_preferences_add_category (KatzePreferences* preferences,
@@ -265,9 +263,7 @@
265 *263 *
266 * Adds a new group with the specified label to the dialog.264 * Adds a new group with the specified label to the dialog.
267 *265 *
268 * Since: 0.2.1266 * Since: 0.2.1: as of 0.3.4 you can pass %NULL to hide the label.
269 *
270 * Since 0.3.4 you can pass %NULL to hide the label.
271 **/267 **/
272void268void
273katze_preferences_add_group (KatzePreferences* preferences,269katze_preferences_add_group (KatzePreferences* preferences,
274270
=== modified file 'katze/katze.vapi'
--- katze/katze.vapi 2014-02-22 14:06:19 +0000
+++ katze/katze.vapi 2014-02-28 21:47:46 +0000
@@ -3,6 +3,7 @@
33
4[CCode (cprefix = "Katze", lower_case_cprefix = "katze_")]4[CCode (cprefix = "Katze", lower_case_cprefix = "katze_")]
5namespace Katze {5namespace Katze {
6 public static string mkdir_with_parents (string pathname, int mode);
6 static void assert_str_equal (string input, string result, string? expected);7 static void assert_str_equal (string input, string result, string? expected);
7 static unowned Gtk.Widget property_proxy (void* object, string property, string? hint);8 static unowned Gtk.Widget property_proxy (void* object, string property, string? hint);
8 [CCode (cheader_filename = "katze/katze.h", cprefix = "KATZE_MENU_POSITION_")]9 [CCode (cheader_filename = "katze/katze.h", cprefix = "KATZE_MENU_POSITION_")]
910
=== modified file 'midori/CMakeLists.txt'
--- midori/CMakeLists.txt 2013-09-08 21:38:36 +0000
+++ midori/CMakeLists.txt 2014-02-28 21:47:46 +0000
@@ -17,7 +17,8 @@
17PACKAGES17PACKAGES
18 ${PKGS}18 ${PKGS}
19OPTIONS19OPTIONS
20 ${VALAFLAGS}20 ${VALACFLAGS}
21 --use-header="${CMAKE_PROJECT_NAME}-core.h"
21CUSTOM_VAPIS22CUSTOM_VAPIS
22 ${EXTRA_VAPIS}23 ${EXTRA_VAPIS}
23GENERATE_VAPI24GENERATE_VAPI
2425
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c 2014-02-26 22:15:36 +0000
+++ midori/midori-browser.c 2014-02-28 21:47:46 +0000
@@ -2487,8 +2487,7 @@
2487 *2487 *
2488 * The speed dial configuration file.2488 * The speed dial configuration file.
2489 *2489 *
2490 * Since: 0.3.42490 * Since: 0.3.4: as of 0.4.7 this is a Midori.SpeedDial instance.
2491 * Since 0.4.7 this is a Midori.SpeedDial instance.
2492 */2491 */
2493 g_object_class_install_property (gobject_class,2492 g_object_class_install_property (gobject_class,
2494 PROP_SPEED_DIAL,2493 PROP_SPEED_DIAL,
24952494
=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala 2014-02-22 22:35:42 +0000
+++ midori/midori-download.vala 2014-02-28 21:47:46 +0000
@@ -9,12 +9,6 @@
9 See the file COPYING for the full license text.9 See the file COPYING for the full license text.
10*/10*/
1111
12namespace Sokoke {
13#if !HAVE_WEBKIT2
14 extern static bool message_dialog (Gtk.MessageType type, string short, string detailed, bool modal);
15#endif
16}
17
18namespace Midori {12namespace Midori {
19 namespace Download {13 namespace Download {
20 public static bool is_finished (WebKit.Download download) {14 public static bool is_finished (WebKit.Download download) {
@@ -219,7 +213,7 @@
219 tab.open_uri (download.destination_uri);213 tab.open_uri (download.destination_uri);
220 }214 }
221215
222 Sokoke.message_dialog (Gtk.MessageType.WARNING,216 Midori.show_message_dialog (Gtk.MessageType.WARNING,
223 _("The downloaded file is erroneous."),217 _("The downloaded file is erroneous."),
224 _("The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."),218 _("The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."),
225 true);219 true);
@@ -304,7 +298,7 @@
304 return filename;298 return filename;
305 }299 }
306300
307 /**301 /*
308 * Returns a string showing a file:// URI's intended filename on302 * Returns a string showing a file:// URI's intended filename on
309 * disk, suited for displaying to a user.303 * disk, suited for displaying to a user.
310 * 304 *
@@ -344,7 +338,7 @@
344338
345 /**339 /**
346 * Returns whether it seems possible to save @download to the path specified by340 * Returns whether it seems possible to save @download to the path specified by
347 * @destination_uri, considering space on disk and permissions341 * destination_uri, considering space on disk and permissions
348 */342 */
349 public static bool has_enough_space (WebKit.Download download, string destination_uri) {343 public static bool has_enough_space (WebKit.Download download, string destination_uri) {
350#if !HAVE_WEBKIT2344#if !HAVE_WEBKIT2
@@ -378,7 +372,7 @@
378 }372 }
379 else373 else
380 assert_not_reached ();374 assert_not_reached ();
381 Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);375 Midori.show_message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
382 return false;376 return false;
383 }377 }
384#endif378#endif
385379
=== modified file 'midori/midori-speeddial.vala'
--- midori/midori-speeddial.vala 2013-10-28 23:08:02 +0000
+++ midori/midori-speeddial.vala 2014-02-28 21:47:46 +0000
@@ -9,14 +9,6 @@
9 See the file COPYING for the full license text.9 See the file COPYING for the full license text.
10*/10*/
1111
12namespace Katze {
13 extern static string mkdir_with_parents (string pathname, int mode);
14}
15
16namespace Sokoke {
17 extern static string js_script_eval (void* ctx, string script, void* error);
18}
19
20namespace Midori {12namespace Midori {
21 public errordomain SpeedDialError {13 public errordomain SpeedDialError {
22 INVALID_MESSAGE,14 INVALID_MESSAGE,
2315
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c 2014-02-22 22:35:42 +0000
+++ midori/midori-view.c 2014-02-28 21:47:46 +0000
@@ -225,9 +225,7 @@
225 * @where determines where to open the view according225 * @where determines where to open the view according
226 * to how it was opened and user preferences.226 * to how it was opened and user preferences.
227 *227 *
228 * Since: 0.1.2228 * Since: 0.1.2 as of 0.3.4 a boolean argument was added.
229 *
230 * Since 0.3.4 a boolean argument was added.
231 */229 */
232 signals[NEW_VIEW] = g_signal_new (230 signals[NEW_VIEW] = g_signal_new (
233 "new-view",231 "new-view",
234232
=== modified file 'midori/midori.vapi'
--- midori/midori.vapi 2014-02-22 14:06:19 +0000
+++ midori/midori.vapi 2014-02-28 21:47:46 +0000
@@ -1,18 +1,17 @@
1/* Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>1/* Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
2 This file is licensed under the terms of the expat license, see the file EXPAT. */2 This file is licensed under the terms of the expat license, see the file EXPAT. */
33
4public const string PACKAGE_NAME;
5
6[CCode (cprefix = "Midori", lower_case_cprefix = "midori_")]4[CCode (cprefix = "Midori", lower_case_cprefix = "midori_")]
7namespace Midori {5namespace Midori {
8 public const string VERSION_SUFFIX;6 public const string VERSION_SUFFIX;
7 [CCode (cheader_filename = "midori/midori-stock.h")]
9 namespace Stock {8 namespace Stock {
10 public const string WEB_BROWSER;9 public const string WEB_BROWSER;
11 public const string TRANSFER;10 public const string TRANSFER;
12 public const string PLUGINS;11 public const string PLUGINS;
13 }12 }
1413
15 [CCode (cheader_filename = "midori/midori.h")]14 [CCode (cheader_filename = "midori/midori-frontend.h")]
16 public static unowned Midori.Browser web_app_new (15 public static unowned Midori.Browser web_app_new (
17 string webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);16 string webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
18 public static unowned Midori.Browser private_app_new (string? config,17 public static unowned Midori.Browser private_app_new (string? config,
@@ -24,7 +23,7 @@
24 [CCode (cheader_filename = "midori/midori-array.h")]23 [CCode (cheader_filename = "midori/midori-array.h")]
25 public static bool array_from_file (Katze.Array array, string filename, string format) throws GLib.Error;24 public static bool array_from_file (Katze.Array array, string filename, string format) throws GLib.Error;
2625
27 [CCode (cheader_filename = "midori/midori.h")]26 [CCode (cheader_filename = "midori/midori-app.h")]
28 public class App : GLib.Object {27 public class App : GLib.Object {
29 public App (string? name=null);28 public App (string? name=null);
30 public static void setup ([CCode (array_length_pos = 0.9)] ref unowned string[] args, [CCode (array_length = false)] GLib.OptionEntry[]? entries);29 public static void setup ([CCode (array_length_pos = 0.9)] ref unowned string[] args, [CCode (array_length = false)] GLib.OptionEntry[]? entries);
@@ -60,7 +59,7 @@
60 public signal void quit ();59 public signal void quit ();
61 }60 }
6261
63 [CCode (cheader_filename = "midori/midori.h")]62 [CCode (cheader_filename = "midori/midori-browser.h")]
64 public class Browser : Gtk.Window {63 public class Browser : Gtk.Window {
65 public Browser ();64 public Browser ();
66 public unowned Gtk.Widget add_item (Katze.Item item);65 public unowned Gtk.Widget add_item (Katze.Item item);
@@ -121,13 +120,13 @@
121 public signal void show_preferences (Katze.Preferences preferences);120 public signal void show_preferences (Katze.Preferences preferences);
122 }121 }
123122
124 [CCode (cheader_filename = "midori/midori.h")]123 [CCode (cheader_filename = "midori/midori-panel.h")]
125 public class Panel : Gtk.HBox {124 public class Panel : Gtk.HBox {
126 public Panel ();125 public Panel ();
127 public int append_page (Midori.Viewable viewable);126 public int append_page (Midori.Viewable viewable);
128 }127 }
129128
130 [CCode (cheader_filename = "midori/midori.h")]129 [CCode (cheader_filename = "midori/midori-extension.h")]
131 public class Extension : GLib.Object {130 public class Extension : GLib.Object {
132 [CCode (has_construct_function = false)]131 [CCode (has_construct_function = false)]
133 public Extension ();132 public Extension ();
@@ -173,7 +172,7 @@
173 public static void load_from_folder (Midori.App app, [CCode (array_length = false)] string[]? keys, bool activate);172 public static void load_from_folder (Midori.App app, [CCode (array_length = false)] string[]? keys, bool activate);
174 }173 }
175174
176 [CCode (cheader_filename = "midori/midori.h")]175 [CCode (cheader_filename = "midori/midori-view.h")]
177 public class View : Tab {176 public class View : Tab {
178 [CCode (type = "GtkWidget*")]177 [CCode (type = "GtkWidget*")]
179 public View.with_title (string? title=null, WebSettings? settings=null178 public View.with_title (string? title=null, WebSettings? settings=null
@@ -214,13 +213,13 @@
214 public signal void new_view (Midori.View new_view, Midori.NewView where, bool user_initiated);213 public signal void new_view (Midori.View new_view, Midori.NewView where, bool user_initiated);
215 }214 }
216215
217 [CCode (cheader_filename = "midori/midori.h")]216 [CCode (cheader_filename = "midori/midori-locationaction.h")]
218 public class LocationAction : Gtk.Action {217 public class LocationAction : Gtk.Action {
219 public static string render_uri ([CCode (array_length = false)] string[] keys, string uri_escaped);218 public static string render_uri ([CCode (array_length = false)] string[] keys, string uri_escaped);
220 public static string render_title ([CCode (array_length = false)] string[] keys, string title);219 public static string render_title ([CCode (array_length = false)] string[] keys, string title);
221 }220 }
222221
223 [CCode (cheader_filename = "midori/midori.h")]222 [CCode (cheader_filename = "midori/midori-searchaction.h")]
224 public class SearchAction : Gtk.Action {223 public class SearchAction : Gtk.Action {
225 public static Katze.Item? get_engine_for_form (WebKit.WebView web_view, Pango.EllipsizeMode ellipsize);224 public static Katze.Item? get_engine_for_form (WebKit.WebView web_view, Pango.EllipsizeMode ellipsize);
226 }225 }
@@ -241,7 +240,7 @@
241 PENDING_UNDELAY,240 PENDING_UNDELAY,
242 }241 }
243242
244 [CCode (cheader_filename = "midori/midori.h")]243 [CCode (cheader_filename = "midori/midori-websettings.h")]
245 public class WebSettings : Midori.Settings {244 public class WebSettings : Midori.Settings {
246 public WebSettings ();245 public WebSettings ();
247 [NoAccessorMethod]246 [NoAccessorMethod]
@@ -257,23 +256,5 @@
257 LAST_OPEN_PAGES,256 LAST_OPEN_PAGES,
258 DELAYED_PAGES257 DELAYED_PAGES
259 }258 }
260
261 [CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")]
262 namespace Sokoke {
263 public static string magic_uri (string uri, bool allow_search, bool allow_relative);
264 public static uint gtk_action_count_modifiers (Gtk.Action action);
265 #if HAVE_WIN32
266 public static string get_win32_desktop_lnk_path_for_filename (string filename);
267 public static void create_win32_desktop_lnk (string prefix, string filename, string uri);
268 #endif
269 }
270
271 #if HAVE_EXECINFO_H
272 [CCode (lower_case_cprefix = "")]
273 namespace Linux {
274 [CCode (cheader_filename = "execinfo.h", array_length = false)]
275 public unowned string[] backtrace_symbols (void* buffer, int size);
276 }
277 #endif
278}259}
279260
280261
=== added file 'midori/sokoke.vapi'
--- midori/sokoke.vapi 1970-01-01 00:00:00 +0000
+++ midori/sokoke.vapi 2014-02-28 21:47:46 +0000
@@ -0,0 +1,22 @@
1/* Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
2 This file is licensed under the terms of the expat license, see the file EXPAT. */
3
4[CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")]
5namespace Sokoke {
6 public static string magic_uri (string uri, bool allow_search, bool allow_relative);
7 public static uint gtk_action_count_modifiers (Gtk.Action action);
8#if HAVE_WIN32
9 public static string get_win32_desktop_lnk_path_for_filename (string filename);
10 public static void create_win32_desktop_lnk (string prefix, string filename, string uri);
11#endif
12 public static string js_script_eval (void* ctx, string script, void* error);
13}
14
15#if HAVE_EXECINFO_H
16[CCode (lower_case_cprefix = "")]
17namespace NotLinux {
18 [CCode (cheader_filename = "execinfo.h", array_length = false)]
19 public unowned string[] backtrace_symbols (void* buffer, int size);
20}
21#endif
22
023
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2013-10-01 21:35:39 +0000
+++ tests/CMakeLists.txt 2014-02-28 21:47:46 +0000
@@ -22,11 +22,10 @@
22 PACKAGES22 PACKAGES
23 ${PKGS}23 ${PKGS}
24 OPTIONS24 OPTIONS
25 ${VALAFLAGS}25 ${VALACFLAGS}
26 CUSTOM_VAPIS26 CUSTOM_VAPIS
27 ${EXTRA_VAPIS}27 ${EXTRA_VAPIS}
28 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"28 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
29 "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
30 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"29 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
31 )30 )
3231

Subscribers

People subscribed via source and target branches

to all changes: