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

[Charles Kerr]

Removes g_type_init() calls and bumps the glib prerequisite to 2.35.4

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-11-08 17:29:38 +0000
+++ configure.ac	2013-01-22 20:18:23 +0000
@@ -50,7 +50,7 @@
 INDICATOR_REQUIRED_VERSION=0.3.19
 DBUSMENUGLIB_REQUIRED_VERSION=.0.6.2
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
-GLIB_REQUIRED_VERSION=2.32.0
+GLIB_REQUIRED_VERSION=2.35.4
 
 PKG_CHECK_MODULES(SYNC_LIB_DEPS, [dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                    gio-unix-2.0      >= $GIO_UNIX_REQUIRED_VERSION

=== modified file 'debian/control'
--- debian/control	2012-11-21 16:30:56 +0000
+++ debian/control	2013-01-22 20:18:23 +0000
@@ -11,7 +11,7 @@
                gobject-introspection,
                libgirepository1.0-dev,
                libgtk-3-dev,
-               libglib2.0-dev (>= 2.32.0),
+               libglib2.0-dev (>= 2.35.4),
                libindicator3-dev,
                libdbusmenu-glib-dev (>= 0.6.2),
                libdbusmenu-gtk3-dev (>= 0.5.90),

=== modified file 'examples/sync-app-example.c'
--- examples/sync-app-example.c	2012-08-25 20:27:47 +0000
+++ examples/sync-app-example.c	2013-01-22 20:18:23 +0000
@@ -211,7 +211,6 @@
 int
 main (void)
 {
-  g_type_init ();
   create_u1_sync_menu_app ();
   g_main_loop_run (g_main_loop_new(NULL, FALSE));
   return 0;

=== modified file 'src/service/sync-service.c'
--- src/service/sync-service.c	2012-09-17 05:18:18 +0000
+++ src/service/sync-service.c	2013-01-22 20:18:23 +0000
@@ -643,8 +643,6 @@
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   sync_service.skeleton = dbus_sync_service_skeleton_new ();
 
   g_bus_get (G_BUS_TYPE_SESSION, NULL, on_got_bus, &sync_service);

=== modified file 'test/test-client.cpp'
--- test/test-client.cpp	2012-09-21 23:17:22 +0000
+++ test/test-client.cpp	2013-01-22 20:18:23 +0000
@@ -31,7 +31,6 @@
       static bool ran_once_init = false;
       if (!ran_once_init)
         {
-          g_type_init();
           g_setenv ("INDICATOR_SERVICE_SHUTDOWN_TIMEOUT", "5000", TRUE);
           g_unsetenv ("INDICATOR_ALLOW_NO_WATCHERS");
           g_unsetenv ("INDICATOR_SERVICE_REPLACE_MODE");

=== modified file 'test/test-gtest.cpp'
--- test/test-gtest.cpp	2012-08-19 07:00:07 +0000
+++ test/test-gtest.cpp	2013-01-22 20:18:23 +0000
@@ -7,6 +7,5 @@
 }
 
 TEST(LauncherMenuItem, NameInitialized) {
-  g_type_init();
   EXPECT_TRUE(true);
 }