Import upstream version 0.3.0

1 files changed, 298 insertions, 57 deletions

diff --git a/configure b/configure
index 1b88e0d..091054b 100755
--- a/configure
+++ b/configure
@@ -803,7 +803,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_silent_rules
-with_indicator_gtk
+with_gtk
 with_gconf_source
 with_gconf_schema_file_dir
 enable_schemas_install
@@ -1472,7 +1472,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
-  --with-indicator-gtk    Which version of gtk to use for the indicator
+  --with-gtk              Which version of gtk to use for the indicator
                           [default=3]
   --with-gconf-source=sourceaddress
                           Config database for installing schema files.
@@ -2759,7 +2759,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.2.93
+ VERSION=0.3.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12780,11 +12780,11 @@ DBUSMENUGTK_REQUIRED_VERSION=0.3.91
 POLKIT_REQUIRED_VERSION=0.92
 
 
-# Check whether --with-indicator-gtk was given.
-if test "${with_indicator_gtk+set}" = set; then :
-  withval=$with_indicator_gtk;
+# Check whether --with-gtk was given.
+if test "${with_gtk+set}" = set; then :
+  withval=$with_gtk;
 else
-  with_indicator_gtk=3
+  with_gtk=3
 fi
 
 
@@ -12908,7 +12908,7 @@ $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
-if test "x$with_indicator_gtk" = x3; then :
+if test "x$with_gtk" = x3; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5
@@ -13019,7 +13019,7 @@ $as_echo "yes" >&6; }
 
 fi
 
-elif test "x$with_indicator_gtk" = x2; then :
+elif test "x$with_gtk" = x2; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5
@@ -13142,6 +13142,7 @@ fi
 
 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
 
+if test "x$with_gtk" = x3; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SESSIONSERVICE" >&5
@@ -13152,23 +13153,23 @@ if test -n "$SESSIONSERVICE_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
+                                       dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION") 2>&5
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SESSIONSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13181,23 +13182,23 @@ if test -n "$SESSIONSERVICE_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
+                                       dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION") 2>&5
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SESSIONSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13219,25 +13220,25 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>&1`
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>&1`
         else
 	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>&1`
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SESSIONSERVICE_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                  dbus-glib-1
-                                  gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION) were not met:
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION) were not met:
 
 $SESSIONSERVICE_PKG_ERRORS
 
@@ -13270,10 +13271,143 @@ $as_echo "yes" >&6; }
 
 fi
 
+elif test "x$with_gtk" = x2; then :
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SESSIONSERVICE" >&5
+$as_echo_n "checking for SESSIONSERVICE... " >&6; }
+
+if test -n "$SESSIONSERVICE_CFLAGS"; then
+    pkg_cv_SESSIONSERVICE_CFLAGS="$SESSIONSERVICE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SESSIONSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SESSIONSERVICE_LIBS"; then
+    pkg_cv_SESSIONSERVICE_LIBS="$SESSIONSERVICE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SESSIONSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>&1`
+        else
+	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SESSIONSERVICE_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       dbus-glib-1
+                                       gio-unix-2.0
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION) were not met:
+
+$SESSIONSERVICE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables SESSIONSERVICE_CFLAGS
+and SESSIONSERVICE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables SESSIONSERVICE_CFLAGS
+and SESSIONSERVICE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	SESSIONSERVICE_CFLAGS=$pkg_cv_SESSIONSERVICE_CFLAGS
+	SESSIONSERVICE_LIBS=$pkg_cv_SESSIONSERVICE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+fi
 
 
 
+
+if test "x$with_gtk" = x3; then :
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKLOGOUTHELPER" >&5
 $as_echo_n "checking for GTKLOGOUTHELPER... " >&6; }
@@ -13283,14 +13417,14 @@ if test -n "$GTKLOGOUTHELPER_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
+                                        polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTKLOGOUTHELPER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13303,14 +13437,14 @@ if test -n "$GTKLOGOUTHELPER_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
+                                        polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTKLOGOUTHELPER_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13332,16 +13466,16 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        GTKLOGOUTHELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
         else
 	        GTKLOGOUTHELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKLOGOUTHELPER_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) were not met:
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) were not met:
 
 $GTKLOGOUTHELPER_PKG_ERRORS
 
@@ -13374,6 +13508,111 @@ $as_echo "yes" >&6; }
 
 fi
 
+elif test "x$with_gtk" = x2; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKLOGOUTHELPER" >&5
+$as_echo_n "checking for GTKLOGOUTHELPER... " >&6; }
+
+if test -n "$GTKLOGOUTHELPER_CFLAGS"; then
+    pkg_cv_GTKLOGOUTHELPER_CFLAGS="$GTKLOGOUTHELPER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTKLOGOUTHELPER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTKLOGOUTHELPER_LIBS"; then
+    pkg_cv_GTKLOGOUTHELPER_LIBS="$GTKLOGOUTHELPER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTKLOGOUTHELPER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTKLOGOUTHELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
+        else
+	        GTKLOGOUTHELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTKLOGOUTHELPER_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) were not met:
+
+$GTKLOGOUTHELPER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTKLOGOUTHELPER_CFLAGS
+and GTKLOGOUTHELPER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTKLOGOUTHELPER_CFLAGS
+and GTKLOGOUTHELPER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GTKLOGOUTHELPER_CFLAGS=$pkg_cv_GTKLOGOUTHELPER_CFLAGS
+	GTKLOGOUTHELPER_LIBS=$pkg_cv_GTKLOGOUTHELPER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+fi
+
 
 
 
@@ -13584,7 +13823,7 @@ fi
 if test "x$with_localinstall" = "xyes"; then
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
-elif test "x$with_indicator_gtk" = x2; then
+elif test "x$with_gtk" = x2; then
 	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
 	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
 else
@@ -16788,12 +17027,14 @@ fi
 SUS Indicator Configuration:
 
 	Prefix:        $prefix
-	Indicator GTK: $with_indicator_gtk
+	Indicator Dir: $INDICATORDIR
+	Indicator GTK: $with_gtk
 " >&5
 $as_echo "$as_me:
 
 SUS Indicator Configuration:
 
 	Prefix:        $prefix
-	Indicator GTK: $with_indicator_gtk
+	Indicator Dir: $INDICATORDIR
+	Indicator GTK: $with_gtk
 " >&6;}