Merge lp:~pete-woods/hud/gtkdoc-fix-behaviour-change into lp:hud/14.04

Proposed by Pete Woods
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 375
Merged at revision: 375
Proposed branch: lp:~pete-woods/hud/gtkdoc-fix-behaviour-change
Merge into: lp:hud/14.04
Diff against target: 89 lines (+24/-4)
5 files modified
libhud-client/connection.h (+6/-0)
libhud-client/param.h (+6/-0)
libhud-client/query.h (+6/-0)
libhud-gtk/manager.h (+6/-2)
libhud/manager.h (+0/-2)
To merge this branch: bzr merge lp:~pete-woods/hud/gtkdoc-fix-behaviour-change
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Marcus Tomlinson (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+207948@code.launchpad.net

Commit message

Change GTK documentation so that it builds with the new glib version

Description of the change

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
  * Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
  * Yes
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
  * Yes
 * Has your component "TestPlan” been executed successfully on emulator, N4?
  * Yes
 * Has a 5 minute exploratory testing run been executed on N4?
  * Yes
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
  * N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
  * No change
 * What components might get impacted by your changes?
  * Unity7
  * Unity8
 * Have you requested review by the teams of these owning components?
  * Yes

Check List:
https://wiki.ubuntu.com/Process/Merges/Checklists/hud

Test Plan:
https://wiki.ubuntu.com/Process/Merges/TestPlan/hud

Silo:
<missing>

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

+1 :)

review: Approve
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libhud-client/connection.h'
2--- libhud-client/connection.h 2013-11-14 18:22:42 +0000
3+++ libhud-client/connection.h 2014-02-24 15:06:25 +0000
4@@ -48,6 +48,12 @@
5 typedef struct _HudClientConnectionPrivate HudClientConnectionPrivate ;
6
7 /**
8+ * HudClientConnectionPrivate:
9+ *
10+ * Private data for #HudClientConnection.
11+ */
12+
13+/**
14 * HudClientConnectionNewQueryCallback:
15 * @connection: #HudClientConnection for the request
16 * @query_path: Path to the query object on DBus
17
18=== modified file 'libhud-client/param.h'
19--- libhud-client/param.h 2013-11-27 14:28:43 +0000
20+++ libhud-client/param.h 2014-02-24 15:06:25 +0000
21@@ -50,6 +50,12 @@
22 typedef struct _HudClientParamPrivate HudClientParamPrivate;
23
24 /**
25+ * HudClientParamPrivate:
26+ *
27+ * Private data for #HudClientParam.
28+ */
29+
30+/**
31 * HudClientParamClass:
32 * @parent_class: #GObjectClass
33 * @model_ready: Slot for the model-ready signal
34
35=== modified file 'libhud-client/query.h'
36--- libhud-client/query.h 2013-11-12 12:37:14 +0000
37+++ libhud-client/query.h 2014-02-24 15:06:25 +0000
38@@ -58,6 +58,12 @@
39 typedef struct _HudClientQueryPrivate HudClientQueryPrivate;
40
41 /**
42+ * HudClientQueryPrivate:
43+ *
44+ * Private data for #HudClientQuery.
45+ */
46+
47+/**
48 * HudClientQueryClass:
49 * @parent_class: #GObjectClass
50 *
51
52=== modified file 'libhud-gtk/manager.h'
53--- libhud-gtk/manager.h 2013-04-01 16:33:28 +0000
54+++ libhud-gtk/manager.h 2014-02-24 15:06:25 +0000
55@@ -43,6 +43,12 @@
56 typedef struct _HudGtkManagerPrivate HudGtkManagerPrivate;
57
58 /**
59+ * HudGtkManagerPrivate:
60+ *
61+ * Private data for #HudGtkManager.
62+ */
63+
64+/**
65 * HudGtkManagerClass:
66 * @parent_class: #HudManagerClass
67 *
68@@ -54,8 +60,6 @@
69
70 /**
71 * HudGtkManager:
72- * @parent: #HudManager
73- * @priv: Private data
74 *
75 * Helper class to work with #GtkApplication to automatically
76 * export action groups registered there to the HUD.
77
78=== modified file 'libhud/manager.h'
79--- libhud/manager.h 2013-04-01 16:55:43 +0000
80+++ libhud/manager.h 2014-02-24 15:06:25 +0000
81@@ -69,8 +69,6 @@
82
83 /**
84 * HudManager:
85- * @parent: #GObject instance data
86- * @priv: Private data
87 *
88 * Instance data for the HUD Manager object. This object
89 * tracks the information exported to the HUD for a specific

Subscribers

People subscribed via source and target branches