Merge lp:~cyphermox/indicator-session/g_type_init into lp:indicator-session/13.04

[Mathieu Trudel-Lapierre]

Misc fixes for build on raring:

 - Drop deprecated calls to g_type_init().
 - Update paths to gtest source files due to changes in xorg-gtest.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:383
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=coverity-raring,flavor=i386/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=amd64/50/console

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

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

the change is good to me, but it seems tests are still failing due to jenkins ^

[lp:~cyphermox/indicator-session/g_type_init]

384. By Mathieu Trudel-Lapierre on 2013-01-22

Add libxorg-gtest-dev to Build-Depends.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:384
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/51/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=coverity-raring,flavor=i386/51/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=amd64/51/console

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

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Let's try to get that in!

review: Approve

[Allan LeSage (allanlesage)]

I see the problem and will fix.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2012-11-30 16:24:17 +0000
+++ configure.ac	2013-01-22 15:51:20 +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/changelog'
--- debian/changelog	2013-01-15 22:52:32 +0000
+++ debian/changelog	2013-01-22 15:51:20 +0000
@@ -15,6 +15,7 @@
       from Build-Depends. (LP: #1085100)
     - Remove packagekit from Recommends
     - Add XS-Testsuite: autopkgtest.
+    - Add libxorg-gtest-dev to Build-Depends.
   * debian/tests:
     - Add start-service test; verify that the indicator can be started from
       DBUS.

=== modified file 'debian/control'
--- debian/control	2013-01-15 22:52:32 +0000
+++ debian/control	2013-01-22 15:51:20 +0000
@@ -8,10 +8,11 @@
                intltool,
                gnome-common,
                libgtest-dev,
+               libxorg-gtest-dev,
                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-22 15:51:20 +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/Makefile.am'
--- tests/Makefile.am	2013-01-14 19:36:28 +0000
+++ tests/Makefile.am	2013-01-22 15:51:20 +0000
@@ -15,8 +15,8 @@
 
 check_LIBRARIES = libgtest.a
 nodist_libgtest_a_SOURCES = \
-  $(GTEST_SOURCE)/src/gtest-all.cc \
-  $(GTEST_SOURCE)/src/gtest_main.cc
+  $(GTEST_SOURCE)/gtest-all.cc \
+  $(GTEST_SOURCE)/gtest_main.cc
 
 AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)

=== modified file 'tests/test-service.cc'
--- tests/test-service.cc	2012-11-13 20:08:13 +0000
+++ tests/test-service.cc	2013-01-22 15:51:20 +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");