Merge lp:~ted/libdbusmenu/break-abi-for-series-4 into lp:libdbusmenu/0.5
- break-abi-for-series-4
- Merge into trunk
Proposed by
Ted Gould
Status: | Merged |
---|---|
Merged at revision: | 167 |
Proposed branch: | lp:~ted/libdbusmenu/break-abi-for-series-4 |
Merge into: | lp:libdbusmenu/0.5 |
Diff against target: |
500 lines (+109/-39) 13 files modified
configure.ac (+2/-2) libdbusmenu-glib/client.c (+3/-3) libdbusmenu-glib/client.h (+14/-3) libdbusmenu-glib/menuitem-proxy.c (+3/-3) libdbusmenu-glib/menuitem-proxy.h (+16/-2) libdbusmenu-glib/menuitem.c (+3/-3) libdbusmenu-glib/menuitem.h (+20/-4) libdbusmenu-glib/server.c (+3/-4) libdbusmenu-glib/server.h (+19/-7) libdbusmenu-gtk/client.c (+3/-3) libdbusmenu-gtk/client.h (+10/-1) libdbusmenu-gtk/menu.c (+3/-3) libdbusmenu-gtk/menu.h (+10/-1) |
To merge this branch: | bzr merge lp:~ted/libdbusmenu/break-abi-for-series-4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cody Russell (community) | Approve | ||
Review via email: mp+38285@code.launchpad.net |
Commit message
Description of the change
An ABI break, because we love it! This does a couple of things that are important.
* It reinstates all of our reserved entries
* It moves the privates to a pointer access instead of a lookup
Since we're going to have to bump for all our other changes anyway, let's get max benefit!
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote : | # |
Revision history for this message
Cody Russell (bratsche) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'configure.ac' |
2 | --- configure.ac 2010-09-22 15:17:58 +0000 |
3 | +++ configure.ac 2010-10-12 21:39:44 +0000 |
4 | @@ -98,8 +98,8 @@ |
5 | # Lib versioning |
6 | ########################### |
7 | |
8 | -LIBDBUSMENU_CURRENT=1 |
9 | -LIBDBUSMENU_REVISION=17 |
10 | +LIBDBUSMENU_CURRENT=2 |
11 | +LIBDBUSMENU_REVISION=0 |
12 | LIBDBUSMENU_AGE=0 |
13 | |
14 | AC_SUBST(LIBDBUSMENU_CURRENT) |
15 | |
16 | === modified file 'libdbusmenu-glib/client.c' |
17 | --- libdbusmenu-glib/client.c 2010-08-27 22:01:01 +0000 |
18 | +++ libdbusmenu-glib/client.c 2010-10-12 21:39:44 +0000 |
19 | @@ -62,7 +62,6 @@ |
20 | |
21 | static guint signals[LAST_SIGNAL] = { 0 }; |
22 | |
23 | -typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate; |
24 | struct _DbusmenuClientPrivate |
25 | { |
26 | DbusmenuMenuitem * root; |
27 | @@ -113,8 +112,7 @@ |
28 | }; |
29 | |
30 | |
31 | -#define DBUSMENU_CLIENT_GET_PRIVATE(o) \ |
32 | -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_CLIENT, DbusmenuClientPrivate)) |
33 | +#define DBUSMENU_CLIENT_GET_PRIVATE(o) (DBUSMENU_CLIENT(o)->priv) |
34 | |
35 | /* GObject Stuff */ |
36 | static void dbusmenu_client_class_init (DbusmenuClientClass *klass); |
37 | @@ -254,6 +252,8 @@ |
38 | static void |
39 | dbusmenu_client_init (DbusmenuClient *self) |
40 | { |
41 | + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_CLIENT, DbusmenuClientPrivate); |
42 | + |
43 | DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(self); |
44 | |
45 | priv->root = NULL; |
46 | |
47 | === modified file 'libdbusmenu-glib/client.h' |
48 | --- libdbusmenu-glib/client.h 2010-08-26 19:45:26 +0000 |
49 | +++ libdbusmenu-glib/client.h 2010-10-12 21:39:44 +0000 |
50 | @@ -56,6 +56,8 @@ |
51 | #define DBUSMENU_CLIENT_TYPES_SEPARATOR "separator" |
52 | #define DBUSMENU_CLIENT_TYPES_IMAGE "standard" |
53 | |
54 | +typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate; |
55 | + |
56 | /** |
57 | DbusmenuClientClass: |
58 | @parent_class: #GObjectClass |
59 | @@ -65,6 +67,10 @@ |
60 | @event_result: Slot for #DbusmenuClient::event-error. |
61 | @reserved1: Reserved for future use. |
62 | @reserved2: Reserved for future use. |
63 | + @reserved3: Reserved for future use. |
64 | + @reserved4: Reserved for future use. |
65 | + @reserved5: Reserved for future use. |
66 | + @reserved6: Reserved for future use. |
67 | |
68 | A simple class that takes all of the information from a |
69 | #DbusmenuServer over DBus and makes the same set of |
70 | @@ -80,11 +86,13 @@ |
71 | void (*item_activate) (DbusmenuMenuitem * item, guint timestamp); |
72 | void (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue * data, guint timestamp, GError * error); |
73 | |
74 | - /* Reserved for future use */ |
75 | + /*< Private >*/ |
76 | void (*reserved1) (void); |
77 | void (*reserved2) (void); |
78 | - /* void (*reserved3) (void); */ |
79 | - /* void (*reserved4) (void); */ |
80 | + void (*reserved3) (void); |
81 | + void (*reserved4) (void); |
82 | + void (*reserved5) (void); |
83 | + void (*reserved6) (void); |
84 | }; |
85 | |
86 | /** |
87 | @@ -97,6 +105,9 @@ |
88 | typedef struct _DbusmenuClient DbusmenuClient; |
89 | struct _DbusmenuClient { |
90 | GObject parent; |
91 | + |
92 | + /*< Private >*/ |
93 | + DbusmenuClientPrivate * priv; |
94 | }; |
95 | |
96 | typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); |
97 | |
98 | === modified file 'libdbusmenu-glib/menuitem-proxy.c' |
99 | --- libdbusmenu-glib/menuitem-proxy.c 2010-02-10 23:08:47 +0000 |
100 | +++ libdbusmenu-glib/menuitem-proxy.c 2010-10-12 21:39:44 +0000 |
101 | @@ -32,7 +32,6 @@ |
102 | |
103 | #include "menuitem-proxy.h" |
104 | |
105 | -typedef struct _DbusmenuMenuitemProxyPrivate DbusmenuMenuitemProxyPrivate; |
106 | struct _DbusmenuMenuitemProxyPrivate { |
107 | DbusmenuMenuitem * mi; |
108 | gulong sig_property_changed; |
109 | @@ -49,8 +48,7 @@ |
110 | |
111 | #define PROP_MENU_ITEM_S "menu-item" |
112 | |
113 | -#define DBUSMENU_MENUITEM_PROXY_GET_PRIVATE(o) \ |
114 | -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyPrivate)) |
115 | +#define DBUSMENU_MENUITEM_PROXY_GET_PRIVATE(o) (DBUSMENU_MENUITEM_PROXY(o)->priv) |
116 | |
117 | static void dbusmenu_menuitem_proxy_class_init (DbusmenuMenuitemProxyClass *klass); |
118 | static void dbusmenu_menuitem_proxy_init (DbusmenuMenuitemProxy *self); |
119 | @@ -92,6 +90,8 @@ |
120 | static void |
121 | dbusmenu_menuitem_proxy_init (DbusmenuMenuitemProxy *self) |
122 | { |
123 | + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyPrivate); |
124 | + |
125 | DbusmenuMenuitemProxyPrivate * priv = DBUSMENU_MENUITEM_PROXY_GET_PRIVATE(self); |
126 | |
127 | priv->mi = NULL; |
128 | |
129 | === modified file 'libdbusmenu-glib/menuitem-proxy.h' |
130 | --- libdbusmenu-glib/menuitem-proxy.h 2010-02-10 22:59:39 +0000 |
131 | +++ libdbusmenu-glib/menuitem-proxy.h 2010-10-12 21:39:44 +0000 |
132 | @@ -42,17 +42,28 @@ |
133 | #define DBUSMENU_IS_MENUITEM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_MENUITEM_PROXY)) |
134 | #define DBUSMENU_MENUITEM_PROXY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyClass)) |
135 | |
136 | -typedef struct _DbusmenuMenuitemProxy DbusmenuMenuitemProxy; |
137 | -typedef struct _DbusmenuMenuitemProxyClass DbusmenuMenuitemProxyClass; |
138 | +typedef struct _DbusmenuMenuitemProxy DbusmenuMenuitemProxy; |
139 | +typedef struct _DbusmenuMenuitemProxyClass DbusmenuMenuitemProxyClass; |
140 | +typedef struct _DbusmenuMenuitemProxyPrivate DbusmenuMenuitemProxyPrivate; |
141 | |
142 | /** |
143 | DbusmenuMenuitemProxyClass: |
144 | @parent_class: The Class of #DbusmeneMenuitem |
145 | + @reserved1: Reserved for future use. |
146 | + @reserved2: Reserved for future use. |
147 | + @reserved3: Reserved for future use. |
148 | + @reserved4: Reserved for future use. |
149 | |
150 | Functions and signal slots for #DbusmenuMenuitemProxy. |
151 | */ |
152 | struct _DbusmenuMenuitemProxyClass { |
153 | DbusmenuMenuitemClass parent_class; |
154 | + |
155 | + /*< Private >*/ |
156 | + void (*reserved1) (void); |
157 | + void (*reserved2) (void); |
158 | + void (*reserved3) (void); |
159 | + void (*reserved4) (void); |
160 | }; |
161 | |
162 | /** |
163 | @@ -63,6 +74,9 @@ |
164 | */ |
165 | struct _DbusmenuMenuitemProxy { |
166 | DbusmenuMenuitem parent; |
167 | + |
168 | + /*< Private >*/ |
169 | + DbusmenuMenuitemProxyPrivate * priv; |
170 | }; |
171 | |
172 | GType dbusmenu_menuitem_proxy_get_type (void); |
173 | |
174 | === modified file 'libdbusmenu-glib/menuitem.c' |
175 | --- libdbusmenu-glib/menuitem.c 2010-09-22 14:39:21 +0000 |
176 | +++ libdbusmenu-glib/menuitem.c 2010-10-12 21:39:44 +0000 |
177 | @@ -52,7 +52,6 @@ |
178 | out of data that we have. They can still be gotten using |
179 | accessor functions, but are protected appropriately. |
180 | */ |
181 | -typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate; |
182 | struct _DbusmenuMenuitemPrivate |
183 | { |
184 | gint id; |
185 | @@ -84,8 +83,7 @@ |
186 | |
187 | #define PROP_ID_S "id" |
188 | |
189 | -#define DBUSMENU_MENUITEM_GET_PRIVATE(o) \ |
190 | -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemPrivate)) |
191 | +#define DBUSMENU_MENUITEM_GET_PRIVATE(o) (DBUSMENU_MENUITEM(o)->priv) |
192 | |
193 | /* Prototypes */ |
194 | static void dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass); |
195 | @@ -290,6 +288,8 @@ |
196 | static void |
197 | dbusmenu_menuitem_init (DbusmenuMenuitem *self) |
198 | { |
199 | + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemPrivate); |
200 | + |
201 | DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(self); |
202 | |
203 | priv->id = -1; |
204 | |
205 | === modified file 'libdbusmenu-glib/menuitem.h' |
206 | --- libdbusmenu-glib/menuitem.h 2010-09-22 15:01:52 +0000 |
207 | +++ libdbusmenu-glib/menuitem.h 2010-10-12 21:39:44 +0000 |
208 | @@ -78,6 +78,8 @@ |
209 | |
210 | #define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu" |
211 | |
212 | +typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate; |
213 | + |
214 | /** |
215 | * DbusmenuMenuitem: |
216 | * |
217 | @@ -92,6 +94,9 @@ |
218 | struct _DbusmenuMenuitem |
219 | { |
220 | GObject parent; |
221 | + |
222 | + /*< Private >*/ |
223 | + DbusmenuMenuitemPrivate * priv; |
224 | }; |
225 | |
226 | /** |
227 | @@ -126,6 +131,13 @@ |
228 | * @handle_event: This function is to override how events are handled by subclasses. Look at #dbusmenu_menuitem_handle_event for lots of good information. |
229 | * @send_about_to_show: Virtual function that notifies server that the client is about to show a menu. |
230 | * @show_to_user: Slot for #DbusmenuMenuitem::show-to-user. |
231 | + * |
232 | + * @reserved1: Reserved for future use. |
233 | + * @reserved2: Reserved for future use. |
234 | + * @reserved3: Reserved for future use. |
235 | + * @reserved4: Reserved for future use. |
236 | + * @reserved5: Reserved for future use. |
237 | + * @reserved6: Reserved for future use. |
238 | */ |
239 | typedef struct _DbusmenuMenuitemClass DbusmenuMenuitemClass; |
240 | struct _DbusmenuMenuitemClass |
241 | @@ -146,10 +158,14 @@ |
242 | void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data); |
243 | |
244 | void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpointer cb_data); |
245 | - /* void (*reserved1) (void); */ |
246 | - /* void (*reserved2) (void); */ |
247 | - /* void (*reserved3) (void); */ |
248 | - /* void (*reserved4) (void); -- realized, realloc when bumping lib version */ |
249 | + |
250 | + /*< Private >*/ |
251 | + void (*reserved1) (void); |
252 | + void (*reserved2) (void); |
253 | + void (*reserved3) (void); |
254 | + void (*reserved4) (void); |
255 | + void (*reserved5) (void); |
256 | + void (*reserved6) (void); |
257 | }; |
258 | |
259 | GType dbusmenu_menuitem_get_type (void); |
260 | |
261 | === modified file 'libdbusmenu-glib/server.c' |
262 | --- libdbusmenu-glib/server.c 2010-09-15 14:24:38 +0000 |
263 | +++ libdbusmenu-glib/server.c 2010-10-12 21:39:44 +0000 |
264 | @@ -53,8 +53,6 @@ |
265 | #define DBUSMENU_VERSION_NUMBER 2 |
266 | |
267 | /* Privates, I'll show you mine... */ |
268 | -typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate; |
269 | - |
270 | struct _DbusmenuServerPrivate |
271 | { |
272 | DbusmenuMenuitem * root; |
273 | @@ -63,8 +61,7 @@ |
274 | guint layout_idle; |
275 | }; |
276 | |
277 | -#define DBUSMENU_SERVER_GET_PRIVATE(o) \ |
278 | -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_SERVER, DbusmenuServerPrivate)) |
279 | +#define DBUSMENU_SERVER_GET_PRIVATE(o) (DBUSMENU_SERVER(o)->priv) |
280 | |
281 | /* Signals */ |
282 | enum { |
283 | @@ -214,6 +211,8 @@ |
284 | static void |
285 | dbusmenu_server_init (DbusmenuServer *self) |
286 | { |
287 | + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_SERVER, DbusmenuServerPrivate); |
288 | + |
289 | DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(self); |
290 | |
291 | priv->root = NULL; |
292 | |
293 | === modified file 'libdbusmenu-glib/server.h' |
294 | --- libdbusmenu-glib/server.h 2010-07-20 21:15:25 +0000 |
295 | +++ libdbusmenu-glib/server.h 2010-10-12 21:39:44 +0000 |
296 | @@ -53,6 +53,8 @@ |
297 | #define DBUSMENU_SERVER_PROP_ROOT_NODE "root-node" |
298 | #define DBUSMENU_SERVER_PROP_VERSION "version" |
299 | |
300 | +typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate; |
301 | + |
302 | /** |
303 | DbusmenuServerClass: |
304 | @parent_class: #GObjectClass |
305 | @@ -60,9 +62,13 @@ |
306 | @id_update: Slot for #DbusmenuServer::id-update. |
307 | @layout_updated: Slot for #DbusmenuServer::layout-update. |
308 | @item_activation_requested: Slot for #DbusmenuServer::item-activation-requested. |
309 | - @dbusmenu_server_reserved1: Reserved for future use. |
310 | - @dbusmenu_server_reserved2: Reserved for future use. |
311 | - @dbusmenu_server_reserved3: Reserved for future use. |
312 | + |
313 | + @reserved1: Reserved for future use. |
314 | + @reserved2: Reserved for future use. |
315 | + @reserved3: Reserved for future use. |
316 | + @reserved4: Reserved for future use. |
317 | + @reserved5: Reserved for future use. |
318 | + @reserved6: Reserved for future use. |
319 | |
320 | The class implementing the virtual functions for #DbusmenuServer. |
321 | */ |
322 | @@ -76,10 +82,13 @@ |
323 | void (*layout_updated)(gint revision); |
324 | void (*item_activation)(gint id, guint timestamp); |
325 | |
326 | - /* Reserved */ |
327 | - void (*dbusmenu_server_reserved1)(void); |
328 | - void (*dbusmenu_server_reserved2)(void); |
329 | - void (*dbusmenu_server_reserved3)(void); |
330 | + /*< Private >*/ |
331 | + void (*reserved1) (void); |
332 | + void (*reserved2) (void); |
333 | + void (*reserved3) (void); |
334 | + void (*reserved4) (void); |
335 | + void (*reserved5) (void); |
336 | + void (*reserved6) (void); |
337 | }; |
338 | |
339 | /** |
340 | @@ -92,6 +101,9 @@ |
341 | typedef struct _DbusmenuServer DbusmenuServer; |
342 | struct _DbusmenuServer { |
343 | GObject parent; |
344 | + |
345 | + /*< Private >*/ |
346 | + DbusmenuServerPrivate * priv; |
347 | }; |
348 | |
349 | GType dbusmenu_server_get_type (void); |
350 | |
351 | === modified file 'libdbusmenu-gtk/client.c' |
352 | --- libdbusmenu-gtk/client.c 2010-08-30 20:22:43 +0000 |
353 | +++ libdbusmenu-gtk/client.c 2010-10-12 21:39:44 +0000 |
354 | @@ -37,13 +37,11 @@ |
355 | #include "genericmenuitem.h" |
356 | |
357 | /* Private */ |
358 | -typedef struct _DbusmenuGtkClientPrivate DbusmenuGtkClientPrivate; |
359 | struct _DbusmenuGtkClientPrivate { |
360 | GtkAccelGroup * agroup; |
361 | }; |
362 | |
363 | -#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) \ |
364 | -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate)) |
365 | +#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) (DBUSMENU_GTKCLIENT(o)->priv) |
366 | |
367 | /* Prototypes */ |
368 | static void dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass); |
369 | @@ -85,6 +83,8 @@ |
370 | static void |
371 | dbusmenu_gtkclient_init (DbusmenuGtkClient *self) |
372 | { |
373 | + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate); |
374 | + |
375 | DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(self); |
376 | |
377 | priv->agroup = NULL; |
378 | |
379 | === modified file 'libdbusmenu-gtk/client.h' |
380 | --- libdbusmenu-gtk/client.h 2010-06-14 21:10:54 +0000 |
381 | +++ libdbusmenu-gtk/client.h 2010-10-12 21:39:44 +0000 |
382 | @@ -43,6 +43,8 @@ |
383 | |
384 | #define DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED |
385 | |
386 | +typedef struct _DbusmenuGtkClientPrivate DbusmenuGtkClientPrivate; |
387 | + |
388 | /** |
389 | DbusmenuGtkClientClass: |
390 | @parent_class: #GtkMenuClass |
391 | @@ -50,6 +52,8 @@ |
392 | @reserved2: Reserved for future use. |
393 | @reserved3: Reserved for future use. |
394 | @reserved4: Reserved for future use. |
395 | + @reserved5: Reserved for future use. |
396 | + @reserved6: Reserved for future use. |
397 | */ |
398 | typedef struct _DbusmenuGtkClientClass DbusmenuGtkClientClass; |
399 | struct _DbusmenuGtkClientClass { |
400 | @@ -58,11 +62,13 @@ |
401 | /* Signals */ |
402 | void (*root_changed) (DbusmenuMenuitem * newroot); |
403 | |
404 | - /* Reserved */ |
405 | + /*< Private >*/ |
406 | void (*reserved1) (void); |
407 | void (*reserved2) (void); |
408 | void (*reserved3) (void); |
409 | void (*reserved4) (void); |
410 | + void (*reserved5) (void); |
411 | + void (*reserved6) (void); |
412 | }; |
413 | |
414 | /** |
415 | @@ -72,6 +78,9 @@ |
416 | typedef struct _DbusmenuGtkClient DbusmenuGtkClient; |
417 | struct _DbusmenuGtkClient { |
418 | DbusmenuClient parent; |
419 | + |
420 | + /*< Private >*/ |
421 | + DbusmenuGtkClientPrivate * priv; |
422 | }; |
423 | |
424 | GType dbusmenu_gtkclient_get_type (void); |
425 | |
426 | === modified file 'libdbusmenu-gtk/menu.c' |
427 | --- libdbusmenu-gtk/menu.c 2010-04-15 05:54:44 +0000 |
428 | +++ libdbusmenu-gtk/menu.c 2010-10-12 21:39:44 +0000 |
429 | @@ -44,7 +44,6 @@ |
430 | }; |
431 | |
432 | /* Private */ |
433 | -typedef struct _DbusmenuGtkMenuPrivate DbusmenuGtkMenuPrivate; |
434 | struct _DbusmenuGtkMenuPrivate { |
435 | DbusmenuGtkClient * client; |
436 | |
437 | @@ -52,8 +51,7 @@ |
438 | gchar * dbus_name; |
439 | }; |
440 | |
441 | -#define DBUSMENU_GTKMENU_GET_PRIVATE(o) \ |
442 | -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuPrivate)) |
443 | +#define DBUSMENU_GTKMENU_GET_PRIVATE(o) (DBUSMENU_GTKMENU(o)->priv) |
444 | |
445 | /* Prototypes */ |
446 | static void dbusmenu_gtkmenu_class_init (DbusmenuGtkMenuClass *klass); |
447 | @@ -110,6 +108,8 @@ |
448 | static void |
449 | dbusmenu_gtkmenu_init (DbusmenuGtkMenu *self) |
450 | { |
451 | + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuPrivate); |
452 | + |
453 | DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(self); |
454 | |
455 | priv->client = NULL; |
456 | |
457 | === modified file 'libdbusmenu-gtk/menu.h' |
458 | --- libdbusmenu-gtk/menu.h 2009-08-26 22:22:50 +0000 |
459 | +++ libdbusmenu-gtk/menu.h 2010-10-12 21:39:44 +0000 |
460 | @@ -42,6 +42,8 @@ |
461 | #define DBUSMENU_IS_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_GTKMENU_TYPE)) |
462 | #define DBUSMENU_GTKMENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass)) |
463 | |
464 | +typedef struct _DbusmenuGtkMenuPrivate DbusmenuGtkMenuPrivate; |
465 | + |
466 | /** |
467 | DbusmenuGtkMenuClass: |
468 | @parent_class: #GtkMenuClass |
469 | @@ -49,16 +51,20 @@ |
470 | @reserved2: Reserved for future use. |
471 | @reserved3: Reserved for future use. |
472 | @reserved4: Reserved for future use. |
473 | + @reserved5: Reserved for future use. |
474 | + @reserved6: Reserved for future use. |
475 | */ |
476 | typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass; |
477 | struct _DbusmenuGtkMenuClass { |
478 | GtkMenuClass parent_class; |
479 | |
480 | - /* Reserved */ |
481 | + /*< Private >*/ |
482 | void (*reserved1) (void); |
483 | void (*reserved2) (void); |
484 | void (*reserved3) (void); |
485 | void (*reserved4) (void); |
486 | + void (*reserved5) (void); |
487 | + void (*reserved6) (void); |
488 | }; |
489 | |
490 | /** |
491 | @@ -68,6 +74,9 @@ |
492 | typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu; |
493 | struct _DbusmenuGtkMenu { |
494 | GtkMenu parent; |
495 | + |
496 | + /*< Private >*/ |
497 | + DbusmenuGtkMenuPrivate * priv; |
498 | }; |
499 | |
500 | GType dbusmenu_gtkmenu_get_type (void); |
review approve
Looks good to me.