diff options
| author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-22 09:33:58 -0500 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-22 09:33:58 -0500 |
| commit | ac4566b7b88ee291a6e3c97ab2bfc34f12db03f0 (patch) | |
| tree | b8b302549f8898a8df7fd2edbf04481a55944050 | |
| parent | a840d1a37fe26d5f05fc330be60b282f72a828c6 (diff) | |
| download | ayatana-indicator-session-ac4566b7b88ee291a6e3c97ab2bfc34f12db03f0.tar.gz ayatana-indicator-session-ac4566b7b88ee291a6e3c97ab2bfc34f12db03f0.tar.bz2 ayatana-indicator-session-ac4566b7b88ee291a6e3c97ab2bfc34f12db03f0.zip | |
Remove the uses of deprecated g_type_init().
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/session-service.c | 2 | ||||
| -rw-r--r-- | tests/test-service.cc | 1 |
4 files changed, 2 insertions, 5 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/control b/debian/control index 3131969..c92483c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), 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/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"); |