DBus Menu

Merge lp:~cyphermox/libdbusmenu/remove_g_type_init into lp:libdbusmenu/13.04

  1. remove_g_type_init
  2. Merge into trunk.13.04
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 440
Merged at revision: 438
Proposed branch: lp:~cyphermox/libdbusmenu/remove_g_type_init
Merge into: lp:libdbusmenu/13.04
Diff against target: 387 lines (+7/-51)
30 files modified
configure.ac (+1/-1)
debian/changelog (+3/-0)
debian/control (+1/-0)
docs/libdbusmenu-glib/reference/Makefile.am (+1/-1)
docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml (+0/-3)
docs/libdbusmenu-gtk/reference/Makefile.am (+1/-1)
docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml (+0/-1)
tests/glib-server-nomenu.c (+0/-2)
tests/test-glib-events-client.c (+0/-2)
tests/test-glib-events-nogroup-client.c (+0/-2)
tests/test-glib-events-server.c (+0/-2)
tests/test-glib-layout-client.c (+0/-2)
tests/test-glib-layout-server.c (+0/-2)
tests/test-glib-objects.c (+0/-1)
tests/test-glib-properties-client.c (+0/-2)
tests/test-glib-properties-server.c (+0/-2)
tests/test-glib-proxy-client.c (+0/-2)
tests/test-glib-proxy-proxy.c (+0/-2)
tests/test-glib-proxy-server.c (+0/-2)
tests/test-glib-simple-items.c (+0/-2)
tests/test-glib-submenu-client.c (+0/-2)
tests/test-glib-submenu-server.c (+0/-2)
tests/test-gtk-label-server.c (+0/-2)
tests/test-gtk-reorder-server.c (+0/-2)
tests/test-gtk-shortcut-server.c (+0/-2)
tests/test-gtk-submenu-server.c (+0/-2)
tests/test-json-client.c (+0/-2)
tests/test-json-server.c (+0/-2)
tools/dbusmenu-dumper.c (+0/-1)
tools/testapp/main.c (+0/-2)
To merge this branch: bzr merge lp:~cyphermox/libdbusmenu/remove_g_type_init
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+144146@code.launchpad.net

Description of the change

Remove uses of g_type_init.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Nice work :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/dbusmenu-autolanding/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-autolanding/./build=pbuilder,distribution=raring,flavor=i386/16/console

review: Needs Fixing (continuous-integration)
lp:~cyphermox/libdbusmenu/remove_g_type_init updated
439. By Mathieu Trudel-Lapierre

Remove xml documentation includes that can't be found and don't seem to be generated anywhere.

440. By Mathieu Trudel-Lapierre

* Update main sgml documentation files to remove the xml includes we don't
  generate anymore. (LP: #1102468)
* Drop deprecated calls to g_type_init(). (LP: #1102471)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/23/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/23/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/23//rebuild/?

review: Approve (continuous-integration)

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 2012-12-17 21:59:01 +0000
3+++ configure.ac 2013-01-21 16:33:25 +0000
4@@ -34,7 +34,7 @@
5 # Dependencies - GLib
6 ###########################
7
8-GLIB_REQUIRED_VERSION=2.26
9+GLIB_REQUIRED_VERSION=2.35.4
10
11 PKG_CHECK_MODULES(DBUSMENUGLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION
12 gio-2.0 >= $GLIB_REQUIRED_VERSION)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-01-09 06:40:12 +0000
16+++ debian/changelog 2013-01-21 16:33:25 +0000
17@@ -23,6 +23,9 @@
18 * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
19 * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the
20 multiarch triplet rather than usr/lib/libdbusmenu.
21+ * Update main sgml documentation files to remove the xml includes we don't
22+ generate anymore. (LP: #1102468)
23+ * Drop deprecated calls to g_type_init(). (LP: #1102471)
24
25 [ Didier Roche ]
26 * Automatic snapshot from revision 435 (bootstrap):
27
28=== modified file 'debian/control'
29--- debian/control 2012-12-05 00:13:40 +0000
30+++ debian/control 2013-01-21 16:33:25 +0000
31@@ -14,6 +14,7 @@
32 valgrind,
33 dbus-test-runner,
34 xvfb,
35+ libglib2.0-dev (>= 2.35.4),
36 libgtk2.0-dev (>= 2.24.4-1~),
37 libgtk-3-dev (>= 2.99.2-1ubuntu2),
38 libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
39
40=== modified file 'docs/libdbusmenu-glib/reference/Makefile.am'
41--- docs/libdbusmenu-glib/reference/Makefile.am 2012-12-17 22:01:25 +0000
42+++ docs/libdbusmenu-glib/reference/Makefile.am 2013-01-21 16:33:25 +0000
43@@ -21,7 +21,7 @@
44 DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-glib $(abs_top_builddir)/libdbusmenu-glib
45
46 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
47-SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
48+SCANGOBJ_OPTIONS=--nogtkinit
49
50 # Extra options to supply to gtkdoc-scan.
51 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
52
53=== modified file 'docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml'
54--- docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml 2011-02-24 15:38:18 +0000
55+++ docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml 2013-01-21 16:33:25 +0000
56@@ -15,9 +15,6 @@
57 <xi:include href="xml/menuitem-proxy.xml"/>
58 <xi:include href="xml/menuitem.xml"/>
59 <xi:include href="xml/client.xml"/>
60- <xi:include href="xml/client-menuitem.xml"/>
61- <xi:include href="xml/dbusmenu-client.xml"/>
62- <xi:include href="xml/dbusmenu-server.xml"/>
63 <xi:include href="xml/types.xml"/>
64
65 </chapter>
66
67=== modified file 'docs/libdbusmenu-gtk/reference/Makefile.am'
68--- docs/libdbusmenu-gtk/reference/Makefile.am 2012-12-17 22:01:25 +0000
69+++ docs/libdbusmenu-gtk/reference/Makefile.am 2013-01-21 16:33:25 +0000
70@@ -28,7 +28,7 @@
71 DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-gtk
72
73 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
74-SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
75+SCANGOBJ_OPTIONS=--nogtkinit
76
77 # Extra options to supply to gtkdoc-scan.
78 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
79
80=== modified file 'docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml'
81--- docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml 2011-02-21 20:55:01 +0000
82+++ docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml 2013-01-21 16:33:25 +0000
83@@ -15,7 +15,6 @@
84 <xi:include href="xml/menuitem.xml"/>
85 <xi:include href="xml/client.xml"/>
86 <xi:include href="xml/parser.xml"/>
87- <xi:include href="xml/serializablemenuitem.xml"/>
88
89 </chapter>
90 <chapter id="object-tree">
91
92=== modified file 'tests/glib-server-nomenu.c'
93--- tests/glib-server-nomenu.c 2009-05-15 20:23:34 +0000
94+++ tests/glib-server-nomenu.c 2013-01-21 16:33:25 +0000
95@@ -27,8 +27,6 @@
96 int
97 main (int argc, char ** argv)
98 {
99- g_type_init();
100-
101 DbusmenuServer * server = dbusmenu_server_new("/org/test");
102 DbusmenuMenuitem * menuitem = dbusmenu_menuitem_new();
103 dbusmenu_menuitem_property_set(menuitem, "test", "test");
104
105=== modified file 'tests/test-glib-events-client.c'
106--- tests/test-glib-events-client.c 2010-11-18 20:42:25 +0000
107+++ tests/test-glib-events-client.c 2013-01-21 16:33:25 +0000
108@@ -114,8 +114,6 @@
109 int
110 main (int argc, char ** argv)
111 {
112- g_type_init();
113-
114 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
115 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
116 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
117
118=== modified file 'tests/test-glib-events-nogroup-client.c'
119--- tests/test-glib-events-nogroup-client.c 2012-04-03 14:55:04 +0000
120+++ tests/test-glib-events-nogroup-client.c 2013-01-21 16:33:25 +0000
121@@ -118,8 +118,6 @@
122 int
123 main (int argc, char ** argv)
124 {
125- g_type_init();
126-
127 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
128 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
129 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
130
131=== modified file 'tests/test-glib-events-server.c'
132--- tests/test-glib-events-server.c 2010-11-16 19:46:26 +0000
133+++ tests/test-glib-events-server.c 2013-01-21 16:33:25 +0000
134@@ -68,8 +68,6 @@
135 int
136 main (int argc, char ** argv)
137 {
138- g_type_init();
139-
140 g_bus_own_name(G_BUS_TYPE_SESSION,
141 "org.dbusmenu.test",
142 G_BUS_NAME_OWNER_FLAGS_NONE,
143
144=== modified file 'tests/test-glib-layout-client.c'
145--- tests/test-glib-layout-client.c 2011-02-15 04:33:02 +0000
146+++ tests/test-glib-layout-client.c 2013-01-21 16:33:25 +0000
147@@ -114,8 +114,6 @@
148 int
149 main (int argc, char ** argv)
150 {
151- g_type_init();
152-
153 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
154 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
155
156
157=== modified file 'tests/test-glib-layout-server.c'
158--- tests/test-glib-layout-server.c 2010-12-07 15:45:41 +0000
159+++ tests/test-glib-layout-server.c 2013-01-21 16:33:25 +0000
160@@ -90,8 +90,6 @@
161 int
162 main (int argc, char ** argv)
163 {
164- g_type_init();
165-
166 g_bus_own_name(G_BUS_TYPE_SESSION,
167 "org.dbusmenu.test",
168 G_BUS_NAME_OWNER_FLAGS_NONE,
169
170=== modified file 'tests/test-glib-objects.c'
171--- tests/test-glib-objects.c 2011-01-06 02:49:47 +0000
172+++ tests/test-glib-objects.c 2013-01-21 16:33:25 +0000
173@@ -324,7 +324,6 @@
174 gint
175 main (gint argc, gchar * argv[])
176 {
177- g_type_init();
178 g_test_init(&argc, &argv, NULL);
179
180 /* Test suites */
181
182=== modified file 'tests/test-glib-properties-client.c'
183--- tests/test-glib-properties-client.c 2010-08-12 21:25:40 +0000
184+++ tests/test-glib-properties-client.c 2013-01-21 16:33:25 +0000
185@@ -152,8 +152,6 @@
186 int
187 main (int argc, char ** argv)
188 {
189- g_type_init();
190-
191 /* Make sure the server starts up and all that */
192 g_usleep(500000);
193
194
195=== modified file 'tests/test-glib-properties-server.c'
196--- tests/test-glib-properties-server.c 2010-11-16 21:47:10 +0000
197+++ tests/test-glib-properties-server.c 2013-01-21 16:33:25 +0000
198@@ -86,8 +86,6 @@
199 int
200 main (int argc, char ** argv)
201 {
202- g_type_init();
203-
204 server = dbusmenu_server_new("/org/test");
205
206 timer_func(NULL);
207
208=== modified file 'tests/test-glib-proxy-client.c'
209--- tests/test-glib-proxy-client.c 2012-01-30 22:23:04 +0000
210+++ tests/test-glib-proxy-client.c 2013-01-21 16:33:25 +0000
211@@ -159,8 +159,6 @@
212 int
213 main (int argc, char ** argv)
214 {
215- g_type_init();
216-
217 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");
218 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
219
220
221=== modified file 'tests/test-glib-proxy-proxy.c'
222--- tests/test-glib-proxy-proxy.c 2010-11-23 19:27:13 +0000
223+++ tests/test-glib-proxy-proxy.c 2013-01-21 16:33:25 +0000
224@@ -49,8 +49,6 @@
225 int
226 main (int argc, char ** argv)
227 {
228- g_type_init();
229-
230 if (argc != 3) {
231 g_error ("Need two params");
232 return 1;
233
234=== modified file 'tests/test-glib-proxy-server.c'
235--- tests/test-glib-proxy-server.c 2010-11-19 23:08:52 +0000
236+++ tests/test-glib-proxy-server.c 2013-01-21 16:33:25 +0000
237@@ -120,8 +120,6 @@
238 int
239 main (int argc, char ** argv)
240 {
241- g_type_init();
242-
243 g_bus_own_name(G_BUS_TYPE_SESSION,
244 "test.proxy.server",
245 G_BUS_NAME_OWNER_FLAGS_NONE,
246
247=== modified file 'tests/test-glib-simple-items.c'
248--- tests/test-glib-simple-items.c 2010-11-16 23:16:45 +0000
249+++ tests/test-glib-simple-items.c 2013-01-21 16:33:25 +0000
250@@ -32,8 +32,6 @@
251 int
252 main (int argc, char ** argv)
253 {
254- g_type_init();
255-
256 DbusmenuServer * server = dbusmenu_server_new("/test/object");
257 root_menuitem = dbusmenu_menuitem_new();
258 dbusmenu_server_set_root(server, root_menuitem);
259
260=== modified file 'tests/test-glib-submenu-client.c'
261--- tests/test-glib-submenu-client.c 2010-06-08 20:48:01 +0000
262+++ tests/test-glib-submenu-client.c 2013-01-21 16:33:25 +0000
263@@ -97,8 +97,6 @@
264 int
265 main (int argc, char ** argv)
266 {
267- g_type_init();
268-
269 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
270 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
271
272
273=== modified file 'tests/test-glib-submenu-server.c'
274--- tests/test-glib-submenu-server.c 2010-11-16 23:16:45 +0000
275+++ tests/test-glib-submenu-server.c 2013-01-21 16:33:25 +0000
276@@ -90,8 +90,6 @@
277 int
278 main (int argc, char ** argv)
279 {
280- g_type_init();
281-
282 g_bus_own_name(G_BUS_TYPE_SESSION,
283 "org.dbusmenu.test",
284 G_BUS_NAME_OWNER_FLAGS_NONE,
285
286=== modified file 'tests/test-gtk-label-server.c'
287--- tests/test-gtk-label-server.c 2010-11-16 23:16:45 +0000
288+++ tests/test-gtk-label-server.c 2013-01-21 16:33:25 +0000
289@@ -71,8 +71,6 @@
290 int
291 main (int argc, char ** argv)
292 {
293- g_type_init();
294-
295 JsonParser * parser = json_parser_new();
296 GError * error = NULL;
297 if (!json_parser_load_from_file(parser, argv[1], &error)) {
298
299=== modified file 'tests/test-gtk-reorder-server.c'
300--- tests/test-gtk-reorder-server.c 2010-11-16 23:16:45 +0000
301+++ tests/test-gtk-reorder-server.c 2013-01-21 16:33:25 +0000
302@@ -99,8 +99,6 @@
303 int
304 main (int argc, char ** argv)
305 {
306- g_type_init();
307-
308 g_bus_own_name(G_BUS_TYPE_SESSION,
309 "glib.label.test",
310 G_BUS_NAME_OWNER_FLAGS_NONE,
311
312=== modified file 'tests/test-gtk-shortcut-server.c'
313--- tests/test-gtk-shortcut-server.c 2011-06-17 18:34:02 +0000
314+++ tests/test-gtk-shortcut-server.c 2013-01-21 16:33:25 +0000
315@@ -83,8 +83,6 @@
316 int
317 main (int argc, char ** argv)
318 {
319- g_type_init();
320-
321 g_bus_own_name(G_BUS_TYPE_SESSION,
322 "glib.label.test",
323 G_BUS_NAME_OWNER_FLAGS_NONE,
324
325=== modified file 'tests/test-gtk-submenu-server.c'
326--- tests/test-gtk-submenu-server.c 2012-02-22 10:02:01 +0000
327+++ tests/test-gtk-submenu-server.c 2013-01-21 16:33:25 +0000
328@@ -92,8 +92,6 @@
329 int
330 main (int argc, char ** argv)
331 {
332- g_type_init();
333-
334 g_bus_own_name(G_BUS_TYPE_SESSION,
335 "glib.label.test",
336 G_BUS_NAME_OWNER_FLAGS_NONE,
337
338=== modified file 'tests/test-json-client.c'
339--- tests/test-json-client.c 2012-03-29 04:13:48 +0000
340+++ tests/test-json-client.c 2013-01-21 16:33:25 +0000
341@@ -53,8 +53,6 @@
342 int
343 main (int argc, char ** argv)
344 {
345- g_type_init();
346-
347 g_timeout_add_seconds(1, timeout_func, argv);
348
349 mainloop = g_main_loop_new(NULL, FALSE);
350
351=== modified file 'tests/test-json-server.c'
352--- tests/test-json-server.c 2012-03-29 04:13:48 +0000
353+++ tests/test-json-server.c 2013-01-21 16:33:25 +0000
354@@ -76,8 +76,6 @@
355 int
356 main (int argc, char ** argv)
357 {
358- g_type_init();
359-
360 g_bus_own_name(G_BUS_TYPE_SESSION,
361 "org.dbusmenu.test",
362 G_BUS_NAME_OWNER_FLAGS_NONE,
363
364=== modified file 'tools/dbusmenu-dumper.c'
365--- tools/dbusmenu-dumper.c 2012-10-07 15:35:50 +0000
366+++ tools/dbusmenu-dumper.c 2013-01-21 16:33:25 +0000
367@@ -388,7 +388,6 @@
368 int
369 main (int argc, char ** argv)
370 {
371- g_type_init();
372 GError * error = NULL;
373 GOptionContext * context;
374
375
376=== modified file 'tools/testapp/main.c'
377--- tools/testapp/main.c 2010-11-16 22:31:51 +0000
378+++ tools/testapp/main.c 2013-01-21 16:33:25 +0000
379@@ -135,8 +135,6 @@
380
381 int main (int argc, char ** argv)
382 {
383- g_type_init();
384-
385 if (argc != 2) {
386 g_warning(USAGE);
387 return 1;

Subscribers

People subscribed via source and target branches