Merge lp:~gue5t/midori/gir-3 into lp:midori

Proposed by gue5t gue5t
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
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+263980@code.launchpad.net

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.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Niiice.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'midori/midori-app.c'
--- midori/midori-app.c 2015-06-24 19:23:51 +0000
+++ midori/midori-app.c 2015-07-06 21:42:31 +0000
@@ -1061,7 +1061,7 @@
1061 *1061 *
1062 * Retrieves the browsers as a list.1062 * Retrieves the browsers as a list.
1063 *1063 *
1064 * Return value: a newly allocated #Glist of #MidoriBrowser1064 * Return value: (transfer container) (element-type Midori.Browser): a newly allocated #Glist of #MidoriBrowser
1065 *1065 *
1066 * Since: 0.2.51066 * Since: 0.2.5
1067 **/1067 **/
10681068
=== modified file 'midori/midori-bookmarks-db.c'
--- midori/midori-bookmarks-db.c 2015-02-24 18:18:08 +0000
+++ midori/midori-bookmarks-db.c 2015-07-06 21:42:31 +0000
@@ -880,7 +880,7 @@
880880
881/**881/**
882 * midori_bookmarks_db_query_recursive:882 * midori_bookmarks_db_query_recursive:
883 * @array: the main bookmark array883 * @bookmarks: the main bookmark array
884 * @fields: comma separated list of fields884 * @fields: comma separated list of fields
885 * @condition: condition, like "folder = '%q'"885 * @condition: condition, like "folder = '%q'"
886 * @value: a value to be inserted if @condition contains %q886 * @value: a value to be inserted if @condition contains %q
887887
=== modified file 'midori/midori-bookmarks-db.h'
--- midori/midori-bookmarks-db.h 2014-02-26 21:22:00 +0000
+++ midori/midori-bookmarks-db.h 2015-07-06 21:42:31 +0000
@@ -41,7 +41,7 @@
41midori_bookmarks_db_new (char** errmsg);41midori_bookmarks_db_new (char** errmsg);
4242
43void43void
44midori_bookmarks_db_on_quit (MidoriBookmarksDb* array);44midori_bookmarks_db_on_quit (MidoriBookmarksDb* bookmarks);
4545
46void46void
47midori_bookmarks_db_add_item (MidoriBookmarksDb* bookmarks, KatzeItem* item);47midori_bookmarks_db_add_item (MidoriBookmarksDb* bookmarks, KatzeItem* item);
4848
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c 2015-06-25 21:04:19 +0000
+++ midori/midori-browser.c 2015-07-06 21:42:31 +0000
@@ -3119,7 +3119,7 @@
3119 *3119 *
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.
3121 *3121 *
3122 * Return value: a NULL-terminated array of strings with actions3122 * Return value: (array zero-terminated=1) (transfer none): a NULL-terminated array of strings with actions
3123 *3123 *
3124 * Since: 0.1.83124 * Since: 0.1.8
3125 **/3125 **/
@@ -7031,13 +7031,13 @@
7031/**7031/**
7032 * midori_browser_page_num:7032 * midori_browser_page_num:
7033 * @browser: a #MidoriBrowser7033 * @browser: a #MidoriBrowser
7034 * @widget: a widget in the browser7034 * @view: a child widget of the browser's notebook
7035 *7035 *
7036 * Retrieves the position of @widget in the browser.7036 * Retrieves the position of @view in the browser.
7037 *7037 *
7038 * If there is no page present at all, -1 is returned.7038 * If there is no page present at all, -1 is returned.
7039 *7039 *
7040 * Return value: the index of the widget, or -17040 * Return value: the index of the view, or -1
7041 *7041 *
7042 * Since: 0.4.57042 * Since: 0.4.5
7043 **/7043 **/
@@ -7075,7 +7075,7 @@
7075 * @browser: a #MidoriBrowser7075 * @browser: a #MidoriBrowser
7076 * @item: an item7076 * @item: an item
7077 *7077 *
7078 * Return value: a #GtkWidget7078 * Return value: (type MidoriView) (transfer none): the added view
7079 *7079 *
7080 * Since: 0.4.9: Return type is GtkWidget*7080 * Since: 0.4.9: Return type is GtkWidget*
7081 **/7081 **/
@@ -7103,7 +7103,7 @@
7103 *7103 *
7104 * Appends an uri in the form of a new view.7104 * Appends an uri in the form of a new view.
7105 *7105 *
7106 * Return value: a #GtkWidget7106 * Return value: (type MidoriView) (transfer none): the added view
7107 *7107 *
7108 * Since: 0.4.9: Return type is GtkWidget*7108 * Since: 0.4.9: Return type is GtkWidget*
7109 **/7109 **/
@@ -7153,7 +7153,7 @@
7153/**7153/**
7154 * midori_browser_block_action:7154 * midori_browser_block_action:
7155 * @browser: a #MidoriBrowser7155 * @browser: a #MidoriBrowser
7156 * @name: the action to be blocked7156 * @action: the action to be blocked
7157 *7157 *
7158 * Blocks built-in behavior of the specified action without7158 * Blocks built-in behavior of the specified action without
7159 * disabling it, which gives you a chance to connect your7159 * disabling it, which gives you a chance to connect your
@@ -7185,7 +7185,7 @@
7185/**7185/**
7186 * midori_browser_unblock_action:7186 * midori_browser_unblock_action:
7187 * @browser: a #MidoriBrowser7187 * @browser: a #MidoriBrowser
7188 * @name: the action to be unblocked7188 * @action: the action to be unblocked
7189 *7189 *
7190 * Restores built-in behavior of the specified action after7190 * Restores built-in behavior of the specified action after
7191 * previously blocking it with midori_browser_block_action().7191 * previously blocking it with midori_browser_block_action().
@@ -7221,7 +7221,7 @@
7221 * by the browser. It allows obtaining individual7221 * by the browser. It allows obtaining individual
7222 * actions and adding new actions.7222 * actions and adding new actions.
7223 *7223 *
7224 * Return value: the action group of the browser7224 * Return value: (transfer none): the action group of the browser
7225 *7225 *
7226 * Since: 0.1.47226 * Since: 0.1.4
7227 **/7227 **/
@@ -7342,23 +7342,23 @@
7342/**7342/**
7343 * midori_browser_get_nth_tab:7343 * midori_browser_get_nth_tab:
7344 * @browser: a #MidoriBrowser7344 * @browser: a #MidoriBrowser
7345 * @page: the index of a tab7345 * @n: the index of a tab
7346 *7346 *
7347 * Retrieves the tab at the position @page.7347 * Retrieves the tab at the position @n.
7348 *7348 *
7349 * If there is no page present at all, %NULL is returned.7349 * If there is no page present at all, %NULL is returned.
7350 *7350 *
7351 * Return value: the selected page, or -17351 * Return value: (type MidoriTab) (transfer none): the selected page, or %NULL
7352 *7352 *
7353 * Since: 0.1.97353 * Since: 0.1.9
7354 **/7354 **/
7355GtkWidget*7355GtkWidget*
7356midori_browser_get_nth_tab (MidoriBrowser* browser,7356midori_browser_get_nth_tab (MidoriBrowser* browser,
7357 gint page)7357 gint n)
7358{7358{
7359 g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);7359 g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
73607360
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);
7362}7362}
73637363
7364/**7364/**
@@ -7389,7 +7389,7 @@
7389}7389}
73907390
7391/**7391/**
7392 * midori_browser_get_tab:7392 * midori_browser_get_current_tab:
7393 * @browser: a #MidoriBrowser7393 * @browser: a #MidoriBrowser
7394 *7394 *
7395 * Retrieves the currently selected tab.7395 * Retrieves the currently selected tab.
@@ -7398,7 +7398,7 @@
7398 *7398 *
7399 * See also midori_browser_get_current_page().7399 * See also midori_browser_get_current_page().
7400 *7400 *
7401 * Return value: the selected tab, or %NULL7401 * Return value: (transfer none): the selected tab, or %NULL
7402 *7402 *
7403 * Since: 0.2.67403 * Since: 0.2.6
7404 **/7404 **/
@@ -7416,7 +7416,7 @@
7416 *7416 *
7417 * Retrieves the tabs as a list.7417 * Retrieves the tabs as a list.
7418 *7418 *
7419 * Return value: a newly allocated #GList of #MidoriView7419 * Return value: (element-type MidoriView) (transfer container): the browser's tabs
7420 *7420 *
7421 * Since: 0.2.57421 * Since: 0.2.5
7422 **/7422 **/
@@ -7435,7 +7435,7 @@
7435 * Retrieves a proxy array representing the respective proxy items.7435 * Retrieves a proxy array representing the respective proxy items.
7436 * The array is updated automatically.7436 * The array is updated automatically.
7437 *7437 *
7438 * Return value: the proxy #KatzeArray7438 * Return value: (transfer none): the proxy #KatzeArray
7439 **/7439 **/
7440KatzeArray*7440KatzeArray*
7441midori_browser_get_proxy_array (MidoriBrowser* browser)7441midori_browser_get_proxy_array (MidoriBrowser* browser)
@@ -7451,7 +7451,7 @@
7451 *7451 *
7452 * Determines the browser appropriate for the specified widget.7452 * Determines the browser appropriate for the specified widget.
7453 *7453 *
7454 * Return value: a #MidoriBrowser7454 * Return value: (transfer none): a #MidoriBrowser, or %NULL
7455 *7455 *
7456 * Since 0.1.77456 * Since 0.1.7
7457 **/7457 **/
74587458
=== modified file 'midori/midori-extension.c'
--- midori/midori-extension.c 2014-04-05 19:15:34 +0000
+++ midori/midori-extension.c 2015-07-06 21:42:31 +0000
@@ -581,6 +581,17 @@
581 g_free (extension_path);581 g_free (extension_path);
582}582}
583583
584/**
585 * midori_extension_load_from_file:
586 * @extension_path: the path to use for the extension's data files
587 * @filename: the path to the extension's module file
588 * @activate: whether to activate the extension
589 * @test: whether to run the extension's tests
590 *
591 * Load an extension from a file.
592 *
593 * Return value: (transfer none): the loaded extension, or %NULL
594 **/
584GObject*595GObject*
585midori_extension_load_from_file (const gchar* extension_path,596midori_extension_load_from_file (const gchar* extension_path,
586 const gchar* filename,597 const gchar* filename,
@@ -640,6 +651,17 @@
640 return extension;651 return extension;
641}652}
642653
654/**
655 * midori_extension_activate_gracefully:
656 * @app: the #MidoriApp for which to load the extension
657 * @extension_path: the path to use for the extension's data files
658 * @filename: the path to the extension's module file
659 * @activate: whether to activate the extension
660 *
661 * Load an extension into the context of a #MidoriApp.
662 *
663 * Return value: (transfer none): the loaded extension, or %NULL
664 **/
643GObject*665GObject*
644midori_extension_activate_gracefully (MidoriApp* app,666midori_extension_activate_gracefully (MidoriApp* app,
645 const gchar* extension_path,667 const gchar* extension_path,
@@ -826,7 +848,7 @@
826 * Retrieves the #MidoriApp the extension belongs to. The848 * Retrieves the #MidoriApp the extension belongs to. The
827 * extension has to be active.849 * extension has to be active.
828 *850 *
829 * Return value: the #MidoriApp instance851 * Return value: (transfer none): the #MidoriApp instance
830 *852 *
831 * Since 0.1.6853 * Since 0.1.6
832 **/854 **/
@@ -1174,8 +1196,8 @@
1174 *1196 *
1175 * Retrieves the value of the specified setting.1197 * Retrieves the value of the specified setting.
1176 *1198 *
1177 * Return value: a newly allocated NULL-terminated list of strings,1199 * Return value: (transfer full) (array zero-terminated=1): the list of
1178 * should be freed with g_strfreev()1200 * strings, NULL-terminated and to be freed with g_strfreev()
1179 *1201 *
1180 * Since: 0.1.71202 * Since: 0.1.7
1181 **/1203 **/
11821204
=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c 2015-03-23 11:33:24 +0000
+++ midori/midori-locationaction.c 2015-07-06 21:42:31 +0000
@@ -1812,7 +1812,7 @@
1812/**1812/**
1813 * midori_location_action_set_secondary_icon:1813 * midori_location_action_set_secondary_icon:
1814 * @location_action: a #MidoriLocationAction1814 * @location_action: a #MidoriLocationAction
1815 * @icon: a stock ID, or an icon name1815 * @stock_id: a stock ID, or an icon name
1816 *1816 *
1817 * Sets the secondary, ie right hand side icon.1817 * Sets the secondary, ie right hand side icon.
1818 *1818 *
18191819
=== modified file 'midori/midori-panel.c'
--- midori/midori-panel.c 2013-10-28 19:54:21 +0000
+++ midori/midori-panel.c 2015-07-06 21:42:31 +0000
@@ -443,7 +443,7 @@
443 *443 *
444 * Creates a new empty panel.444 * Creates a new empty panel.
445 *445 *
446 * Return value: a new #MidoriPanel446 * Return value: (transfer full): a new #MidoriPanel
447 **/447 **/
448GtkWidget*448GtkWidget*
449midori_panel_new (void)449midori_panel_new (void)
@@ -552,9 +552,6 @@
552 * midori_panel_append_page:552 * midori_panel_append_page:
553 * @panel: a #MidoriPanel553 * @panel: a #MidoriPanel
554 * @viewable: a viewable widget554 * @viewable: a viewable widget
555 * @toolbar: a toolbar widget, or %NULL
556 * @stock_id: a stock ID
557 * @label: a string to use as the label
558 *555 *
559 * Appends a new page to the panel. If @toolbar is specified it will556 * Appends a new page to the panel. If @toolbar is specified it will
560 * be packed above @viewable.557 * be packed above @viewable.
@@ -713,7 +710,7 @@
713 *710 *
714 * If @panel has no children, %NULL is returned.711 * If @panel has no children, %NULL is returned.
715 *712 *
716 * Return value: the child widget of the new page, or %NULL713 * Return value: (transfer none): the child widget of the new page, or %NULL
717 **/714 **/
718GtkWidget*715GtkWidget*
719midori_panel_get_nth_page (MidoriPanel* panel,716midori_panel_get_nth_page (MidoriPanel* panel,
720717
=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c 2015-06-06 13:03:43 +0000
+++ midori/midori-preferences.c 2015-07-06 21:42:31 +0000
@@ -140,7 +140,7 @@
140 *140 *
141 * Since 0.1.2 @parent may be %NULL.141 * Since 0.1.2 @parent may be %NULL.
142 *142 *
143 * Return value: a new #MidoriPreferences143 * Return value: (transfer full): a new #MidoriPreferences
144 **/144 **/
145GtkWidget*145GtkWidget*
146midori_preferences_new (GtkWindow* parent,146midori_preferences_new (GtkWindow* parent,
147147
=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c 2015-04-21 02:00:38 +0000
+++ midori/midori-privatedata.c 2015-07-06 21:42:31 +0000
@@ -96,7 +96,11 @@
96}96}
9797
98/**98/**
99 * midori_private_data_dialog_is_empty:
100 * @dialog: the dialog
101 *
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.
103 *
100 * This function returns true if the dialog is empty.104 * This function returns true if the dialog is empty.
101 **/105 **/
102static bool106static bool
@@ -131,8 +135,11 @@
131}135}
132136
133/**137/**
138 * midori_private_data_clear_button_check_sensitive:
139 * @dialog: the dialog to clear
140 *
134 * When called, sets the sensitivity of the clear private data button depending141 * When called, sets the sensitivity of the clear private data button depending
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())
136 **/143 **/
137static void144static void
138midori_private_data_clear_button_check_sensitive (GtkDialog* dialog)145midori_private_data_clear_button_check_sensitive (GtkDialog* dialog)
@@ -153,6 +160,15 @@
153 midori_private_data_clear_button_check_sensitive (GTK_DIALOG (dialog));160 midori_private_data_clear_button_check_sensitive (GTK_DIALOG (dialog));
154}161}
155162
163/**
164 * midori_private_data_get_dialog:
165 * @browser: the browser for which to create a dialog
166 *
167 * Shows a dialog for the user to configure private data settings
168 * and clear some items.
169 *
170 * Return value: (transfer full): the dialog
171 **/
156GtkWidget*172GtkWidget*
157midori_private_data_get_dialog (MidoriBrowser* browser)173midori_private_data_get_dialog (MidoriBrowser* browser)
158{174{
@@ -419,12 +435,14 @@
419 * midori_private_data_register_item:435 * midori_private_data_register_item:
420 * @name: the name of the privacy item436 * @name: the name of the privacy item
421 * @label: a user visible, localized label437 * @label: a user visible, localized label
422 * @clear: a callback clearing data438 * @clear: (scope async): a callback clearing data
423 *439 *
424 * Registers an item to clear data, either via the440 * Registers an item to clear data, either via the
425 * Clear Private Data dialogue or when Midori quits.441 * Clear Private Data dialogue or when Midori quits.
426 *442 *
427 * Return value: a #GList if all arguments are %NULL443 * Return value: (element-type MidoriPrivateDataItem) (transfer none):
444 * a #GList of all previously-registered items if all arguments are
445 * given as %NULL, %NULL otherwise
428 **/446 **/
429GList*447GList*
430midori_private_data_register_item (const gchar* name,448midori_private_data_register_item (const gchar* name,
431449
=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c 2015-05-21 20:08:59 +0000
+++ midori/midori-searchaction.c 2015-07-06 21:42:31 +0000
@@ -1387,7 +1387,7 @@
1387 * the very same dialog until it is destroyed, in which case1387 * the very same dialog until it is destroyed, in which case
1388 * a new dialog is created.1388 * a new dialog is created.
1389 *1389 *
1390 * Return value: a #GtkDialog1390 * Return value: (transfer none): a #GtkDialog
1391 **/1391 **/
1392GtkWidget*1392GtkWidget*
1393midori_search_action_get_dialog (MidoriSearchAction* search_action)1393midori_search_action_get_dialog (MidoriSearchAction* search_action)
13941394
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c 2015-03-23 11:33:24 +0000
+++ midori/midori-view.c 2015-07-06 21:42:31 +0000
@@ -924,7 +924,7 @@
924 * @view: a #MidoriView924 * @view: a #MidoriView
925 * @message_type: a #GtkMessageType925 * @message_type: a #GtkMessageType
926 * @message: a message string926 * @message: a message string
927 * @response_cb: a response callback927 * @response_cb: (scope async): a response callback
928 * @user_data: user data passed to the callback928 * @user_data: user data passed to the callback
929 * @first_button_text: button text or stock ID929 * @first_button_text: button text or stock ID
930 * @...: first response ID, then more text - response ID pairs930 * @...: first response ID, then more text - response ID pairs
@@ -933,7 +933,7 @@
933 * button invokes the specified callback. The infobar is933 * button invokes the specified callback. The infobar is
934 * automatically destroyed if the location changes or reloads.934 * automatically destroyed if the location changes or reloads.
935 *935 *
936 * Return value: an infobar widget936 * Return value: (transfer none): an infobar widget
937 *937 *
938 * Since: 0.2.9938 * Since: 0.2.9
939 **/939 **/
@@ -3255,7 +3255,7 @@
3255 * Creates a new view with the specified parameters that3255 * Creates a new view with the specified parameters that
3256 * is visible by default.3256 * is visible by default.
3257 *3257 *
3258 * Return value: a new #MidoriView3258 * Return value: (transfer full): a new #MidoriView
3259 *3259 *
3260 * Since: 0.3.03260 * Since: 0.3.0
3261 * Deprecated: 0.4.33261 * Deprecated: 0.4.3
@@ -3279,7 +3279,7 @@
3279 *3279 *
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.
3281 *3281 *
3282 * Return value: a new #MidoriView3282 * Return value: (transfer full): a new #MidoriView
3283 *3283 *
3284 * Since: 0.4.33284 * Since: 0.4.3
3285 * Deprecated: 0.5.8: Use midori_view_new_from_view instead.3285 * Deprecated: 0.5.8: Use midori_view_new_from_view instead.
@@ -3316,7 +3316,7 @@
3316 *3316 *
3317 * Usually @settings should be passed from an existing view or browser.3317 * Usually @settings should be passed from an existing view or browser.
3318 *3318 *
3319 * Return value: a new #MidoriView3319 * Return value: (transfer full): a new #MidoriView
3320 *3320 *
3321 * Since: 0.5.83321 * Since: 0.5.8
3322 **/3322 **/
@@ -4023,7 +4023,7 @@
4023 *4023 *
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.
4025 *4025 *
4026 * Return value: a #GdkPixbuf, or %NULL4026 * Return value: (transfer none): a #GdkPixbuf, or %NULL
4027 **/4027 **/
4028GdkPixbuf*4028GdkPixbuf*
4029midori_view_get_icon (MidoriView* view)4029midori_view_get_icon (MidoriView* view)
@@ -4205,7 +4205,7 @@
4205 *4205 *
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.
4207 *4207 *
4208 * Return value: the proxy #GtkMenuItem4208 * Return value: (transfer none): the proxy #GtkMenuItem
4209 **/4209 **/
4210GtkWidget*4210GtkWidget*
4211midori_view_get_proxy_menu_item (MidoriView* view)4211midori_view_get_proxy_menu_item (MidoriView* view)
@@ -4228,6 +4228,15 @@
4228 return view->menu_item;4228 return view->menu_item;
4229}4229}
42304230
4231/**
4232 * midori_view_duplicate
4233 * @view: a #MidoriView
4234 *
4235 * Create a new #MidoriView from an existing one by using
4236 * the item of the old view.
4237 *
4238 * Return value: (transfer full): the new #MidoriView
4239 **/
4231GtkWidget*4240GtkWidget*
4232midori_view_duplicate (MidoriView* view)4241midori_view_duplicate (MidoriView* view)
4233{4242{
@@ -4247,7 +4256,7 @@
4247 * Retrieves a menu that is typically shown when right-clicking4256 * Retrieves a menu that is typically shown when right-clicking
4248 * a tab label or equivalent representation.4257 * a tab label or equivalent representation.
4249 *4258 *
4250 * Return value: a #GtkMenu4259 * Return value: (transfer full): a #GtkMenu
4251 *4260 *
4252 * Since: 0.1.84261 * Since: 0.1.8
4253 * Deprecated: 0.5.7: Use MidoriNotebook API instead.4262 * Deprecated: 0.5.7: Use MidoriNotebook API instead.
@@ -4271,7 +4280,7 @@
4271 * Retrieves a proxy tab label that is typically used when4280 * Retrieves a proxy tab label that is typically used when
4272 * adding the view to a notebook.4281 * adding the view to a notebook.
4273 *4282 *
4274 * Return value: the proxy #GtkEventBox4283 * Return value: (transfer none): the proxy #GtkEventBox
4275 *4284 *
4276 * Deprecated: 0.5.7: Don't use this label.4285 * Deprecated: 0.5.7: Don't use this label.
4277 **/4286 **/
@@ -4336,7 +4345,7 @@
4336 *4345 *
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).
4338 *4347 *
4339 * Return value: the proxy #KatzeItem4348 * Return value: (transfer none): the proxy #KatzeItem
4340 **/4349 **/
4341KatzeItem*4350KatzeItem*
4342midori_view_get_proxy_item (MidoriView* view)4351midori_view_get_proxy_item (MidoriView* view)
@@ -4920,7 +4929,7 @@
4920 * If width and height are negative, the resulting4929 * If width and height are negative, the resulting
4921 * image is going to be optimized for speed.4930 * image is going to be optimized for speed.
4922 *4931 *
4923 * Returns: a newly allocated #GdkPixbuf4932 * Returns: (transfer full): a newly allocated #GdkPixbuf
4924 *4933 *
4925 * Since: 0.2.14934 * Since: 0.2.1
4926 * Deprecated: 0.5.44935 * Deprecated: 0.5.4
@@ -4939,7 +4948,7 @@
4939 * midori_view_get_web_view4948 * midori_view_get_web_view
4940 * @view: a #MidoriView4949 * @view: a #MidoriView
4941 *4950 *
4942 * Returns: The #WebKitWebView for this view4951 * Returns: (transfer none): The #WebKitWebView for this view
4943 *4952 *
4944 * Since: 0.2.54953 * Since: 0.2.5
4945 * Deprecated: 0.4.8: Use midori_tab_get_web_view() instead.4954 * Deprecated: 0.4.8: Use midori_tab_get_web_view() instead.
@@ -4954,11 +4963,11 @@
49544963
4955/**4964/**
4956 * midori_view_get_for_widget:4965 * midori_view_get_for_widget:
4957 * @widget: a #GtkWidget4966 * @web_view: a #GtkWidget of type #WebKitWebView
4958 *4967 *
4959 * Determines the view appropriate for the specified widget.4968 * Determines the MidoriView for the specified #WebkitWebView widget.
4960 *4969 *
4961 * Return value: a #MidoriView4970 * Return value: (transfer none): a #MidoriView, or %NULL
4962 *4971 *
4963 * Since 0.4.54972 * Since 0.4.5
4964 **/4973 **/
49654974
=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c 2014-03-19 20:03:50 +0000
+++ midori/midori-websettings.c 2015-07-06 21:42:31 +0000
@@ -1525,7 +1525,7 @@
1525/**1525/**
1526 * midori_settings_save_to_file:1526 * midori_settings_save_to_file:
1527 * @settings: a MidoriWebSettings instance to save1527 * @settings: a MidoriWebSettings instance to save
1528 * @app: (type Midori.Application) (allow-none): a MidoriApplication instance1528 * @app: (type MidoriApp) (allow-none): a MidoriApp instance
1529 * @filename: the filename into which to save settings1529 * @filename: the filename into which to save settings
1530 * @error: (out) (allow-none): return location for a GError, or %NULL1530 * @error: (out) (allow-none): return location for a GError, or %NULL
1531 *1531 *

Subscribers

People subscribed via source and target branches

to all changes: