Merge lp:~charlesk/indicator-application/lp-1103087 into lp:indicator-application/13.04

[Charles Kerr]

remove g_type_init() calls; introduce explicit glib requirements to configure.ac and debian/control

submitting for Jenkins to test b/c I haven't upgraded my glib yet

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-ci/./build=pbuilder,distribution=raring,flavor=i386/6/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/6//rebuild/?

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

+1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-08-22 11:59:58 +0000
+++ configure.ac	2013-01-22 20:34:23 +0000
@@ -29,6 +29,7 @@
 # Dependencies
 ###########################
 
+GLIB_REQUIRED_VERSION=2.35.4
 GTK_REQUIRED_VERSION=3.0.0
 GIO_REQUIRED_VERSION=2.26
 INDICATOR_REQUIRED_VERSION=0.3.5
@@ -38,8 +39,9 @@
 
 LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9
 
-PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK_REQUIRED_VERSION
+PKG_CHECK_MODULES(INDICATOR,  glib-2.0 >= $GLIB_REQUIRED_VERSION
                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                              gtk+-3.0 >= $GTK_REQUIRED_VERSION
                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                               json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
                               dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION

=== modified file 'debian/control'
--- debian/control	2012-11-21 16:20:13 +0000
+++ debian/control	2013-01-22 20:34:23 +0000
@@ -8,6 +8,7 @@
                dbus-test-runner,
                gnome-common,
                xvfb,
+               libglib2.0-dev (>= 2.35.4),
                libgtk-3-dev (>= 2.91),
                libdbus-glib-1-dev (>= 0.82),
                libjson-glib-dev,

=== modified file 'src/application-service.c'
--- src/application-service.c	2012-02-04 02:34:52 +0000
+++ src/application-service.c	2013-01-22 20:34:23 +0000
@@ -52,8 +52,6 @@
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	/* Bring us up as a basic indicator service */
 	service = indicator_service_new_version(INDICATOR_APPLICATION_DBUS_ADDR, INDICATOR_APPLICATION_SERVICE_VERSION);
 	g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_disconnected), NULL);