aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-01-21 17:08:11 +0000
committerTarmac <Unknown>2013-01-21 17:08:11 +0000
commit3c16f805f46f267bb6afd1a9aa9d595537671150 (patch)
treecd48d64fb216a4c5b13728ba34886db25109e32d
parent7ed59b018db3d7074b722faf916dfdb87c625eec (diff)
parente4cc7623afb7d462820f3405b57e90bc68eca3ee (diff)
downloadlibdbusmenu-3c16f805f46f267bb6afd1a9aa9d595537671150.tar.gz
libdbusmenu-3c16f805f46f267bb6afd1a9aa9d595537671150.tar.bz2
libdbusmenu-3c16f805f46f267bb6afd1a9aa9d595537671150.zip
Remove uses of g_type_init. Fixes: https://bugs.launchpad.net/bugs/1102468, https://bugs.launchpad.net/bugs/1102471.
Approved by PS Jenkins bot, Didier Roche.
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog3
-rw-r--r--debian/control1
-rw-r--r--docs/libdbusmenu-glib/reference/Makefile.am2
-rw-r--r--docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml3
-rw-r--r--docs/libdbusmenu-gtk/reference/Makefile.am2
-rw-r--r--docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml1
-rw-r--r--tests/glib-server-nomenu.c2
-rw-r--r--tests/test-glib-events-client.c2
-rw-r--r--tests/test-glib-events-nogroup-client.c2
-rw-r--r--tests/test-glib-events-server.c2
-rw-r--r--tests/test-glib-layout-client.c2
-rw-r--r--tests/test-glib-layout-server.c2
-rw-r--r--tests/test-glib-objects.c1
-rw-r--r--tests/test-glib-properties-client.c2
-rw-r--r--tests/test-glib-properties-server.c2
-rw-r--r--tests/test-glib-proxy-client.c2
-rw-r--r--tests/test-glib-proxy-proxy.c2
-rw-r--r--tests/test-glib-proxy-server.c2
-rw-r--r--tests/test-glib-simple-items.c2
-rw-r--r--tests/test-glib-submenu-client.c2
-rw-r--r--tests/test-glib-submenu-server.c2
-rw-r--r--tests/test-gtk-label-server.c2
-rw-r--r--tests/test-gtk-reorder-server.c2
-rw-r--r--tests/test-gtk-shortcut-server.c2
-rw-r--r--tests/test-gtk-submenu-server.c2
-rw-r--r--tests/test-json-client.c2
-rw-r--r--tests/test-json-server.c2
-rw-r--r--tools/dbusmenu-dumper.c1
-rw-r--r--tools/testapp/main.c2
30 files changed, 7 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac
index 3715c34..66afc14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ GNOME_DOC_INIT
# Dependencies - GLib
###########################
-GLIB_REQUIRED_VERSION=2.26
+GLIB_REQUIRED_VERSION=2.35.4
PKG_CHECK_MODULES(DBUSMENUGLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION)
diff --git a/debian/changelog b/debian/changelog
index 7851811..aef0d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low
* debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example.
* debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the
multiarch triplet rather than usr/lib/libdbusmenu.
+ * 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)
[ Didier Roche ]
* Automatic snapshot from revision 435 (bootstrap):
diff --git a/debian/control b/debian/control
index 74461c7..7735456 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9),
valgrind,
dbus-test-runner,
xvfb,
+ libglib2.0-dev (>= 2.35.4),
libgtk2.0-dev (>= 2.24.4-1~),
libgtk-3-dev (>= 2.99.2-1ubuntu2),
libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am
index 6de90cb..6c9e6eb 100644
--- a/docs/libdbusmenu-glib/reference/Makefile.am
+++ b/docs/libdbusmenu-glib/reference/Makefile.am
@@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-glib $(abs_top_builddir)/libdbusmenu-glib
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS=--nogtkinit
# Extra options to supply to gtkdoc-scan.
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
index 53a0ceb..76258e5 100644
--- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
+++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
@@ -15,9 +15,6 @@
<xi:include href="xml/menuitem-proxy.xml"/>
<xi:include href="xml/menuitem.xml"/>
<xi:include href="xml/client.xml"/>
- <xi:include href="xml/client-menuitem.xml"/>
- <xi:include href="xml/dbusmenu-client.xml"/>
- <xi:include href="xml/dbusmenu-server.xml"/>
<xi:include href="xml/types.xml"/>
</chapter>
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am
index 6ec27a3..9c94bd1 100644
--- a/docs/libdbusmenu-gtk/reference/Makefile.am
+++ b/docs/libdbusmenu-gtk/reference/Makefile.am
@@ -28,7 +28,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
DOC_SOURCE_DIR=$(abs_top_srcdir)/libdbusmenu-gtk
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS=--nogtkinit
# Extra options to supply to gtkdoc-scan.
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
diff --git a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
index e9020de..e2e3c9f 100644
--- a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
+++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
@@ -15,7 +15,6 @@
<xi:include href="xml/menuitem.xml"/>
<xi:include href="xml/client.xml"/>
<xi:include href="xml/parser.xml"/>
- <xi:include href="xml/serializablemenuitem.xml"/>
</chapter>
<chapter id="object-tree">
diff --git a/tests/glib-server-nomenu.c b/tests/glib-server-nomenu.c
index fb2c61e..e2bd48f 100644
--- a/tests/glib-server-nomenu.c
+++ b/tests/glib-server-nomenu.c
@@ -27,8 +27,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
int
main (int argc, char ** argv)
{
- g_type_init();
-
DbusmenuServer * server = dbusmenu_server_new("/org/test");
DbusmenuMenuitem * menuitem = dbusmenu_menuitem_new();
dbusmenu_menuitem_property_set(menuitem, "test", "test");
diff --git a/tests/test-glib-events-client.c b/tests/test-glib-events-client.c
index 2cc5439..a284760 100644
--- a/tests/test-glib-events-client.c
+++ b/tests/test-glib-events-client.c
@@ -114,8 +114,6 @@ timer_func (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
diff --git a/tests/test-glib-events-nogroup-client.c b/tests/test-glib-events-nogroup-client.c
index f87660b..b0fbc9f 100644
--- a/tests/test-glib-events-nogroup-client.c
+++ b/tests/test-glib-events-nogroup-client.c
@@ -118,8 +118,6 @@ timer_func (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
diff --git a/tests/test-glib-events-server.c b/tests/test-glib-events-server.c
index ab72c6b..148af29 100644
--- a/tests/test-glib-events-server.c
+++ b/tests/test-glib-events-server.c
@@ -68,8 +68,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"org.dbusmenu.test",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index 3afe042..83b47ee 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -114,8 +114,6 @@ timer_func (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
diff --git a/tests/test-glib-layout-server.c b/tests/test-glib-layout-server.c
index e289349..f92a18c 100644
--- a/tests/test-glib-layout-server.c
+++ b/tests/test-glib-layout-server.c
@@ -90,8 +90,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"org.dbusmenu.test",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index 9c99280..ff97e6f 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -324,7 +324,6 @@ test_glib_objects_suite (void)
gint
main (gint argc, gchar * argv[])
{
- g_type_init();
g_test_init(&argc, &argv, NULL);
/* Test suites */
diff --git a/tests/test-glib-properties-client.c b/tests/test-glib-properties-client.c
index ae7b80b..3d6aa9d 100644
--- a/tests/test-glib-properties-client.c
+++ b/tests/test-glib-properties-client.c
@@ -152,8 +152,6 @@ layout_verify_timer (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
/* Make sure the server starts up and all that */
g_usleep(500000);
diff --git a/tests/test-glib-properties-server.c b/tests/test-glib-properties-server.c
index 4248ea2..283a05f 100644
--- a/tests/test-glib-properties-server.c
+++ b/tests/test-glib-properties-server.c
@@ -86,8 +86,6 @@ timer_func (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
server = dbusmenu_server_new("/org/test");
timer_func(NULL);
diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c
index d20c27c..8f760a2 100644
--- a/tests/test-glib-proxy-client.c
+++ b/tests/test-glib-proxy-client.c
@@ -159,8 +159,6 @@ layout_verify_timer (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
DbusmenuClient * client = dbusmenu_client_new("test.proxy.first_proxy", "/org/test");
g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
diff --git a/tests/test-glib-proxy-proxy.c b/tests/test-glib-proxy-proxy.c
index 8a17ead..f5acc92 100644
--- a/tests/test-glib-proxy-proxy.c
+++ b/tests/test-glib-proxy-proxy.c
@@ -49,8 +49,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
if (argc != 3) {
g_error ("Need two params");
return 1;
diff --git a/tests/test-glib-proxy-server.c b/tests/test-glib-proxy-server.c
index a5dfd4e..6823cec 100644
--- a/tests/test-glib-proxy-server.c
+++ b/tests/test-glib-proxy-server.c
@@ -120,8 +120,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"test.proxy.server",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-glib-simple-items.c b/tests/test-glib-simple-items.c
index 3ea5480..1fff8bf 100644
--- a/tests/test-glib-simple-items.c
+++ b/tests/test-glib-simple-items.c
@@ -32,8 +32,6 @@ quititall (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
DbusmenuServer * server = dbusmenu_server_new("/test/object");
root_menuitem = dbusmenu_menuitem_new();
dbusmenu_server_set_root(server, root_menuitem);
diff --git a/tests/test-glib-submenu-client.c b/tests/test-glib-submenu-client.c
index 57762cd..29d7720 100644
--- a/tests/test-glib-submenu-client.c
+++ b/tests/test-glib-submenu-client.c
@@ -97,8 +97,6 @@ timer_func (gpointer data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
diff --git a/tests/test-glib-submenu-server.c b/tests/test-glib-submenu-server.c
index 73362c1..ece2527 100644
--- a/tests/test-glib-submenu-server.c
+++ b/tests/test-glib-submenu-server.c
@@ -90,8 +90,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"org.dbusmenu.test",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-gtk-label-server.c b/tests/test-gtk-label-server.c
index ddf8fcf..d7fe622 100644
--- a/tests/test-gtk-label-server.c
+++ b/tests/test-gtk-label-server.c
@@ -71,8 +71,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
JsonParser * parser = json_parser_new();
GError * error = NULL;
if (!json_parser_load_from_file(parser, argv[1], &error)) {
diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c
index 44209f1..d0fba82 100644
--- a/tests/test-gtk-reorder-server.c
+++ b/tests/test-gtk-reorder-server.c
@@ -99,8 +99,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"glib.label.test",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-gtk-shortcut-server.c b/tests/test-gtk-shortcut-server.c
index 5df4881..55974aa 100644
--- a/tests/test-gtk-shortcut-server.c
+++ b/tests/test-gtk-shortcut-server.c
@@ -83,8 +83,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"glib.label.test",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-gtk-submenu-server.c b/tests/test-gtk-submenu-server.c
index 1d38a44..a705900 100644
--- a/tests/test-gtk-submenu-server.c
+++ b/tests/test-gtk-submenu-server.c
@@ -92,8 +92,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"glib.label.test",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tests/test-json-client.c b/tests/test-json-client.c
index 8900902..d7933ce 100644
--- a/tests/test-json-client.c
+++ b/tests/test-json-client.c
@@ -53,8 +53,6 @@ timeout_func (gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_timeout_add_seconds(1, timeout_func, argv);
mainloop = g_main_loop_new(NULL, FALSE);
diff --git a/tests/test-json-server.c b/tests/test-json-server.c
index 7165838..9a2dd8e 100644
--- a/tests/test-json-server.c
+++ b/tests/test-json-server.c
@@ -76,8 +76,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int
main (int argc, char ** argv)
{
- g_type_init();
-
g_bus_own_name(G_BUS_TYPE_SESSION,
"org.dbusmenu.test",
G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/tools/dbusmenu-dumper.c b/tools/dbusmenu-dumper.c
index 253f1d5..d8512f2 100644
--- a/tools/dbusmenu-dumper.c
+++ b/tools/dbusmenu-dumper.c
@@ -388,7 +388,6 @@ static GOptionEntry general_options[] = {
int
main (int argc, char ** argv)
{
- g_type_init();
GError * error = NULL;
GOptionContext * context;
diff --git a/tools/testapp/main.c b/tools/testapp/main.c
index 67e962d..1fbcf4b 100644
--- a/tools/testapp/main.c
+++ b/tools/testapp/main.c
@@ -135,8 +135,6 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
int main (int argc, char ** argv)
{
- g_type_init();
-
if (argc != 2) {
g_warning(USAGE);
return 1;