diff options
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/users-service-dbus.c | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 5b724e2..4f5bc6e 100644 --- a/configure.ac +++ b/configure.ac @@ -39,12 +39,12 @@ AC_ARG_WITH([indicator-gtk], AS_IF([test "x$with_indicator_gtk" = x3], [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) ], [test "x$with_indicator_gtk" = x2], [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])] @@ -58,7 +58,7 @@ PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VE dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION dbus-glib-1 gio-unix-2.0 - indicator3 >= $INDICATOR_REQUIRED_VERSION) + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION) AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) @@ -95,11 +95,11 @@ if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/indicator-applet/icons/" elif test "x$with_indicator_gtk" = x2; then - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4` else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4` fi AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c index e232b37..087378c 100644 --- a/src/users-service-dbus.c +++ b/src/users-service-dbus.c @@ -557,7 +557,6 @@ seat_proxy_session_added (DBusGProxy *seat_proxy, g_return_if_fail(IS_USERS_SERVICE_DBUS(service)); UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (service); uid_t uid; - gboolean res; struct passwd *pwent; UserData *user; @@ -590,7 +589,7 @@ seat_proxy_session_added (DBusGProxy *seat_proxy, if (!user) return; - res = do_add_session (service, user, session_id); + do_add_session (service, user, session_id); } static void |