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
=== modified file 'configure.ac'
--- configure.ac 2012-12-17 21:59:01 +0000
+++ configure.ac 2013-01-21 16:33:25 +0000
@@ -34,7 +34,7 @@
34# Dependencies - GLib34# Dependencies - GLib
35###########################35###########################
3636
37GLIB_REQUIRED_VERSION=2.2637GLIB_REQUIRED_VERSION=2.35.4
3838
39PKG_CHECK_MODULES(DBUSMENUGLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION39PKG_CHECK_MODULES(DBUSMENUGLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION
40 gio-2.0 >= $GLIB_REQUIRED_VERSION)40 gio-2.0 >= $GLIB_REQUIRED_VERSION)
4141
=== modified file 'debian/changelog'
--- debian/changelog 2013-01-09 06:40:12 +0000
+++ debian/changelog 2013-01-21 16:33:25 +0000
@@ -23,6 +23,9 @@
23 * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.23 * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
24 * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the24 * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the
25 multiarch triplet rather than usr/lib/libdbusmenu.25 multiarch triplet rather than usr/lib/libdbusmenu.
26 * Update main sgml documentation files to remove the xml includes we don't
27 generate anymore. (LP: #1102468)
28 * Drop deprecated calls to g_type_init(). (LP: #1102471)
2629
27 [ Didier Roche ]30 [ Didier Roche ]
28 * Automatic snapshot from revision 435 (bootstrap):31 * Automatic snapshot from revision 435 (bootstrap):
2932
=== modified file 'debian/control'
--- debian/control 2012-12-05 00:13:40 +0000
+++ debian/control 2013-01-21 16:33:25 +0000
@@ -14,6 +14,7 @@
14 valgrind,14 valgrind,
15 dbus-test-runner,15 dbus-test-runner,
16 xvfb,16 xvfb,
17 libglib2.0-dev (>= 2.35.4),
17 libgtk2.0-dev (>= 2.24.4-1~),18 libgtk2.0-dev (>= 2.24.4-1~),
18 libgtk-3-dev (>= 2.99.2-1ubuntu2),19 libgtk-3-dev (>= 2.99.2-1ubuntu2),
19 libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),20 libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
2021
=== modified file 'docs/libdbusmenu-glib/reference/Makefile.am'
--- docs/libdbusmenu-glib/reference/Makefile.am 2012-12-17 22:01:25 +0000
+++ docs/libdbusmenu-glib/reference/Makefile.am 2013-01-21 16:33:25 +0000
@@ -21,7 +21,7 @@
21DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-glib $(abs_top_builddir)/libdbusmenu-glib21DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-glib $(abs_top_builddir)/libdbusmenu-glib
2222
23# Extra options to pass to gtkdoc-scangobj. Not normally needed.23# Extra options to pass to gtkdoc-scangobj. Not normally needed.
24SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"24SCANGOBJ_OPTIONS=--nogtkinit
2525
26# Extra options to supply to gtkdoc-scan.26# Extra options to supply to gtkdoc-scan.
27# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"27# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
2828
=== modified file 'docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml'
--- docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml 2011-02-24 15:38:18 +0000
+++ docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml 2013-01-21 16:33:25 +0000
@@ -15,9 +15,6 @@
15 <xi:include href="xml/menuitem-proxy.xml"/>15 <xi:include href="xml/menuitem-proxy.xml"/>
16 <xi:include href="xml/menuitem.xml"/>16 <xi:include href="xml/menuitem.xml"/>
17 <xi:include href="xml/client.xml"/>17 <xi:include href="xml/client.xml"/>
18 <xi:include href="xml/client-menuitem.xml"/>
19 <xi:include href="xml/dbusmenu-client.xml"/>
20 <xi:include href="xml/dbusmenu-server.xml"/>
21 <xi:include href="xml/types.xml"/>18 <xi:include href="xml/types.xml"/>
2219
23 </chapter>20 </chapter>
2421
=== modified file 'docs/libdbusmenu-gtk/reference/Makefile.am'
--- docs/libdbusmenu-gtk/reference/Makefile.am 2012-12-17 22:01:25 +0000
+++ docs/libdbusmenu-gtk/reference/Makefile.am 2013-01-21 16:33:25 +0000
@@ -28,7 +28,7 @@
28DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-gtk28DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-gtk
2929
30# Extra options to pass to gtkdoc-scangobj. Not normally needed.30# Extra options to pass to gtkdoc-scangobj. Not normally needed.
31SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"31SCANGOBJ_OPTIONS=--nogtkinit
3232
33# Extra options to supply to gtkdoc-scan.33# Extra options to supply to gtkdoc-scan.
34# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"34# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
3535
=== modified file 'docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml'
--- docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml 2011-02-21 20:55:01 +0000
+++ docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml 2013-01-21 16:33:25 +0000
@@ -15,7 +15,6 @@
15 <xi:include href="xml/menuitem.xml"/>15 <xi:include href="xml/menuitem.xml"/>
16 <xi:include href="xml/client.xml"/>16 <xi:include href="xml/client.xml"/>
17 <xi:include href="xml/parser.xml"/>17 <xi:include href="xml/parser.xml"/>
18 <xi:include href="xml/serializablemenuitem.xml"/>
1918
20 </chapter>19 </chapter>
21 <chapter id="object-tree">20 <chapter id="object-tree">
2221
=== modified file 'tests/glib-server-nomenu.c'
--- tests/glib-server-nomenu.c 2009-05-15 20:23:34 +0000
+++ tests/glib-server-nomenu.c 2013-01-21 16:33:25 +0000
@@ -27,8 +27,6 @@
27int27int
28main (int argc, char ** argv)28main (int argc, char ** argv)
29{29{
30 g_type_init();
31
32 DbusmenuServer * server = dbusmenu_server_new("/org/test");30 DbusmenuServer * server = dbusmenu_server_new("/org/test");
33 DbusmenuMenuitem * menuitem = dbusmenu_menuitem_new();31 DbusmenuMenuitem * menuitem = dbusmenu_menuitem_new();
34 dbusmenu_menuitem_property_set(menuitem, "test", "test");32 dbusmenu_menuitem_property_set(menuitem, "test", "test");
3533
=== modified file 'tests/test-glib-events-client.c'
--- tests/test-glib-events-client.c 2010-11-18 20:42:25 +0000
+++ tests/test-glib-events-client.c 2013-01-21 16:33:25 +0000
@@ -114,8 +114,6 @@
114int114int
115main (int argc, char ** argv)115main (int argc, char ** argv)
116{116{
117 g_type_init();
118
119 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");117 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
120 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);118 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
121 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));119 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
122120
=== modified file 'tests/test-glib-events-nogroup-client.c'
--- tests/test-glib-events-nogroup-client.c 2012-04-03 14:55:04 +0000
+++ tests/test-glib-events-nogroup-client.c 2013-01-21 16:33:25 +0000
@@ -118,8 +118,6 @@
118int118int
119main (int argc, char ** argv)119main (int argc, char ** argv)
120{120{
121 g_type_init();
122
123 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");121 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
124 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);122 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
125 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));123 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
126124
=== modified file 'tests/test-glib-events-server.c'
--- tests/test-glib-events-server.c 2010-11-16 19:46:26 +0000
+++ tests/test-glib-events-server.c 2013-01-21 16:33:25 +0000
@@ -68,8 +68,6 @@
68int68int
69main (int argc, char ** argv)69main (int argc, char ** argv)
70{70{
71 g_type_init();
72
73 g_bus_own_name(G_BUS_TYPE_SESSION,71 g_bus_own_name(G_BUS_TYPE_SESSION,
74 "org.dbusmenu.test",72 "org.dbusmenu.test",
75 G_BUS_NAME_OWNER_FLAGS_NONE,73 G_BUS_NAME_OWNER_FLAGS_NONE,
7674
=== modified file 'tests/test-glib-layout-client.c'
--- tests/test-glib-layout-client.c 2011-02-15 04:33:02 +0000
+++ tests/test-glib-layout-client.c 2013-01-21 16:33:25 +0000
@@ -114,8 +114,6 @@
114int114int
115main (int argc, char ** argv)115main (int argc, char ** argv)
116{116{
117 g_type_init();
118
119 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");117 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
120 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);118 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
121119
122120
=== modified file 'tests/test-glib-layout-server.c'
--- tests/test-glib-layout-server.c 2010-12-07 15:45:41 +0000
+++ tests/test-glib-layout-server.c 2013-01-21 16:33:25 +0000
@@ -90,8 +90,6 @@
90int90int
91main (int argc, char ** argv)91main (int argc, char ** argv)
92{92{
93 g_type_init();
94
95 g_bus_own_name(G_BUS_TYPE_SESSION,93 g_bus_own_name(G_BUS_TYPE_SESSION,
96 "org.dbusmenu.test",94 "org.dbusmenu.test",
97 G_BUS_NAME_OWNER_FLAGS_NONE,95 G_BUS_NAME_OWNER_FLAGS_NONE,
9896
=== modified file 'tests/test-glib-objects.c'
--- tests/test-glib-objects.c 2011-01-06 02:49:47 +0000
+++ tests/test-glib-objects.c 2013-01-21 16:33:25 +0000
@@ -324,7 +324,6 @@
324gint324gint
325main (gint argc, gchar * argv[])325main (gint argc, gchar * argv[])
326{326{
327 g_type_init();
328 g_test_init(&argc, &argv, NULL);327 g_test_init(&argc, &argv, NULL);
329328
330 /* Test suites */329 /* Test suites */
331330
=== modified file 'tests/test-glib-properties-client.c'
--- tests/test-glib-properties-client.c 2010-08-12 21:25:40 +0000
+++ tests/test-glib-properties-client.c 2013-01-21 16:33:25 +0000
@@ -152,8 +152,6 @@
152int152int
153main (int argc, char ** argv)153main (int argc, char ** argv)
154{154{
155 g_type_init();
156
157 /* Make sure the server starts up and all that */155 /* Make sure the server starts up and all that */
158 g_usleep(500000);156 g_usleep(500000);
159157
160158
=== modified file 'tests/test-glib-properties-server.c'
--- tests/test-glib-properties-server.c 2010-11-16 21:47:10 +0000
+++ tests/test-glib-properties-server.c 2013-01-21 16:33:25 +0000
@@ -86,8 +86,6 @@
86int86int
87main (int argc, char ** argv)87main (int argc, char ** argv)
88{88{
89 g_type_init();
90
91 server = dbusmenu_server_new("/org/test");89 server = dbusmenu_server_new("/org/test");
9290
93 timer_func(NULL);91 timer_func(NULL);
9492
=== modified file 'tests/test-glib-proxy-client.c'
--- tests/test-glib-proxy-client.c 2012-01-30 22:23:04 +0000
+++ tests/test-glib-proxy-client.c 2013-01-21 16:33:25 +0000
@@ -159,8 +159,6 @@
159int159int
160main (int argc, char ** argv)160main (int argc, char ** argv)
161{161{
162 g_type_init();
163
164 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");162 DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");
165 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);163 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
166164
167165
=== modified file 'tests/test-glib-proxy-proxy.c'
--- tests/test-glib-proxy-proxy.c 2010-11-23 19:27:13 +0000
+++ tests/test-glib-proxy-proxy.c 2013-01-21 16:33:25 +0000
@@ -49,8 +49,6 @@
49int49int
50main (int argc, char ** argv)50main (int argc, char ** argv)
51{51{
52 g_type_init();
53
54 if (argc != 3) {52 if (argc != 3) {
55 g_error ("Need two params");53 g_error ("Need two params");
56 return 1;54 return 1;
5755
=== modified file 'tests/test-glib-proxy-server.c'
--- tests/test-glib-proxy-server.c 2010-11-19 23:08:52 +0000
+++ tests/test-glib-proxy-server.c 2013-01-21 16:33:25 +0000
@@ -120,8 +120,6 @@
120int120int
121main (int argc, char ** argv)121main (int argc, char ** argv)
122{122{
123 g_type_init();
124
125 g_bus_own_name(G_BUS_TYPE_SESSION,123 g_bus_own_name(G_BUS_TYPE_SESSION,
126 "test.proxy.server",124 "test.proxy.server",
127 G_BUS_NAME_OWNER_FLAGS_NONE,125 G_BUS_NAME_OWNER_FLAGS_NONE,
128126
=== modified file 'tests/test-glib-simple-items.c'
--- tests/test-glib-simple-items.c 2010-11-16 23:16:45 +0000
+++ tests/test-glib-simple-items.c 2013-01-21 16:33:25 +0000
@@ -32,8 +32,6 @@
32int32int
33main (int argc, char ** argv)33main (int argc, char ** argv)
34{34{
35 g_type_init();
36
37 DbusmenuServer * server = dbusmenu_server_new("/test/object");35 DbusmenuServer * server = dbusmenu_server_new("/test/object");
38 root_menuitem = dbusmenu_menuitem_new();36 root_menuitem = dbusmenu_menuitem_new();
39 dbusmenu_server_set_root(server, root_menuitem);37 dbusmenu_server_set_root(server, root_menuitem);
4038
=== modified file 'tests/test-glib-submenu-client.c'
--- tests/test-glib-submenu-client.c 2010-06-08 20:48:01 +0000
+++ tests/test-glib-submenu-client.c 2013-01-21 16:33:25 +0000
@@ -97,8 +97,6 @@
97int97int
98main (int argc, char ** argv)98main (int argc, char ** argv)
99{99{
100 g_type_init();
101
102 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");100 DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
103 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);101 g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
104102
105103
=== modified file 'tests/test-glib-submenu-server.c'
--- tests/test-glib-submenu-server.c 2010-11-16 23:16:45 +0000
+++ tests/test-glib-submenu-server.c 2013-01-21 16:33:25 +0000
@@ -90,8 +90,6 @@
90int90int
91main (int argc, char ** argv)91main (int argc, char ** argv)
92{92{
93 g_type_init();
94
95 g_bus_own_name(G_BUS_TYPE_SESSION,93 g_bus_own_name(G_BUS_TYPE_SESSION,
96 "org.dbusmenu.test",94 "org.dbusmenu.test",
97 G_BUS_NAME_OWNER_FLAGS_NONE,95 G_BUS_NAME_OWNER_FLAGS_NONE,
9896
=== modified file 'tests/test-gtk-label-server.c'
--- tests/test-gtk-label-server.c 2010-11-16 23:16:45 +0000
+++ tests/test-gtk-label-server.c 2013-01-21 16:33:25 +0000
@@ -71,8 +71,6 @@
71int71int
72main (int argc, char ** argv)72main (int argc, char ** argv)
73{73{
74 g_type_init();
75
76 JsonParser * parser = json_parser_new();74 JsonParser * parser = json_parser_new();
77 GError * error = NULL;75 GError * error = NULL;
78 if (!json_parser_load_from_file(parser, argv[1], &error)) {76 if (!json_parser_load_from_file(parser, argv[1], &error)) {
7977
=== modified file 'tests/test-gtk-reorder-server.c'
--- tests/test-gtk-reorder-server.c 2010-11-16 23:16:45 +0000
+++ tests/test-gtk-reorder-server.c 2013-01-21 16:33:25 +0000
@@ -99,8 +99,6 @@
99int99int
100main (int argc, char ** argv)100main (int argc, char ** argv)
101{101{
102 g_type_init();
103
104 g_bus_own_name(G_BUS_TYPE_SESSION,102 g_bus_own_name(G_BUS_TYPE_SESSION,
105 "glib.label.test",103 "glib.label.test",
106 G_BUS_NAME_OWNER_FLAGS_NONE,104 G_BUS_NAME_OWNER_FLAGS_NONE,
107105
=== modified file 'tests/test-gtk-shortcut-server.c'
--- tests/test-gtk-shortcut-server.c 2011-06-17 18:34:02 +0000
+++ tests/test-gtk-shortcut-server.c 2013-01-21 16:33:25 +0000
@@ -83,8 +83,6 @@
83int83int
84main (int argc, char ** argv)84main (int argc, char ** argv)
85{85{
86 g_type_init();
87
88 g_bus_own_name(G_BUS_TYPE_SESSION,86 g_bus_own_name(G_BUS_TYPE_SESSION,
89 "glib.label.test",87 "glib.label.test",
90 G_BUS_NAME_OWNER_FLAGS_NONE,88 G_BUS_NAME_OWNER_FLAGS_NONE,
9189
=== modified file 'tests/test-gtk-submenu-server.c'
--- tests/test-gtk-submenu-server.c 2012-02-22 10:02:01 +0000
+++ tests/test-gtk-submenu-server.c 2013-01-21 16:33:25 +0000
@@ -92,8 +92,6 @@
92int92int
93main (int argc, char ** argv)93main (int argc, char ** argv)
94{94{
95 g_type_init();
96
97 g_bus_own_name(G_BUS_TYPE_SESSION,95 g_bus_own_name(G_BUS_TYPE_SESSION,
98 "glib.label.test",96 "glib.label.test",
99 G_BUS_NAME_OWNER_FLAGS_NONE,97 G_BUS_NAME_OWNER_FLAGS_NONE,
10098
=== modified file 'tests/test-json-client.c'
--- tests/test-json-client.c 2012-03-29 04:13:48 +0000
+++ tests/test-json-client.c 2013-01-21 16:33:25 +0000
@@ -53,8 +53,6 @@
53int53int
54main (int argc, char ** argv)54main (int argc, char ** argv)
55{55{
56 g_type_init();
57
58 g_timeout_add_seconds(1, timeout_func, argv);56 g_timeout_add_seconds(1, timeout_func, argv);
5957
60 mainloop = g_main_loop_new(NULL, FALSE);58 mainloop = g_main_loop_new(NULL, FALSE);
6159
=== modified file 'tests/test-json-server.c'
--- tests/test-json-server.c 2012-03-29 04:13:48 +0000
+++ tests/test-json-server.c 2013-01-21 16:33:25 +0000
@@ -76,8 +76,6 @@
76int76int
77main (int argc, char ** argv)77main (int argc, char ** argv)
78{78{
79 g_type_init();
80
81 g_bus_own_name(G_BUS_TYPE_SESSION,79 g_bus_own_name(G_BUS_TYPE_SESSION,
82 "org.dbusmenu.test",80 "org.dbusmenu.test",
83 G_BUS_NAME_OWNER_FLAGS_NONE,81 G_BUS_NAME_OWNER_FLAGS_NONE,
8482
=== modified file 'tools/dbusmenu-dumper.c'
--- tools/dbusmenu-dumper.c 2012-10-07 15:35:50 +0000
+++ tools/dbusmenu-dumper.c 2013-01-21 16:33:25 +0000
@@ -388,7 +388,6 @@
388int388int
389main (int argc, char ** argv)389main (int argc, char ** argv)
390{390{
391 g_type_init();
392 GError * error = NULL;391 GError * error = NULL;
393 GOptionContext * context;392 GOptionContext * context;
394393
395394
=== modified file 'tools/testapp/main.c'
--- tools/testapp/main.c 2010-11-16 22:31:51 +0000
+++ tools/testapp/main.c 2013-01-21 16:33:25 +0000
@@ -135,8 +135,6 @@
135135
136int main (int argc, char ** argv)136int main (int argc, char ** argv)
137{137{
138 g_type_init();
139
140 if (argc != 2) {138 if (argc != 2) {
141 g_warning(USAGE);139 g_warning(USAGE);
142 return 1;140 return 1;

Subscribers

People subscribed via source and target branches