Status: | Merged |
---|---|
Approved by: | Cris Dywan |
Approved revision: | 6984 |
Merged at revision: | 6985 |
Proposed branch: | lp:~gue5t/midori/gir-3 |
Merge into: | lp:midori |
Diff against target: |
538 lines (+100/-54) 12 files modified
midori/midori-app.c (+1/-1) midori/midori-bookmarks-db.c (+1/-1) midori/midori-bookmarks-db.h (+1/-1) midori/midori-browser.c (+19/-19) midori/midori-extension.c (+25/-3) midori/midori-locationaction.c (+1/-1) midori/midori-panel.c (+2/-5) midori/midori-preferences.c (+1/-1) midori/midori-privatedata.c (+21/-3) midori/midori-searchaction.c (+1/-1) midori/midori-view.c (+26/-17) midori/midori-websettings.c (+1/-1) |
To merge this branch: | bzr merge lp:~gue5t/midori/gir-3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Approve | ||
Review via email:
|
Commit message
Fix various mis[sing ]annotations and style issues in GIR
Description of the change
This cuts down the number of warnings from g-ir-scanner significantly. Most of the remaining ones are caused by g-ir-scanner not finding dependencies or such--I need to investigate those separately.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'midori/midori-app.c' | |||
2 | --- midori/midori-app.c 2015-06-24 19:23:51 +0000 | |||
3 | +++ midori/midori-app.c 2015-07-06 21:42:31 +0000 | |||
4 | @@ -1061,7 +1061,7 @@ | |||
5 | 1061 | * | 1061 | * |
6 | 1062 | * Retrieves the browsers as a list. | 1062 | * Retrieves the browsers as a list. |
7 | 1063 | * | 1063 | * |
9 | 1064 | * Return value: a newly allocated #Glist of #MidoriBrowser | 1064 | * Return value: (transfer container) (element-type Midori.Browser): a newly allocated #Glist of #MidoriBrowser |
10 | 1065 | * | 1065 | * |
11 | 1066 | * Since: 0.2.5 | 1066 | * Since: 0.2.5 |
12 | 1067 | **/ | 1067 | **/ |
13 | 1068 | 1068 | ||
14 | === modified file 'midori/midori-bookmarks-db.c' | |||
15 | --- midori/midori-bookmarks-db.c 2015-02-24 18:18:08 +0000 | |||
16 | +++ midori/midori-bookmarks-db.c 2015-07-06 21:42:31 +0000 | |||
17 | @@ -880,7 +880,7 @@ | |||
18 | 880 | 880 | ||
19 | 881 | /** | 881 | /** |
20 | 882 | * midori_bookmarks_db_query_recursive: | 882 | * midori_bookmarks_db_query_recursive: |
22 | 883 | * @array: the main bookmark array | 883 | * @bookmarks: the main bookmark array |
23 | 884 | * @fields: comma separated list of fields | 884 | * @fields: comma separated list of fields |
24 | 885 | * @condition: condition, like "folder = '%q'" | 885 | * @condition: condition, like "folder = '%q'" |
25 | 886 | * @value: a value to be inserted if @condition contains %q | 886 | * @value: a value to be inserted if @condition contains %q |
26 | 887 | 887 | ||
27 | === modified file 'midori/midori-bookmarks-db.h' | |||
28 | --- midori/midori-bookmarks-db.h 2014-02-26 21:22:00 +0000 | |||
29 | +++ midori/midori-bookmarks-db.h 2015-07-06 21:42:31 +0000 | |||
30 | @@ -41,7 +41,7 @@ | |||
31 | 41 | midori_bookmarks_db_new (char** errmsg); | 41 | midori_bookmarks_db_new (char** errmsg); |
32 | 42 | 42 | ||
33 | 43 | void | 43 | void |
35 | 44 | midori_bookmarks_db_on_quit (MidoriBookmarksDb* array); | 44 | midori_bookmarks_db_on_quit (MidoriBookmarksDb* bookmarks); |
36 | 45 | 45 | ||
37 | 46 | void | 46 | void |
38 | 47 | midori_bookmarks_db_add_item (MidoriBookmarksDb* bookmarks, KatzeItem* item); | 47 | midori_bookmarks_db_add_item (MidoriBookmarksDb* bookmarks, KatzeItem* item); |
39 | 48 | 48 | ||
40 | === modified file 'midori/midori-browser.c' | |||
41 | --- midori/midori-browser.c 2015-06-25 21:04:19 +0000 | |||
42 | +++ midori/midori-browser.c 2015-07-06 21:42:31 +0000 | |||
43 | @@ -3119,7 +3119,7 @@ | |||
44 | 3119 | * | 3119 | * |
45 | 3120 | * Retrieves a list of actions which are suitable for use in a toolbar. | 3120 | * Retrieves a list of actions which are suitable for use in a toolbar. |
46 | 3121 | * | 3121 | * |
48 | 3122 | * Return value: a NULL-terminated array of strings with actions | 3122 | * Return value: (array zero-terminated=1) (transfer none): a NULL-terminated array of strings with actions |
49 | 3123 | * | 3123 | * |
50 | 3124 | * Since: 0.1.8 | 3124 | * Since: 0.1.8 |
51 | 3125 | **/ | 3125 | **/ |
52 | @@ -7031,13 +7031,13 @@ | |||
53 | 7031 | /** | 7031 | /** |
54 | 7032 | * midori_browser_page_num: | 7032 | * midori_browser_page_num: |
55 | 7033 | * @browser: a #MidoriBrowser | 7033 | * @browser: a #MidoriBrowser |
57 | 7034 | * @widget: a widget in the browser | 7034 | * @view: a child widget of the browser's notebook |
58 | 7035 | * | 7035 | * |
60 | 7036 | * Retrieves the position of @widget in the browser. | 7036 | * Retrieves the position of @view in the browser. |
61 | 7037 | * | 7037 | * |
62 | 7038 | * If there is no page present at all, -1 is returned. | 7038 | * If there is no page present at all, -1 is returned. |
63 | 7039 | * | 7039 | * |
65 | 7040 | * Return value: the index of the widget, or -1 | 7040 | * Return value: the index of the view, or -1 |
66 | 7041 | * | 7041 | * |
67 | 7042 | * Since: 0.4.5 | 7042 | * Since: 0.4.5 |
68 | 7043 | **/ | 7043 | **/ |
69 | @@ -7075,7 +7075,7 @@ | |||
70 | 7075 | * @browser: a #MidoriBrowser | 7075 | * @browser: a #MidoriBrowser |
71 | 7076 | * @item: an item | 7076 | * @item: an item |
72 | 7077 | * | 7077 | * |
74 | 7078 | * Return value: a #GtkWidget | 7078 | * Return value: (type MidoriView) (transfer none): the added view |
75 | 7079 | * | 7079 | * |
76 | 7080 | * Since: 0.4.9: Return type is GtkWidget* | 7080 | * Since: 0.4.9: Return type is GtkWidget* |
77 | 7081 | **/ | 7081 | **/ |
78 | @@ -7103,7 +7103,7 @@ | |||
79 | 7103 | * | 7103 | * |
80 | 7104 | * Appends an uri in the form of a new view. | 7104 | * Appends an uri in the form of a new view. |
81 | 7105 | * | 7105 | * |
83 | 7106 | * Return value: a #GtkWidget | 7106 | * Return value: (type MidoriView) (transfer none): the added view |
84 | 7107 | * | 7107 | * |
85 | 7108 | * Since: 0.4.9: Return type is GtkWidget* | 7108 | * Since: 0.4.9: Return type is GtkWidget* |
86 | 7109 | **/ | 7109 | **/ |
87 | @@ -7153,7 +7153,7 @@ | |||
88 | 7153 | /** | 7153 | /** |
89 | 7154 | * midori_browser_block_action: | 7154 | * midori_browser_block_action: |
90 | 7155 | * @browser: a #MidoriBrowser | 7155 | * @browser: a #MidoriBrowser |
92 | 7156 | * @name: the action to be blocked | 7156 | * @action: the action to be blocked |
93 | 7157 | * | 7157 | * |
94 | 7158 | * Blocks built-in behavior of the specified action without | 7158 | * Blocks built-in behavior of the specified action without |
95 | 7159 | * disabling it, which gives you a chance to connect your | 7159 | * disabling it, which gives you a chance to connect your |
96 | @@ -7185,7 +7185,7 @@ | |||
97 | 7185 | /** | 7185 | /** |
98 | 7186 | * midori_browser_unblock_action: | 7186 | * midori_browser_unblock_action: |
99 | 7187 | * @browser: a #MidoriBrowser | 7187 | * @browser: a #MidoriBrowser |
101 | 7188 | * @name: the action to be unblocked | 7188 | * @action: the action to be unblocked |
102 | 7189 | * | 7189 | * |
103 | 7190 | * Restores built-in behavior of the specified action after | 7190 | * Restores built-in behavior of the specified action after |
104 | 7191 | * previously blocking it with midori_browser_block_action(). | 7191 | * previously blocking it with midori_browser_block_action(). |
105 | @@ -7221,7 +7221,7 @@ | |||
106 | 7221 | * by the browser. It allows obtaining individual | 7221 | * by the browser. It allows obtaining individual |
107 | 7222 | * actions and adding new actions. | 7222 | * actions and adding new actions. |
108 | 7223 | * | 7223 | * |
110 | 7224 | * Return value: the action group of the browser | 7224 | * Return value: (transfer none): the action group of the browser |
111 | 7225 | * | 7225 | * |
112 | 7226 | * Since: 0.1.4 | 7226 | * Since: 0.1.4 |
113 | 7227 | **/ | 7227 | **/ |
114 | @@ -7342,23 +7342,23 @@ | |||
115 | 7342 | /** | 7342 | /** |
116 | 7343 | * midori_browser_get_nth_tab: | 7343 | * midori_browser_get_nth_tab: |
117 | 7344 | * @browser: a #MidoriBrowser | 7344 | * @browser: a #MidoriBrowser |
119 | 7345 | * @page: the index of a tab | 7345 | * @n: the index of a tab |
120 | 7346 | * | 7346 | * |
122 | 7347 | * Retrieves the tab at the position @page. | 7347 | * Retrieves the tab at the position @n. |
123 | 7348 | * | 7348 | * |
124 | 7349 | * If there is no page present at all, %NULL is returned. | 7349 | * If there is no page present at all, %NULL is returned. |
125 | 7350 | * | 7350 | * |
127 | 7351 | * Return value: the selected page, or -1 | 7351 | * Return value: (type MidoriTab) (transfer none): the selected page, or %NULL |
128 | 7352 | * | 7352 | * |
129 | 7353 | * Since: 0.1.9 | 7353 | * Since: 0.1.9 |
130 | 7354 | **/ | 7354 | **/ |
131 | 7355 | GtkWidget* | 7355 | GtkWidget* |
132 | 7356 | midori_browser_get_nth_tab (MidoriBrowser* browser, | 7356 | midori_browser_get_nth_tab (MidoriBrowser* browser, |
134 | 7357 | gint page) | 7357 | gint n) |
135 | 7358 | { | 7358 | { |
136 | 7359 | g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); | 7359 | g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); |
137 | 7360 | 7360 | ||
139 | 7361 | return (GtkWidget*)midori_notebook_get_nth_tab (MIDORI_NOTEBOOK (browser->notebook), page); | 7361 | return (GtkWidget*)midori_notebook_get_nth_tab (MIDORI_NOTEBOOK (browser->notebook), n); |
140 | 7362 | } | 7362 | } |
141 | 7363 | 7363 | ||
142 | 7364 | /** | 7364 | /** |
143 | @@ -7389,7 +7389,7 @@ | |||
144 | 7389 | } | 7389 | } |
145 | 7390 | 7390 | ||
146 | 7391 | /** | 7391 | /** |
148 | 7392 | * midori_browser_get_tab: | 7392 | * midori_browser_get_current_tab: |
149 | 7393 | * @browser: a #MidoriBrowser | 7393 | * @browser: a #MidoriBrowser |
150 | 7394 | * | 7394 | * |
151 | 7395 | * Retrieves the currently selected tab. | 7395 | * Retrieves the currently selected tab. |
152 | @@ -7398,7 +7398,7 @@ | |||
153 | 7398 | * | 7398 | * |
154 | 7399 | * See also midori_browser_get_current_page(). | 7399 | * See also midori_browser_get_current_page(). |
155 | 7400 | * | 7400 | * |
157 | 7401 | * Return value: the selected tab, or %NULL | 7401 | * Return value: (transfer none): the selected tab, or %NULL |
158 | 7402 | * | 7402 | * |
159 | 7403 | * Since: 0.2.6 | 7403 | * Since: 0.2.6 |
160 | 7404 | **/ | 7404 | **/ |
161 | @@ -7416,7 +7416,7 @@ | |||
162 | 7416 | * | 7416 | * |
163 | 7417 | * Retrieves the tabs as a list. | 7417 | * Retrieves the tabs as a list. |
164 | 7418 | * | 7418 | * |
166 | 7419 | * Return value: a newly allocated #GList of #MidoriView | 7419 | * Return value: (element-type MidoriView) (transfer container): the browser's tabs |
167 | 7420 | * | 7420 | * |
168 | 7421 | * Since: 0.2.5 | 7421 | * Since: 0.2.5 |
169 | 7422 | **/ | 7422 | **/ |
170 | @@ -7435,7 +7435,7 @@ | |||
171 | 7435 | * Retrieves a proxy array representing the respective proxy items. | 7435 | * Retrieves a proxy array representing the respective proxy items. |
172 | 7436 | * The array is updated automatically. | 7436 | * The array is updated automatically. |
173 | 7437 | * | 7437 | * |
175 | 7438 | * Return value: the proxy #KatzeArray | 7438 | * Return value: (transfer none): the proxy #KatzeArray |
176 | 7439 | **/ | 7439 | **/ |
177 | 7440 | KatzeArray* | 7440 | KatzeArray* |
178 | 7441 | midori_browser_get_proxy_array (MidoriBrowser* browser) | 7441 | midori_browser_get_proxy_array (MidoriBrowser* browser) |
179 | @@ -7451,7 +7451,7 @@ | |||
180 | 7451 | * | 7451 | * |
181 | 7452 | * Determines the browser appropriate for the specified widget. | 7452 | * Determines the browser appropriate for the specified widget. |
182 | 7453 | * | 7453 | * |
184 | 7454 | * Return value: a #MidoriBrowser | 7454 | * Return value: (transfer none): a #MidoriBrowser, or %NULL |
185 | 7455 | * | 7455 | * |
186 | 7456 | * Since 0.1.7 | 7456 | * Since 0.1.7 |
187 | 7457 | **/ | 7457 | **/ |
188 | 7458 | 7458 | ||
189 | === modified file 'midori/midori-extension.c' | |||
190 | --- midori/midori-extension.c 2014-04-05 19:15:34 +0000 | |||
191 | +++ midori/midori-extension.c 2015-07-06 21:42:31 +0000 | |||
192 | @@ -581,6 +581,17 @@ | |||
193 | 581 | g_free (extension_path); | 581 | g_free (extension_path); |
194 | 582 | } | 582 | } |
195 | 583 | 583 | ||
196 | 584 | /** | ||
197 | 585 | * midori_extension_load_from_file: | ||
198 | 586 | * @extension_path: the path to use for the extension's data files | ||
199 | 587 | * @filename: the path to the extension's module file | ||
200 | 588 | * @activate: whether to activate the extension | ||
201 | 589 | * @test: whether to run the extension's tests | ||
202 | 590 | * | ||
203 | 591 | * Load an extension from a file. | ||
204 | 592 | * | ||
205 | 593 | * Return value: (transfer none): the loaded extension, or %NULL | ||
206 | 594 | **/ | ||
207 | 584 | GObject* | 595 | GObject* |
208 | 585 | midori_extension_load_from_file (const gchar* extension_path, | 596 | midori_extension_load_from_file (const gchar* extension_path, |
209 | 586 | const gchar* filename, | 597 | const gchar* filename, |
210 | @@ -640,6 +651,17 @@ | |||
211 | 640 | return extension; | 651 | return extension; |
212 | 641 | } | 652 | } |
213 | 642 | 653 | ||
214 | 654 | /** | ||
215 | 655 | * midori_extension_activate_gracefully: | ||
216 | 656 | * @app: the #MidoriApp for which to load the extension | ||
217 | 657 | * @extension_path: the path to use for the extension's data files | ||
218 | 658 | * @filename: the path to the extension's module file | ||
219 | 659 | * @activate: whether to activate the extension | ||
220 | 660 | * | ||
221 | 661 | * Load an extension into the context of a #MidoriApp. | ||
222 | 662 | * | ||
223 | 663 | * Return value: (transfer none): the loaded extension, or %NULL | ||
224 | 664 | **/ | ||
225 | 643 | GObject* | 665 | GObject* |
226 | 644 | midori_extension_activate_gracefully (MidoriApp* app, | 666 | midori_extension_activate_gracefully (MidoriApp* app, |
227 | 645 | const gchar* extension_path, | 667 | const gchar* extension_path, |
228 | @@ -826,7 +848,7 @@ | |||
229 | 826 | * Retrieves the #MidoriApp the extension belongs to. The | 848 | * Retrieves the #MidoriApp the extension belongs to. The |
230 | 827 | * extension has to be active. | 849 | * extension has to be active. |
231 | 828 | * | 850 | * |
233 | 829 | * Return value: the #MidoriApp instance | 851 | * Return value: (transfer none): the #MidoriApp instance |
234 | 830 | * | 852 | * |
235 | 831 | * Since 0.1.6 | 853 | * Since 0.1.6 |
236 | 832 | **/ | 854 | **/ |
237 | @@ -1174,8 +1196,8 @@ | |||
238 | 1174 | * | 1196 | * |
239 | 1175 | * Retrieves the value of the specified setting. | 1197 | * Retrieves the value of the specified setting. |
240 | 1176 | * | 1198 | * |
243 | 1177 | * Return value: a newly allocated NULL-terminated list of strings, | 1199 | * Return value: (transfer full) (array zero-terminated=1): the list of |
244 | 1178 | * should be freed with g_strfreev() | 1200 | * strings, NULL-terminated and to be freed with g_strfreev() |
245 | 1179 | * | 1201 | * |
246 | 1180 | * Since: 0.1.7 | 1202 | * Since: 0.1.7 |
247 | 1181 | **/ | 1203 | **/ |
248 | 1182 | 1204 | ||
249 | === modified file 'midori/midori-locationaction.c' | |||
250 | --- midori/midori-locationaction.c 2015-03-23 11:33:24 +0000 | |||
251 | +++ midori/midori-locationaction.c 2015-07-06 21:42:31 +0000 | |||
252 | @@ -1812,7 +1812,7 @@ | |||
253 | 1812 | /** | 1812 | /** |
254 | 1813 | * midori_location_action_set_secondary_icon: | 1813 | * midori_location_action_set_secondary_icon: |
255 | 1814 | * @location_action: a #MidoriLocationAction | 1814 | * @location_action: a #MidoriLocationAction |
257 | 1815 | * @icon: a stock ID, or an icon name | 1815 | * @stock_id: a stock ID, or an icon name |
258 | 1816 | * | 1816 | * |
259 | 1817 | * Sets the secondary, ie right hand side icon. | 1817 | * Sets the secondary, ie right hand side icon. |
260 | 1818 | * | 1818 | * |
261 | 1819 | 1819 | ||
262 | === modified file 'midori/midori-panel.c' | |||
263 | --- midori/midori-panel.c 2013-10-28 19:54:21 +0000 | |||
264 | +++ midori/midori-panel.c 2015-07-06 21:42:31 +0000 | |||
265 | @@ -443,7 +443,7 @@ | |||
266 | 443 | * | 443 | * |
267 | 444 | * Creates a new empty panel. | 444 | * Creates a new empty panel. |
268 | 445 | * | 445 | * |
270 | 446 | * Return value: a new #MidoriPanel | 446 | * Return value: (transfer full): a new #MidoriPanel |
271 | 447 | **/ | 447 | **/ |
272 | 448 | GtkWidget* | 448 | GtkWidget* |
273 | 449 | midori_panel_new (void) | 449 | midori_panel_new (void) |
274 | @@ -552,9 +552,6 @@ | |||
275 | 552 | * midori_panel_append_page: | 552 | * midori_panel_append_page: |
276 | 553 | * @panel: a #MidoriPanel | 553 | * @panel: a #MidoriPanel |
277 | 554 | * @viewable: a viewable widget | 554 | * @viewable: a viewable widget |
278 | 555 | * @toolbar: a toolbar widget, or %NULL | ||
279 | 556 | * @stock_id: a stock ID | ||
280 | 557 | * @label: a string to use as the label | ||
281 | 558 | * | 555 | * |
282 | 559 | * Appends a new page to the panel. If @toolbar is specified it will | 556 | * Appends a new page to the panel. If @toolbar is specified it will |
283 | 560 | * be packed above @viewable. | 557 | * be packed above @viewable. |
284 | @@ -713,7 +710,7 @@ | |||
285 | 713 | * | 710 | * |
286 | 714 | * If @panel has no children, %NULL is returned. | 711 | * If @panel has no children, %NULL is returned. |
287 | 715 | * | 712 | * |
289 | 716 | * Return value: the child widget of the new page, or %NULL | 713 | * Return value: (transfer none): the child widget of the new page, or %NULL |
290 | 717 | **/ | 714 | **/ |
291 | 718 | GtkWidget* | 715 | GtkWidget* |
292 | 719 | midori_panel_get_nth_page (MidoriPanel* panel, | 716 | midori_panel_get_nth_page (MidoriPanel* panel, |
293 | 720 | 717 | ||
294 | === modified file 'midori/midori-preferences.c' | |||
295 | --- midori/midori-preferences.c 2015-06-06 13:03:43 +0000 | |||
296 | +++ midori/midori-preferences.c 2015-07-06 21:42:31 +0000 | |||
297 | @@ -140,7 +140,7 @@ | |||
298 | 140 | * | 140 | * |
299 | 141 | * Since 0.1.2 @parent may be %NULL. | 141 | * Since 0.1.2 @parent may be %NULL. |
300 | 142 | * | 142 | * |
302 | 143 | * Return value: a new #MidoriPreferences | 143 | * Return value: (transfer full): a new #MidoriPreferences |
303 | 144 | **/ | 144 | **/ |
304 | 145 | GtkWidget* | 145 | GtkWidget* |
305 | 146 | midori_preferences_new (GtkWindow* parent, | 146 | midori_preferences_new (GtkWindow* parent, |
306 | 147 | 147 | ||
307 | === modified file 'midori/midori-privatedata.c' | |||
308 | --- midori/midori-privatedata.c 2015-04-21 02:00:38 +0000 | |||
309 | +++ midori/midori-privatedata.c 2015-07-06 21:42:31 +0000 | |||
310 | @@ -96,7 +96,11 @@ | |||
311 | 96 | } | 96 | } |
312 | 97 | 97 | ||
313 | 98 | /** | 98 | /** |
314 | 99 | * midori_private_data_dialog_is_empty: | ||
315 | 100 | * @dialog: the dialog | ||
316 | 101 | * | ||
317 | 99 | * The dialog is "empty" when none of the relevant checkboxes are activated. | 102 | * The dialog is "empty" when none of the relevant checkboxes are activated. |
318 | 103 | * | ||
319 | 100 | * This function returns true if the dialog is empty. | 104 | * This function returns true if the dialog is empty. |
320 | 101 | **/ | 105 | **/ |
321 | 102 | static bool | 106 | static bool |
322 | @@ -131,8 +135,11 @@ | |||
323 | 131 | } | 135 | } |
324 | 132 | 136 | ||
325 | 133 | /** | 137 | /** |
326 | 138 | * midori_private_data_clear_button_check_sensitive: | ||
327 | 139 | * @dialog: the dialog to clear | ||
328 | 140 | * | ||
329 | 134 | * When called, sets the sensitivity of the clear private data button depending | 141 | * When called, sets the sensitivity of the clear private data button depending |
331 | 135 | * on whether the dialog is empty (see: midori_private_data_dialog_is_empty) | 142 | * on whether the dialog is empty (see: midori_private_data_dialog_is_empty()) |
332 | 136 | **/ | 143 | **/ |
333 | 137 | static void | 144 | static void |
334 | 138 | midori_private_data_clear_button_check_sensitive (GtkDialog* dialog) | 145 | midori_private_data_clear_button_check_sensitive (GtkDialog* dialog) |
335 | @@ -153,6 +160,15 @@ | |||
336 | 153 | midori_private_data_clear_button_check_sensitive (GTK_DIALOG (dialog)); | 160 | midori_private_data_clear_button_check_sensitive (GTK_DIALOG (dialog)); |
337 | 154 | } | 161 | } |
338 | 155 | 162 | ||
339 | 163 | /** | ||
340 | 164 | * midori_private_data_get_dialog: | ||
341 | 165 | * @browser: the browser for which to create a dialog | ||
342 | 166 | * | ||
343 | 167 | * Shows a dialog for the user to configure private data settings | ||
344 | 168 | * and clear some items. | ||
345 | 169 | * | ||
346 | 170 | * Return value: (transfer full): the dialog | ||
347 | 171 | **/ | ||
348 | 156 | GtkWidget* | 172 | GtkWidget* |
349 | 157 | midori_private_data_get_dialog (MidoriBrowser* browser) | 173 | midori_private_data_get_dialog (MidoriBrowser* browser) |
350 | 158 | { | 174 | { |
351 | @@ -419,12 +435,14 @@ | |||
352 | 419 | * midori_private_data_register_item: | 435 | * midori_private_data_register_item: |
353 | 420 | * @name: the name of the privacy item | 436 | * @name: the name of the privacy item |
354 | 421 | * @label: a user visible, localized label | 437 | * @label: a user visible, localized label |
356 | 422 | * @clear: a callback clearing data | 438 | * @clear: (scope async): a callback clearing data |
357 | 423 | * | 439 | * |
358 | 424 | * Registers an item to clear data, either via the | 440 | * Registers an item to clear data, either via the |
359 | 425 | * Clear Private Data dialogue or when Midori quits. | 441 | * Clear Private Data dialogue or when Midori quits. |
360 | 426 | * | 442 | * |
362 | 427 | * Return value: a #GList if all arguments are %NULL | 443 | * Return value: (element-type MidoriPrivateDataItem) (transfer none): |
363 | 444 | * a #GList of all previously-registered items if all arguments are | ||
364 | 445 | * given as %NULL, %NULL otherwise | ||
365 | 428 | **/ | 446 | **/ |
366 | 429 | GList* | 447 | GList* |
367 | 430 | midori_private_data_register_item (const gchar* name, | 448 | midori_private_data_register_item (const gchar* name, |
368 | 431 | 449 | ||
369 | === modified file 'midori/midori-searchaction.c' | |||
370 | --- midori/midori-searchaction.c 2015-05-21 20:08:59 +0000 | |||
371 | +++ midori/midori-searchaction.c 2015-07-06 21:42:31 +0000 | |||
372 | @@ -1387,7 +1387,7 @@ | |||
373 | 1387 | * the very same dialog until it is destroyed, in which case | 1387 | * the very same dialog until it is destroyed, in which case |
374 | 1388 | * a new dialog is created. | 1388 | * a new dialog is created. |
375 | 1389 | * | 1389 | * |
377 | 1390 | * Return value: a #GtkDialog | 1390 | * Return value: (transfer none): a #GtkDialog |
378 | 1391 | **/ | 1391 | **/ |
379 | 1392 | GtkWidget* | 1392 | GtkWidget* |
380 | 1393 | midori_search_action_get_dialog (MidoriSearchAction* search_action) | 1393 | midori_search_action_get_dialog (MidoriSearchAction* search_action) |
381 | 1394 | 1394 | ||
382 | === modified file 'midori/midori-view.c' | |||
383 | --- midori/midori-view.c 2015-03-23 11:33:24 +0000 | |||
384 | +++ midori/midori-view.c 2015-07-06 21:42:31 +0000 | |||
385 | @@ -924,7 +924,7 @@ | |||
386 | 924 | * @view: a #MidoriView | 924 | * @view: a #MidoriView |
387 | 925 | * @message_type: a #GtkMessageType | 925 | * @message_type: a #GtkMessageType |
388 | 926 | * @message: a message string | 926 | * @message: a message string |
390 | 927 | * @response_cb: a response callback | 927 | * @response_cb: (scope async): a response callback |
391 | 928 | * @user_data: user data passed to the callback | 928 | * @user_data: user data passed to the callback |
392 | 929 | * @first_button_text: button text or stock ID | 929 | * @first_button_text: button text or stock ID |
393 | 930 | * @...: first response ID, then more text - response ID pairs | 930 | * @...: first response ID, then more text - response ID pairs |
394 | @@ -933,7 +933,7 @@ | |||
395 | 933 | * button invokes the specified callback. The infobar is | 933 | * button invokes the specified callback. The infobar is |
396 | 934 | * automatically destroyed if the location changes or reloads. | 934 | * automatically destroyed if the location changes or reloads. |
397 | 935 | * | 935 | * |
399 | 936 | * Return value: an infobar widget | 936 | * Return value: (transfer none): an infobar widget |
400 | 937 | * | 937 | * |
401 | 938 | * Since: 0.2.9 | 938 | * Since: 0.2.9 |
402 | 939 | **/ | 939 | **/ |
403 | @@ -3255,7 +3255,7 @@ | |||
404 | 3255 | * Creates a new view with the specified parameters that | 3255 | * Creates a new view with the specified parameters that |
405 | 3256 | * is visible by default. | 3256 | * is visible by default. |
406 | 3257 | * | 3257 | * |
408 | 3258 | * Return value: a new #MidoriView | 3258 | * Return value: (transfer full): a new #MidoriView |
409 | 3259 | * | 3259 | * |
410 | 3260 | * Since: 0.3.0 | 3260 | * Since: 0.3.0 |
411 | 3261 | * Deprecated: 0.4.3 | 3261 | * Deprecated: 0.4.3 |
412 | @@ -3279,7 +3279,7 @@ | |||
413 | 3279 | * | 3279 | * |
414 | 3280 | * Creates a new view from an item that is visible by default. | 3280 | * Creates a new view from an item that is visible by default. |
415 | 3281 | * | 3281 | * |
417 | 3282 | * Return value: a new #MidoriView | 3282 | * Return value: (transfer full): a new #MidoriView |
418 | 3283 | * | 3283 | * |
419 | 3284 | * Since: 0.4.3 | 3284 | * Since: 0.4.3 |
420 | 3285 | * Deprecated: 0.5.8: Use midori_view_new_from_view instead. | 3285 | * Deprecated: 0.5.8: Use midori_view_new_from_view instead. |
421 | @@ -3316,7 +3316,7 @@ | |||
422 | 3316 | * | 3316 | * |
423 | 3317 | * Usually @settings should be passed from an existing view or browser. | 3317 | * Usually @settings should be passed from an existing view or browser. |
424 | 3318 | * | 3318 | * |
426 | 3319 | * Return value: a new #MidoriView | 3319 | * Return value: (transfer full): a new #MidoriView |
427 | 3320 | * | 3320 | * |
428 | 3321 | * Since: 0.5.8 | 3321 | * Since: 0.5.8 |
429 | 3322 | **/ | 3322 | **/ |
430 | @@ -4023,7 +4023,7 @@ | |||
431 | 4023 | * | 4023 | * |
432 | 4024 | * The returned icon is owned by the @view and must not be modified. | 4024 | * The returned icon is owned by the @view and must not be modified. |
433 | 4025 | * | 4025 | * |
435 | 4026 | * Return value: a #GdkPixbuf, or %NULL | 4026 | * Return value: (transfer none): a #GdkPixbuf, or %NULL |
436 | 4027 | **/ | 4027 | **/ |
437 | 4028 | GdkPixbuf* | 4028 | GdkPixbuf* |
438 | 4029 | midori_view_get_icon (MidoriView* view) | 4029 | midori_view_get_icon (MidoriView* view) |
439 | @@ -4205,7 +4205,7 @@ | |||
440 | 4205 | * | 4205 | * |
441 | 4206 | * The menu item is valid until it is removed from its container. | 4206 | * The menu item is valid until it is removed from its container. |
442 | 4207 | * | 4207 | * |
444 | 4208 | * Return value: the proxy #GtkMenuItem | 4208 | * Return value: (transfer none): the proxy #GtkMenuItem |
445 | 4209 | **/ | 4209 | **/ |
446 | 4210 | GtkWidget* | 4210 | GtkWidget* |
447 | 4211 | midori_view_get_proxy_menu_item (MidoriView* view) | 4211 | midori_view_get_proxy_menu_item (MidoriView* view) |
448 | @@ -4228,6 +4228,15 @@ | |||
449 | 4228 | return view->menu_item; | 4228 | return view->menu_item; |
450 | 4229 | } | 4229 | } |
451 | 4230 | 4230 | ||
452 | 4231 | /** | ||
453 | 4232 | * midori_view_duplicate | ||
454 | 4233 | * @view: a #MidoriView | ||
455 | 4234 | * | ||
456 | 4235 | * Create a new #MidoriView from an existing one by using | ||
457 | 4236 | * the item of the old view. | ||
458 | 4237 | * | ||
459 | 4238 | * Return value: (transfer full): the new #MidoriView | ||
460 | 4239 | **/ | ||
461 | 4231 | GtkWidget* | 4240 | GtkWidget* |
462 | 4232 | midori_view_duplicate (MidoriView* view) | 4241 | midori_view_duplicate (MidoriView* view) |
463 | 4233 | { | 4242 | { |
464 | @@ -4247,7 +4256,7 @@ | |||
465 | 4247 | * Retrieves a menu that is typically shown when right-clicking | 4256 | * Retrieves a menu that is typically shown when right-clicking |
466 | 4248 | * a tab label or equivalent representation. | 4257 | * a tab label or equivalent representation. |
467 | 4249 | * | 4258 | * |
469 | 4250 | * Return value: a #GtkMenu | 4259 | * Return value: (transfer full): a #GtkMenu |
470 | 4251 | * | 4260 | * |
471 | 4252 | * Since: 0.1.8 | 4261 | * Since: 0.1.8 |
472 | 4253 | * Deprecated: 0.5.7: Use MidoriNotebook API instead. | 4262 | * Deprecated: 0.5.7: Use MidoriNotebook API instead. |
473 | @@ -4271,7 +4280,7 @@ | |||
474 | 4271 | * Retrieves a proxy tab label that is typically used when | 4280 | * Retrieves a proxy tab label that is typically used when |
475 | 4272 | * adding the view to a notebook. | 4281 | * adding the view to a notebook. |
476 | 4273 | * | 4282 | * |
478 | 4274 | * Return value: the proxy #GtkEventBox | 4283 | * Return value: (transfer none): the proxy #GtkEventBox |
479 | 4275 | * | 4284 | * |
480 | 4276 | * Deprecated: 0.5.7: Don't use this label. | 4285 | * Deprecated: 0.5.7: Don't use this label. |
481 | 4277 | **/ | 4286 | **/ |
482 | @@ -4336,7 +4345,7 @@ | |||
483 | 4336 | * | 4345 | * |
484 | 4337 | * The item reflects changes to title (name), URI and MIME type (mime-type). | 4346 | * The item reflects changes to title (name), URI and MIME type (mime-type). |
485 | 4338 | * | 4347 | * |
487 | 4339 | * Return value: the proxy #KatzeItem | 4348 | * Return value: (transfer none): the proxy #KatzeItem |
488 | 4340 | **/ | 4349 | **/ |
489 | 4341 | KatzeItem* | 4350 | KatzeItem* |
490 | 4342 | midori_view_get_proxy_item (MidoriView* view) | 4351 | midori_view_get_proxy_item (MidoriView* view) |
491 | @@ -4920,7 +4929,7 @@ | |||
492 | 4920 | * If width and height are negative, the resulting | 4929 | * If width and height are negative, the resulting |
493 | 4921 | * image is going to be optimized for speed. | 4930 | * image is going to be optimized for speed. |
494 | 4922 | * | 4931 | * |
496 | 4923 | * Returns: a newly allocated #GdkPixbuf | 4932 | * Returns: (transfer full): a newly allocated #GdkPixbuf |
497 | 4924 | * | 4933 | * |
498 | 4925 | * Since: 0.2.1 | 4934 | * Since: 0.2.1 |
499 | 4926 | * Deprecated: 0.5.4 | 4935 | * Deprecated: 0.5.4 |
500 | @@ -4939,7 +4948,7 @@ | |||
501 | 4939 | * midori_view_get_web_view | 4948 | * midori_view_get_web_view |
502 | 4940 | * @view: a #MidoriView | 4949 | * @view: a #MidoriView |
503 | 4941 | * | 4950 | * |
505 | 4942 | * Returns: The #WebKitWebView for this view | 4951 | * Returns: (transfer none): The #WebKitWebView for this view |
506 | 4943 | * | 4952 | * |
507 | 4944 | * Since: 0.2.5 | 4953 | * Since: 0.2.5 |
508 | 4945 | * Deprecated: 0.4.8: Use midori_tab_get_web_view() instead. | 4954 | * Deprecated: 0.4.8: Use midori_tab_get_web_view() instead. |
509 | @@ -4954,11 +4963,11 @@ | |||
510 | 4954 | 4963 | ||
511 | 4955 | /** | 4964 | /** |
512 | 4956 | * midori_view_get_for_widget: | 4965 | * midori_view_get_for_widget: |
518 | 4957 | * @widget: a #GtkWidget | 4966 | * @web_view: a #GtkWidget of type #WebKitWebView |
519 | 4958 | * | 4967 | * |
520 | 4959 | * Determines the view appropriate for the specified widget. | 4968 | * Determines the MidoriView for the specified #WebkitWebView widget. |
521 | 4960 | * | 4969 | * |
522 | 4961 | * Return value: a #MidoriView | 4970 | * Return value: (transfer none): a #MidoriView, or %NULL |
523 | 4962 | * | 4971 | * |
524 | 4963 | * Since 0.4.5 | 4972 | * Since 0.4.5 |
525 | 4964 | **/ | 4973 | **/ |
526 | 4965 | 4974 | ||
527 | === modified file 'midori/midori-websettings.c' | |||
528 | --- midori/midori-websettings.c 2014-03-19 20:03:50 +0000 | |||
529 | +++ midori/midori-websettings.c 2015-07-06 21:42:31 +0000 | |||
530 | @@ -1525,7 +1525,7 @@ | |||
531 | 1525 | /** | 1525 | /** |
532 | 1526 | * midori_settings_save_to_file: | 1526 | * midori_settings_save_to_file: |
533 | 1527 | * @settings: a MidoriWebSettings instance to save | 1527 | * @settings: a MidoriWebSettings instance to save |
535 | 1528 | * @app: (type Midori.Application) (allow-none): a MidoriApplication instance | 1528 | * @app: (type MidoriApp) (allow-none): a MidoriApp instance |
536 | 1529 | * @filename: the filename into which to save settings | 1529 | * @filename: the filename into which to save settings |
537 | 1530 | * @error: (out) (allow-none): return location for a GError, or %NULL | 1530 | * @error: (out) (allow-none): return location for a GError, or %NULL |
538 | 1531 | * | 1531 | * |
Niiice.