Merge lp:~ricotz/bamf/annotation-fixes into lp:bamf/0.4

Proposed by Rico Tzschichholz on 2012-10-08
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-10-09
Approved revision: 491
Merged at revision: 490
Proposed branch: lp:~ricotz/bamf/annotation-fixes
Merge into: lp:bamf/0.4
Diff against target: 123 lines (+37/-3)
6 files modified
lib/libbamf/Makefile.am (+5/-1)
lib/libbamf/bamf-application.c (+12/-0)
lib/libbamf/bamf-control.c (+5/-0)
lib/libbamf/bamf-tab-source.c (+13/-0)
lib/libbamf/bamf-view.c (+1/-1)
lib/libbamf/bamf-window.c (+1/-1)
To merge this branch: bzr merge lp:~ricotz/bamf/annotation-fixes
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2012-10-08 Approve on 2012-10-08
Review via email: mp+128544@code.launchpad.net

Commit message

libbamf: gir-annotion fixes and make gi-scanner verbose

Description of the change

libbamf: gir-annotion fixes and make gi-scanner verbose

To post a comment you must log in.
lp:~ricotz/bamf/annotation-fixes updated on 2012-10-08
491. By Rico Tzschichholz on 2012-10-08

libbamf: only perform introspection on public api

Marco Trevisan (Treviño) (3v1n0) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/libbamf/Makefile.am'
2--- lib/libbamf/Makefile.am 2012-07-31 15:51:02 +0000
3+++ lib/libbamf/Makefile.am 2012-10-08 17:07:43 +0000
4@@ -113,11 +113,15 @@
5
6 if HAVE_INTROSPECTION
7
8-introspection_sources = $(libbamf_la_SOURCES)
9+introspection_sources = \
10+ $(sources_h) \
11+ $(libbamf_sources) \
12+ $(NULL)
13
14 Bamf-0.2.gir: libbamf.la
15 Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0
16 Bamf_0_2_gir_CFLAGS = \
17+ --warn-all \
18 --c-include='libbamf/libbamf.h' \
19 $(DBUS_CFLAGS) \
20 -I$(top_srcdir)/lib \
21
22=== modified file 'lib/libbamf/bamf-application.c'
23--- lib/libbamf/bamf-application.c 2012-09-28 19:54:41 +0000
24+++ lib/libbamf/bamf-application.c 2012-10-08 17:07:43 +0000
25@@ -72,6 +72,12 @@
26 int show_stubs;
27 };
28
29+/**
30+ * bamf_application_get_supported_mime_types:
31+ * @application: a #BamfApplication
32+ *
33+ * Returns: (transfer full) (array zero-terminated=1): A string array containing the supported mime-types.
34+ */
35 gchar **
36 bamf_application_get_supported_mime_types (BamfApplication *application)
37 {
38@@ -402,6 +408,12 @@
39 }
40 }
41
42+/**
43+ * bamf_application_get_focusable_child:
44+ * @application: a #BamfApplication
45+ *
46+ * Returns: (transfer none): The focusable child for this application.
47+ */
48 BamfView *
49 bamf_application_get_focusable_child (BamfApplication *application)
50 {
51
52=== modified file 'lib/libbamf/bamf-control.c'
53--- lib/libbamf/bamf-control.c 2012-07-05 06:30:47 +0000
54+++ lib/libbamf/bamf-control.c 2012-10-08 17:07:43 +0000
55@@ -112,6 +112,11 @@
56 }
57 }
58
59+/**
60+ * bamf_control_get_default:
61+ *
62+ * Returns: (transfer none): The default #BamfControl reference.
63+ */
64 BamfControl *
65 bamf_control_get_default (void)
66 {
67
68=== modified file 'lib/libbamf/bamf-tab-source.c'
69--- lib/libbamf/bamf-tab-source.c 2012-08-21 22:02:12 +0000
70+++ lib/libbamf/bamf-tab-source.c 2012-10-08 17:07:43 +0000
71@@ -68,6 +68,12 @@
72 return TRUE;
73 }
74
75+/**
76+ * bamf_tab_source_get_tab_ids:
77+ * @source: a #BamfTabSource
78+ *
79+ * Returns: (transfer none) (allow-none) (array zero-terminated=1): A string array containing the IDs of this #BamfTabSource.
80+ */
81 char **
82 bamf_tab_source_get_tab_ids (BamfTabSource *source)
83 {
84@@ -79,6 +85,13 @@
85 return NULL;
86 }
87
88+/**
89+ * bamf_tab_source_get_tab_preview:
90+ * @source: a #BamfTabSource
91+ * @tab_id: an ID
92+ *
93+ * Returns: (transfer none) (allow-none): A #GArray containing the preview for the given ID of this #BamfTabSource.
94+ */
95 GArray *
96 bamf_tab_source_get_tab_preview (BamfTabSource *source,
97 char *tab_id)
98
99=== modified file 'lib/libbamf/bamf-view.c'
100--- lib/libbamf/bamf-view.c 2012-10-08 11:41:04 +0000
101+++ lib/libbamf/bamf-view.c 2012-10-08 17:07:43 +0000
102@@ -270,7 +270,7 @@
103 * bamf_view_user_visible:
104 * @view: a #BamfView
105 *
106- * Returns a boolean useful for determining if a particular view is "user visible". User visible
107+ * Returns: a boolean useful for determining if a particular view is "user visible". User visible
108 * is a concept relating to whether or not a window should be shown in a launcher tasklist.
109 */
110 gboolean
111
112=== modified file 'lib/libbamf/bamf-window.c'
113--- lib/libbamf/bamf-window.c 2012-07-01 18:13:55 +0000
114+++ lib/libbamf/bamf-window.c 2012-10-08 17:07:43 +0000
115@@ -79,7 +79,7 @@
116 * bamf_window_get_transient:
117 * @self: a #BamfWindow
118 *
119- * Returns: (transfer none) (nullable): A transient for this #BamfWindow.
120+ * Returns: (transfer none) (allow-none): A transient for this #BamfWindow.
121 */
122
123 BamfWindow * bamf_window_get_transient (BamfWindow *self)

Subscribers

People subscribed via source and target branches