aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-01-17 15:17:40 -0600
committerCharles Kerr <charles.kerr@canonical.com>2013-01-17 15:17:40 -0600
commit0f7689e25e2fd241fbb55c78bad0d3aa16fd9705 (patch)
treee922ce243663d62884b2c2fb657becafe19137b4
parent61f80b55a78feae1549d4121c355410f8aac71d6 (diff)
downloadayatana-indicator-datetime-0f7689e25e2fd241fbb55c78bad0d3aa16fd9705.tar.gz
ayatana-indicator-datetime-0f7689e25e2fd241fbb55c78bad0d3aa16fd9705.tar.bz2
ayatana-indicator-datetime-0f7689e25e2fd241fbb55c78bad0d3aa16fd9705.zip
remove g_type_init() calls and bump glib minimum to 2.35.4, where g_type_init() is deprecated
-rw-r--r--configure.ac2
-rw-r--r--debian/control2
-rw-r--r--src/datetime-service.c2
-rw-r--r--tests/test-indicator.cc1
4 files changed, 2 insertions, 5 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/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);
}
}