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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-25 23:30:51 +0000
3+++ CMakeLists.txt 2014-02-28 21:47:46 +0000
4@@ -26,10 +26,14 @@
5 OUTPUT_VARIABLE REVISION
6 ERROR_QUIET
7 OUTPUT_STRIP_TRAILING_WHITESPACE)
8+set(VALACFLAGS
9+ --enable-deprecated
10+ --debug
11+ )
12 if (REVISION)
13 set(VERSION "${VERSION}~r${REVISION}")
14 # All warnings are errors in development builds
15- set(VALAFLAGS ${VALAFLAGS} --fatal-warnings)
16+ set(VALACFLAGS ${VALACFLAGS} --fatal-warnings)
17 set(CFLAGS "${CFLAGS}")
18 endif ()
19 add_definitions("-DPACKAGE_VERSION=\"${VERSION}\"")
20@@ -40,10 +44,6 @@
21
22 find_package(Vala REQUIRED)
23 vala_require("0.16.0")
24-set(VALAFLAGS ${VALAFLAGS}
25- --enable-deprecated
26- --debug
27- )
28
29 include(GNUInstallDirs)
30 set(DATADIR ${CMAKE_INSTALL_FULL_DATADIR})
31@@ -237,6 +237,8 @@
32 set(PKGS ${PKGS} gtk+-2.0)
33 set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
34 endif ()
35+set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/katze/katze.vapi")
36+set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/sokoke.vapi")
37
38 # dh_translations detects this if there's no variable used
39 set (GETTEXT_PACKAGE "midori")
40@@ -268,6 +270,8 @@
41 # Explicitly add -fPIC for older toolchains
42 set(VALA_CFLAGS "-w -g -fPIC")
43
44+set(VALACFLAGS ${VALACFLAGS} ${VALAFLAGS})
45+
46 set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core")
47
48 # CMake provides no uninstall target by design
49@@ -284,7 +288,4 @@
50 add_subdirectory (icons)
51 add_subdirectory (data)
52 add_subdirectory (config)
53-
54-if (USE_APIDOCS)
55- add_subdirectory (docs/api)
56-endif ()
57+add_subdirectory (docs)
58
59=== added file 'docs/CMakeLists.txt'
60--- docs/CMakeLists.txt 1970-01-01 00:00:00 +0000
61+++ docs/CMakeLists.txt 2014-02-28 21:47:46 +0000
62@@ -0,0 +1,51 @@
63+# Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
64+
65+# Serialize deps packages for valadoc
66+foreach(pkg ${PKGS})
67+ list(APPEND VALADOC_PKG_OPTS "--pkg=${pkg}")
68+endforeach()
69+
70+# Source files to scan
71+file(GLOB SRC_FILES
72+ ${CMAKE_SOURCE_DIR}/katze/*.c
73+ ${CMAKE_SOURCE_DIR}/midori/*.c
74+ ${CMAKE_SOURCE_DIR}/katze/*.vala
75+ ${CMAKE_SOURCE_DIR}/midori/*.vala
76+ ${EXTRA_VAPIS}
77+ ${CMAKE_SOURCE_DIR}/midori/midori.vapi
78+ )
79+
80+set(BASE_VALADOC_COMMAND
81+ valadoc
82+ ${VALAFLAGS}
83+ ${VALADOC_PKG_OPTS}
84+ ${SRC_FILES}
85+ --target-glib=2.32.3
86+ --package-name=${CMAKE_PROJECT_NAME}
87+ --package-version=${VERSION})
88+
89+# C API Documentation
90+
91+add_custom_target(cdocs)
92+set(C_API_DOC_DIR "${CMAKE_CURRENT_BINARY_DIR}/api/c")
93+add_custom_command(TARGET cdocs
94+ DEPENDS ${LIBMIDORI}
95+ COMMAND rm ${C_API_DOC_DIR} -R -f # delete previous files
96+ COMMAND ${BASE_VALADOC_COMMAND} ${VALADOC_PKG_OPTS} -o ${C_API_DOC_DIR}
97+ --doclet-arg=${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.h --doclet=gtkdoc
98+ )
99+
100+# Vala API documentation
101+
102+add_custom_target(valadocs)
103+set(VALA_API_DOC_DIR "${CMAKE_CURRENT_BINARY_DIR}/api/vala")
104+add_custom_command(TARGET valadocs
105+ COMMAND rm ${VALA_API_DOC_DIR} -R -f # delete previous files
106+ COMMAND ${BASE_VALADOC_COMMAND} --doclet=html -o ${VALA_API_DOC_DIR}
107+ )
108+
109+# All the documents
110+if (USE_APIDOCS)
111+ set(DOCS_IN_ALL "ALL")
112+endif ()
113+add_custom_target(docs ${DOCS_IN_ALL} DEPENDS cdocs valadocs)
114
115=== removed file 'docs/api/CMakeLists.txt'
116--- docs/api/CMakeLists.txt 2013-09-26 21:57:12 +0000
117+++ docs/api/CMakeLists.txt 1970-01-01 00:00:00 +0000
118@@ -1,14 +0,0 @@
119-# Copyright (C) 2013 Olivier Duchateau
120-
121-include (GtkDoc)
122-
123-if (GTKDOC_FOUND)
124- list (APPEND MODULES "katze" "midori")
125- foreach (MOD ${MODULES})
126- if (EXISTS "${CMAKE_SOURCE_DIR}/${MOD}")
127- gtkdoc (${MOD})
128- endif ()
129- endforeach ()
130-else ()
131- message (FATAL_ERROR "gtk-doc not found")
132-endif ()
133
134=== modified file 'extensions/CMakeLists.txt'
135--- extensions/CMakeLists.txt 2014-02-12 20:29:54 +0000
136+++ extensions/CMakeLists.txt 2014-02-28 21:47:46 +0000
137@@ -53,11 +53,13 @@
138 PACKAGES
139 ${PKGS}
140 OPTIONS
141- ${VALAFLAGS}
142+ ${VALACFLAGS}
143+ --use-header="${CMAKE_PROJECT_NAME}-core.h"
144+ GENERATE_HEADER
145+ "${UNIT_SRC}"
146 CUSTOM_VAPIS
147 ${EXTRA_VAPIS}
148 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
149- "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
150 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
151 )
152 set(UNIT_FILES ${UNIT_FILES} ${UNIT_SRC_C})
153@@ -87,11 +89,13 @@
154 PACKAGES
155 ${PKGS}
156 OPTIONS
157- ${VALAFLAGS}
158+ ${VALACFLAGS}
159+ --use-header="${CMAKE_PROJECT_NAME}-core.h"
160+ GENERATE_HEADER
161+ "${UNIT}"
162 CUSTOM_VAPIS
163 ${EXTRA_VAPIS}
164 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
165- "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
166 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
167 )
168 add_library(${UNIT} MODULE ${UNIT_SRC_C})
169
170=== modified file 'extensions/apps.vala'
171--- extensions/apps.vala 2014-01-25 21:34:30 +0000
172+++ extensions/apps.vala 2014-02-28 21:47:46 +0000
173@@ -9,6 +9,8 @@
174 See the file COPYING for the full license text.
175 */
176
177+extern const string PACKAGE_NAME;
178+
179 namespace Apps {
180 const string APP_PREFIX = PACKAGE_NAME + " -a ";
181 const string PROFILE_PREFIX = PACKAGE_NAME + " -c ";
182
183=== modified file 'extensions/devpet.vala'
184--- extensions/devpet.vala 2013-11-17 22:47:25 +0000
185+++ extensions/devpet.vala 2014-02-28 21:47:46 +0000
186@@ -193,7 +193,7 @@
187 void* buffer[100];
188 int num = Linux.backtrace (buffer, 100);
189 /* Upstream bug: https://git.gnome.org/browse/vala/commit/?id=f402af94e8471c8314ee7a312260a776e4d6fbe2 */
190- unowned string[] symbols = Midori.Linux.backtrace_symbols (buffer, num);
191+ unowned string[] symbols = NotLinux.backtrace_symbols (buffer, num);
192 if (symbols != null) {
193 /* we don't need the first three lines */
194 for (int i = 3; i < num; i++) {
195
196=== modified file 'extensions/history-list.vala'
197--- extensions/history-list.vala 2013-10-28 22:33:16 +0000
198+++ extensions/history-list.vala 2014-02-28 21:47:46 +0000
199@@ -442,7 +442,7 @@
200
201 if (this.history_window == null || this.history_window.get_type () != type) {
202 if (this.history_window == null) {
203- this.modifier_count = Midori.Sokoke.gtk_action_count_modifiers (action);
204+ this.modifier_count = Sokoke.gtk_action_count_modifiers (action);
205 this.tmp_sig_ids[0] = browser.key_press_event.connect ((ek) => {
206 return this.key_press (ek);
207 });
208
209=== modified file 'extensions/tabby.vala'
210--- extensions/tabby.vala 2014-01-12 18:15:53 +0000
211+++ extensions/tabby.vala 2014-02-28 21:47:46 +0000
212@@ -710,7 +710,7 @@
213 for(int i = 0; uris[i] != null; i++) {
214 Katze.Item item = new Katze.Item ();
215 item.name = uris[i];
216- item.uri = Midori.Sokoke.magic_uri (uris[i], true, true);
217+ item.uri = Sokoke.magic_uri (uris[i], true, true);
218 if (item.uri != null) {
219 tabs.add_item (item);
220 }
221
222=== modified file 'katze/katze-item.c'
223--- katze/katze-item.c 2013-08-05 19:52:52 +0000
224+++ katze/katze-item.c 2014-02-28 21:47:46 +0000
225@@ -499,8 +499,7 @@
226 *
227 * Return value: the icon of the item
228 *
229- * Since: 0.4.4
230- * Since 0.4.8 a @widget was added and the image is visible.
231+ * Since: 0.4.4: as of 0.4.8 a @widget was added and the image is visible.
232 **/
233 GtkWidget*
234 katze_item_get_image (KatzeItem* item,
235@@ -637,9 +636,7 @@
236 *
237 * Return value: a string, or %NULL
238 *
239- * Since: 0.1.8
240- *
241- * Since 0.4.4 "" is treated like %NULL.
242+ * Since: 0.1.8: as of 0.4.4 "" is treated like %NULL.
243 **/
244 const gchar*
245 katze_item_get_meta_string (KatzeItem* item,
246
247=== modified file 'katze/katze-preferences.c'
248--- katze/katze-preferences.c 2013-12-09 20:17:51 +0000
249+++ katze/katze-preferences.c 2014-02-28 21:47:46 +0000
250@@ -195,9 +195,7 @@
251 *
252 * Adds a new category with the specified label to the dialog.
253 *
254- * Since: 0.2.1
255- *
256- * Since 0.3.4 a #GtkBox is returned that can be packed into.
257+ * Since: 0.2.1: as of 0.3.4 a #GtkBox is returned that can be packed into.
258 **/
259 GtkWidget*
260 katze_preferences_add_category (KatzePreferences* preferences,
261@@ -265,9 +263,7 @@
262 *
263 * Adds a new group with the specified label to the dialog.
264 *
265- * Since: 0.2.1
266- *
267- * Since 0.3.4 you can pass %NULL to hide the label.
268+ * Since: 0.2.1: as of 0.3.4 you can pass %NULL to hide the label.
269 **/
270 void
271 katze_preferences_add_group (KatzePreferences* preferences,
272
273=== modified file 'katze/katze.vapi'
274--- katze/katze.vapi 2014-02-22 14:06:19 +0000
275+++ katze/katze.vapi 2014-02-28 21:47:46 +0000
276@@ -3,6 +3,7 @@
277
278 [CCode (cprefix = "Katze", lower_case_cprefix = "katze_")]
279 namespace Katze {
280+ public static string mkdir_with_parents (string pathname, int mode);
281 static void assert_str_equal (string input, string result, string? expected);
282 static unowned Gtk.Widget property_proxy (void* object, string property, string? hint);
283 [CCode (cheader_filename = "katze/katze.h", cprefix = "KATZE_MENU_POSITION_")]
284
285=== modified file 'midori/CMakeLists.txt'
286--- midori/CMakeLists.txt 2013-09-08 21:38:36 +0000
287+++ midori/CMakeLists.txt 2014-02-28 21:47:46 +0000
288@@ -17,7 +17,8 @@
289 PACKAGES
290 ${PKGS}
291 OPTIONS
292- ${VALAFLAGS}
293+ ${VALACFLAGS}
294+ --use-header="${CMAKE_PROJECT_NAME}-core.h"
295 CUSTOM_VAPIS
296 ${EXTRA_VAPIS}
297 GENERATE_VAPI
298
299=== modified file 'midori/midori-browser.c'
300--- midori/midori-browser.c 2014-02-26 22:15:36 +0000
301+++ midori/midori-browser.c 2014-02-28 21:47:46 +0000
302@@ -2487,8 +2487,7 @@
303 *
304 * The speed dial configuration file.
305 *
306- * Since: 0.3.4
307- * Since 0.4.7 this is a Midori.SpeedDial instance.
308+ * Since: 0.3.4: as of 0.4.7 this is a Midori.SpeedDial instance.
309 */
310 g_object_class_install_property (gobject_class,
311 PROP_SPEED_DIAL,
312
313=== modified file 'midori/midori-download.vala'
314--- midori/midori-download.vala 2014-02-22 22:35:42 +0000
315+++ midori/midori-download.vala 2014-02-28 21:47:46 +0000
316@@ -9,12 +9,6 @@
317 See the file COPYING for the full license text.
318 */
319
320-namespace Sokoke {
321-#if !HAVE_WEBKIT2
322- extern static bool message_dialog (Gtk.MessageType type, string short, string detailed, bool modal);
323-#endif
324-}
325-
326 namespace Midori {
327 namespace Download {
328 public static bool is_finished (WebKit.Download download) {
329@@ -219,7 +213,7 @@
330 tab.open_uri (download.destination_uri);
331 }
332
333- Sokoke.message_dialog (Gtk.MessageType.WARNING,
334+ Midori.show_message_dialog (Gtk.MessageType.WARNING,
335 _("The downloaded file is erroneous."),
336 _("The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."),
337 true);
338@@ -304,7 +298,7 @@
339 return filename;
340 }
341
342- /**
343+ /*
344 * Returns a string showing a file:// URI's intended filename on
345 * disk, suited for displaying to a user.
346 *
347@@ -344,7 +338,7 @@
348
349 /**
350 * Returns whether it seems possible to save @download to the path specified by
351- * @destination_uri, considering space on disk and permissions
352+ * destination_uri, considering space on disk and permissions
353 */
354 public static bool has_enough_space (WebKit.Download download, string destination_uri) {
355 #if !HAVE_WEBKIT2
356@@ -378,7 +372,7 @@
357 }
358 else
359 assert_not_reached ();
360- Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
361+ Midori.show_message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
362 return false;
363 }
364 #endif
365
366=== modified file 'midori/midori-speeddial.vala'
367--- midori/midori-speeddial.vala 2013-10-28 23:08:02 +0000
368+++ midori/midori-speeddial.vala 2014-02-28 21:47:46 +0000
369@@ -9,14 +9,6 @@
370 See the file COPYING for the full license text.
371 */
372
373-namespace Katze {
374- extern static string mkdir_with_parents (string pathname, int mode);
375-}
376-
377-namespace Sokoke {
378- extern static string js_script_eval (void* ctx, string script, void* error);
379-}
380-
381 namespace Midori {
382 public errordomain SpeedDialError {
383 INVALID_MESSAGE,
384
385=== modified file 'midori/midori-view.c'
386--- midori/midori-view.c 2014-02-22 22:35:42 +0000
387+++ midori/midori-view.c 2014-02-28 21:47:46 +0000
388@@ -225,9 +225,7 @@
389 * @where determines where to open the view according
390 * to how it was opened and user preferences.
391 *
392- * Since: 0.1.2
393- *
394- * Since 0.3.4 a boolean argument was added.
395+ * Since: 0.1.2 as of 0.3.4 a boolean argument was added.
396 */
397 signals[NEW_VIEW] = g_signal_new (
398 "new-view",
399
400=== modified file 'midori/midori.vapi'
401--- midori/midori.vapi 2014-02-22 14:06:19 +0000
402+++ midori/midori.vapi 2014-02-28 21:47:46 +0000
403@@ -1,18 +1,17 @@
404 /* Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
405 This file is licensed under the terms of the expat license, see the file EXPAT. */
406
407-public const string PACKAGE_NAME;
408-
409 [CCode (cprefix = "Midori", lower_case_cprefix = "midori_")]
410 namespace Midori {
411 public const string VERSION_SUFFIX;
412+ [CCode (cheader_filename = "midori/midori-stock.h")]
413 namespace Stock {
414 public const string WEB_BROWSER;
415 public const string TRANSFER;
416 public const string PLUGINS;
417 }
418
419- [CCode (cheader_filename = "midori/midori.h")]
420+ [CCode (cheader_filename = "midori/midori-frontend.h")]
421 public static unowned Midori.Browser web_app_new (
422 string webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
423 public static unowned Midori.Browser private_app_new (string? config,
424@@ -24,7 +23,7 @@
425 [CCode (cheader_filename = "midori/midori-array.h")]
426 public static bool array_from_file (Katze.Array array, string filename, string format) throws GLib.Error;
427
428- [CCode (cheader_filename = "midori/midori.h")]
429+ [CCode (cheader_filename = "midori/midori-app.h")]
430 public class App : GLib.Object {
431 public App (string? name=null);
432 public static void setup ([CCode (array_length_pos = 0.9)] ref unowned string[] args, [CCode (array_length = false)] GLib.OptionEntry[]? entries);
433@@ -60,7 +59,7 @@
434 public signal void quit ();
435 }
436
437- [CCode (cheader_filename = "midori/midori.h")]
438+ [CCode (cheader_filename = "midori/midori-browser.h")]
439 public class Browser : Gtk.Window {
440 public Browser ();
441 public unowned Gtk.Widget add_item (Katze.Item item);
442@@ -121,13 +120,13 @@
443 public signal void show_preferences (Katze.Preferences preferences);
444 }
445
446- [CCode (cheader_filename = "midori/midori.h")]
447+ [CCode (cheader_filename = "midori/midori-panel.h")]
448 public class Panel : Gtk.HBox {
449 public Panel ();
450 public int append_page (Midori.Viewable viewable);
451 }
452
453- [CCode (cheader_filename = "midori/midori.h")]
454+ [CCode (cheader_filename = "midori/midori-extension.h")]
455 public class Extension : GLib.Object {
456 [CCode (has_construct_function = false)]
457 public Extension ();
458@@ -173,7 +172,7 @@
459 public static void load_from_folder (Midori.App app, [CCode (array_length = false)] string[]? keys, bool activate);
460 }
461
462- [CCode (cheader_filename = "midori/midori.h")]
463+ [CCode (cheader_filename = "midori/midori-view.h")]
464 public class View : Tab {
465 [CCode (type = "GtkWidget*")]
466 public View.with_title (string? title=null, WebSettings? settings=null
467@@ -214,13 +213,13 @@
468 public signal void new_view (Midori.View new_view, Midori.NewView where, bool user_initiated);
469 }
470
471- [CCode (cheader_filename = "midori/midori.h")]
472+ [CCode (cheader_filename = "midori/midori-locationaction.h")]
473 public class LocationAction : Gtk.Action {
474 public static string render_uri ([CCode (array_length = false)] string[] keys, string uri_escaped);
475 public static string render_title ([CCode (array_length = false)] string[] keys, string title);
476 }
477
478- [CCode (cheader_filename = "midori/midori.h")]
479+ [CCode (cheader_filename = "midori/midori-searchaction.h")]
480 public class SearchAction : Gtk.Action {
481 public static Katze.Item? get_engine_for_form (WebKit.WebView web_view, Pango.EllipsizeMode ellipsize);
482 }
483@@ -241,7 +240,7 @@
484 PENDING_UNDELAY,
485 }
486
487- [CCode (cheader_filename = "midori/midori.h")]
488+ [CCode (cheader_filename = "midori/midori-websettings.h")]
489 public class WebSettings : Midori.Settings {
490 public WebSettings ();
491 [NoAccessorMethod]
492@@ -257,23 +256,5 @@
493 LAST_OPEN_PAGES,
494 DELAYED_PAGES
495 }
496-
497- [CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")]
498- namespace Sokoke {
499- public static string magic_uri (string uri, bool allow_search, bool allow_relative);
500- public static uint gtk_action_count_modifiers (Gtk.Action action);
501- #if HAVE_WIN32
502- public static string get_win32_desktop_lnk_path_for_filename (string filename);
503- public static void create_win32_desktop_lnk (string prefix, string filename, string uri);
504- #endif
505- }
506-
507- #if HAVE_EXECINFO_H
508- [CCode (lower_case_cprefix = "")]
509- namespace Linux {
510- [CCode (cheader_filename = "execinfo.h", array_length = false)]
511- public unowned string[] backtrace_symbols (void* buffer, int size);
512- }
513- #endif
514 }
515
516
517=== added file 'midori/sokoke.vapi'
518--- midori/sokoke.vapi 1970-01-01 00:00:00 +0000
519+++ midori/sokoke.vapi 2014-02-28 21:47:46 +0000
520@@ -0,0 +1,22 @@
521+/* Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
522+ This file is licensed under the terms of the expat license, see the file EXPAT. */
523+
524+[CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")]
525+namespace Sokoke {
526+ public static string magic_uri (string uri, bool allow_search, bool allow_relative);
527+ public static uint gtk_action_count_modifiers (Gtk.Action action);
528+#if HAVE_WIN32
529+ public static string get_win32_desktop_lnk_path_for_filename (string filename);
530+ public static void create_win32_desktop_lnk (string prefix, string filename, string uri);
531+#endif
532+ public static string js_script_eval (void* ctx, string script, void* error);
533+}
534+
535+#if HAVE_EXECINFO_H
536+[CCode (lower_case_cprefix = "")]
537+namespace NotLinux {
538+ [CCode (cheader_filename = "execinfo.h", array_length = false)]
539+ public unowned string[] backtrace_symbols (void* buffer, int size);
540+}
541+#endif
542+
543
544=== modified file 'tests/CMakeLists.txt'
545--- tests/CMakeLists.txt 2013-10-01 21:35:39 +0000
546+++ tests/CMakeLists.txt 2014-02-28 21:47:46 +0000
547@@ -22,11 +22,10 @@
548 PACKAGES
549 ${PKGS}
550 OPTIONS
551- ${VALAFLAGS}
552+ ${VALACFLAGS}
553 CUSTOM_VAPIS
554 ${EXTRA_VAPIS}
555 "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
556- "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
557 "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
558 )
559

Subscribers

People subscribed via source and target branches

to all changes: