Merge lp:~charlesk/indicator-datetime/remove-g-type-init into lp:indicator-datetime/13.04

[Charles Kerr]

remove g_type_init() calls and bump glib minimum to 2.35.4, where g_type_init() is deprecated

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

This was merged properly in a subsequent autolanding, not noted here by Jenkins: https://jenkins.qa.ubuntu.com/job/indicator-datetime-autolanding/27/ .

=== modified file 'configure.ac'
--- configure.ac	2012-11-16 19:51:26 +0000
+++ configure.ac	2013-01-17 21:21:21 +0000
@@ -58,7 +58,7 @@
 ICAL_REQUIRED_VERSION=0.48
 CAIRO_REQUIRED_VERSION=1.10
 GDK_REQUIRED_VERSION=2.22
-GLIB_REQUIRED_VERSION=2.29.19
+GLIB_REQUIRED_VERSION=2.35.4
 GTK3_REQUIRED_VERSION=3.1.4
 
 PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION

=== modified file 'debian/control'
--- debian/control	2012-11-16 21:51:29 +0000
+++ debian/control	2013-01-17 21:21:21 +0000
@@ -12,7 +12,7 @@
                libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
-               libglib2.0-dev (>= 2.29.19),
+               libglib2.0-dev (>= 2.35.4),
                libido3-0.1-dev (>= 0.2.90),
                libgeoclue-dev (>= 0.12.0),
                libecal1.2-dev (>= 3.5),

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2012-11-16 19:51:26 +0000
+++ src/datetime-service.c	2013-01-17 21:21:21 +0000
@@ -1401,8 +1401,6 @@
 int
 main (int argc, char ** argv)
 {
-	g_type_init();
-
 	/* Acknowledging the service init and setting up the interface */
 	service = indicator_service_new_version(SERVICE_NAME, SERVICE_VERSION);
 	g_signal_connect(service, INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_shutdown), NULL);

=== modified file 'tests/test-indicator.cc'
--- tests/test-indicator.cc	2012-11-07 00:28:32 +0000
+++ tests/test-indicator.cc	2013-01-17 21:21:21 +0000
@@ -34,7 +34,6 @@
     if (G_UNLIKELY(!initialized))
     {
       initialized = true;
-      g_type_init();
       g_setenv ("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
     }
   }