diff options
| author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 18:04:43 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-23 18:04:43 +0000 |
| commit | e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd (patch) | |
| tree | f6bb4bf97eb1937e069063e152985c5802322d17 | |
| parent | 61f80b55a78feae1549d4121c355410f8aac71d6 (diff) | |
| parent | 8e878ce271c308a42e218d0c1b73d7f128dab7cb (diff) | |
| download | ayatana-indicator-datetime-e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd.tar.gz ayatana-indicator-datetime-e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd.tar.bz2 ayatana-indicator-datetime-e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd.zip | |
Update paths for gtest source files.
Approved by Allan LeSage.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/datetime-service.c | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/test-indicator.cc | 1 |
5 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 9c67e55..e9acb8c 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ EDS_REQUIRED_VERSION=3.5 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 diff --git a/debian/control b/debian/control index 723084a..2117e9b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9), 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), diff --git a/src/datetime-service.c b/src/datetime-service.c index 8e88586..5378011 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -1401,8 +1401,6 @@ update_appointments (void) 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); diff --git a/tests/Makefile.am b/tests/Makefile.am index cc3b52a..f6387a0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,8 +12,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-indicator.cc b/tests/test-indicator.cc index 67a2780..2480c94 100644 --- a/tests/test-indicator.cc +++ b/tests/test-indicator.cc @@ -34,7 +34,6 @@ namespace if (G_UNLIKELY(!initialized)) { initialized = true; - g_type_init(); g_setenv ("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE); } } |