diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-01-23 07:49:19 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-23 07:49:19 +0000 |
| commit | 36d8b41598dcd4701b2a3f9a159ecb52b75c3177 (patch) | |
| tree | 9d2d46ae9a87947eb4041757a0ab36aca6341cb2 | |
| parent | f8a22d324c8eb02467c098b323f6894f054831e0 (diff) | |
| parent | f788c229ae1f466df895537bd4aeb7bfb55fd3a5 (diff) | |
| download | ayatana-indicator-application-36d8b41598dcd4701b2a3f9a159ecb52b75c3177.tar.gz ayatana-indicator-application-36d8b41598dcd4701b2a3f9a159ecb52b75c3177.tar.bz2 ayatana-indicator-application-36d8b41598dcd4701b2a3f9a159ecb52b75c3177.zip | |
remove g_type_init() calls; introduce explicit glib requirements to configure.ac and debian/control
submitting for Jenkins to test b/c I haven't upgraded my glib yet. Fixes: https://bugs.launchpad.net/bugs/1103087.
Approved by Lars Uebernickel, PS Jenkins bot.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | src/application-service.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3cf7fb6..1cc1811 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,7 @@ PKG_PROG_PKG_CONFIG # Dependencies ########################### +GLIB_REQUIRED_VERSION=2.35.4 GTK_REQUIRED_VERSION=3.0.0 GIO_REQUIRED_VERSION=2.26 INDICATOR_REQUIRED_VERSION=0.3.5 @@ -38,8 +39,9 @@ DBUS_GLIB_REQUIRED_VERSION=0.82 LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9 -PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK_REQUIRED_VERSION +PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION diff --git a/debian/control b/debian/control index d783c7c..8e04273 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9.0), dbus-test-runner, gnome-common, xvfb, + libglib2.0-dev (>= 2.35.4), libgtk-3-dev (>= 2.91), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, diff --git a/src/application-service.c b/src/application-service.c index bc1787f..5262d9d 100644 --- a/src/application-service.c +++ b/src/application-service.c @@ -52,8 +52,6 @@ service_disconnected (IndicatorService * service, gpointer data) int main (int argc, char ** argv) { - g_type_init(); - /* Bring us up as a basic indicator service */ service = indicator_service_new_version(INDICATOR_APPLICATION_DBUS_ADDR, INDICATOR_APPLICATION_SERVICE_VERSION); g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_disconnected), NULL); |