diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | src/session-service.c | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/test-service.cc | 1 |
6 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index aeff7d4..ee90bae 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ########################### 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 diff --git a/debian/changelog b/debian/changelog index eb8acc2..78666c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ indicator-session (12.10.5-0ubuntu1) UNRELEASED; urgency=low 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. diff --git a/debian/control b/debian/control index 3131969..458ffef 100644 --- a/debian/control +++ b/debian/control @@ -8,10 +8,11 @@ Build-Depends: debhelper (>= 9), 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), diff --git a/src/session-service.c b/src/session-service.c index 91bbccd..13438d3 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -71,8 +71,6 @@ is_greeter_mode (void) int main (int argc, char ** argv) { - g_type_init(); - /* Setting up i18n and gettext. Apparently we need all of these. */ setlocale (LC_ALL, ""); diff --git a/tests/Makefile.am b/tests/Makefile.am index c117c95..579f502 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,8 +15,8 @@ include $(srcdir)/Makefile.am.strings 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) diff --git a/tests/test-service.cc b/tests/test-service.cc index 4d540d6..b1ca5bc 100644 --- a/tests/test-service.cc +++ b/tests/test-service.cc @@ -49,7 +49,6 @@ class ClientTest : public ::testing::Test 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"); |