Merge lp:~charlesk/indicator-session/remove-g-type-init into lp:indicator-session/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:382
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=amd64/49/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=i386/49/console

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

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Somehow that wasn't getting merged by Jenkins, I ended up reproducing the changes on my end, I didn't remember...

Marking as Merged so that we get it off the list now.

=== modified file 'configure.ac'
--- configure.ac	2012-11-30 16:24:17 +0000
+++ configure.ac	2013-01-17 21:32:26 +0000
@@ -26,7 +26,7 @@
 ###########################
 
 GIO_REQUIRED_VERSION=2.33
-GLIB_REQUIRED_VERSION=2.33
+GLIB_REQUIRED_VERSION=2.35.4
 GTK_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90

=== modified file 'debian/control'
--- debian/control	2013-01-15 22:52:32 +0000
+++ debian/control	2013-01-17 21:32:26 +0000
@@ -11,7 +11,7 @@
                libdbustest1-dev,
                dbus-test-runner,
                libgtk-3-dev,
-               libglib2.0-dev (>= 2.33),
+               libglib2.0-dev (>= 2.35.4),
                gnome-doc-utils,
                libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.5.90),

=== modified file 'src/session-service.c'
--- src/session-service.c	2012-08-31 17:37:39 +0000
+++ src/session-service.c	2013-01-17 21:32:26 +0000
@@ -71,8 +71,6 @@
 int
 main (int argc, char ** argv)
 {
-  g_type_init();
-
   /* Setting up i18n and gettext.
      Apparently we need all of these. */
   setlocale (LC_ALL, "");

=== modified file 'tests/test-service.cc'
--- tests/test-service.cc	2012-11-13 20:08:13 +0000
+++ tests/test-service.cc	2013-01-17 21:32:26 +0000
@@ -49,7 +49,6 @@
       static bool first_run = true;
       if (first_run)
         {
-          g_type_init();
           g_setenv ("INDICATOR_SERVICE_SHUTDOWN_TIMEOUT", "1000", TRUE);
           g_unsetenv ("INDICATOR_ALLOW_NO_WATCHERS");
           g_unsetenv ("INDICATOR_SERVICE_REPLACE_MODE");