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