Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream into lp:~ubuntu-desktop/indicator-session/ubuntu

[Ted Gould]

0.3.90

=== modified file 'AUTHORS'
--- AUTHORS	2011-08-25 12:58:54 +0000
+++ AUTHORS	2012-02-08 16:05:23 +0000
@@ -1,12 +1,15 @@
 # Generated by Makefile. Do not edit.
 
+ Alberto Mardegan 
  Alexander Sack 
  Christoph Korn 
  Cody Russell 
  Conor Curran 
  Daniel van Vugt 
  David Barth 
+ Dmitry Shachnev 
  Gabor Kelemen 
+ György Balló 
  Jeremy Bicha 
  Ken VanDine 
  Kyle Nitzsche 

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-08 02:41:26 +0000
+++ ChangeLog	2012-02-08 16:05:23 +0000
@@ -1,5 +1,86 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.90
+
[phone]  Ted Gould  <[e-mail]>
+
+	Screensaver code cleanup
+
[phone]  Marc Deslauriers  <[e-mail]>
+
+	Remove dead GSS throttling code. Let gnome-settings-daemon
+	handle locking the screen when UPower requests it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix ordering of items on request
+
[phone]  Dmitry Shachnev  <[e-mail]>
+
+	Swap return values of indicator_session_get_location
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing GOA support
+
[phone]  Alberto Mardegan  <[e-mail]>
+
+	Remove "Online accounts" from user menu
+	
+	The "Online accounts" feature is going to be removed from the control panel in Precise.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix GTK3 Box Deprecation
+
[phone]  Ted Gould  <[e-mail]>
+
+	If we have GTK3 use the new gtk_box_new() function not the deprecated one
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding flags into the build to make sure we know if we're GTK3 or not
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating to dbusmenu 0.5.90
+
[phone]  Ted Gould  <[e-mail]>
+
+	Modifying includes to not include libdbusmenu-gtk3 stuff
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating required dbusmenu 0.5.90
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the gtk logout helper and apt optional build time choices
+
[phone]  György Balló  <[e-mail]>
+
+	Make APT support optional
+
[phone]  György Balló  <[e-mail]>
+
+	Make GTK Logout Helper optional
+
[phone]  Ted Gould  <[e-mail]>
+
+	Add name hints to the indicators
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Export the indicators name hints
+	
+	Using the PACKAGE config.h variable both for the users and devices entries.
+
[phone]  Conor Curran  <[e-mail]>
+
+	bump version for release
+
 2011-10-28  Conor Curran  <[e-mail]>
 
 	fix the invalid utf8 bug and update ignore file

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-08-25 19:25:38 +0000
+++ aclocal.m4	2012-02-08 16:05:23 +0000
@@ -260,6 +260,10 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -581,7 +585,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' 
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -634,7 +638,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
@@ -733,8 +737,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -743,8 +747,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -878,6 +882,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -1363,7 +1369,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -1527,6 +1533,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -1548,6 +1555,29 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -1578,6 +1608,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -1680,7 +1714,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1688,6 +1728,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -1699,6 +1740,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -1716,7 +1758,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1761,8 +1805,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1773,6 +1817,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -2056,14 +2102,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -2140,13 +2199,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -2326,6 +2385,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2365,7 +2429,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2911,7 +2975,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2920,7 +2984,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2985,7 +3049,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -3124,7 +3188,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -3132,10 +3196,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -3143,7 +3203,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -3161,7 +3221,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3181,7 +3241,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -3192,7 +3252,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -3253,7 +3313,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -3269,7 +3329,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -3306,9 +3366,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3383,7 +3443,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -3452,7 +3512,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3477,7 +3537,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3501,7 +3561,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -3532,7 +3592,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3542,7 +3602,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3964,7 +4024,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4384,6 +4444,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4968,7 +5029,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -5060,18 +5123,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -5231,7 +5309,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -5259,7 +5339,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5513,8 +5592,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5810,6 +5888,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5856,10 +5935,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5872,7 +5947,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5911,7 +5986,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -6353,9 +6427,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -6509,7 +6580,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6879,7 +6949,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -7640,12 +7710,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7842,7 +7918,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7975,7 +8050,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8158,6 +8232,73 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -8227,6 +8368,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -8891,9 +9039,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -9065,15 +9228,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])

=== modified file 'config.h.in'
--- config.h.in	2010-04-09 16:05:57 +0000
+++ config.h.in	2012-02-08 16:05:23 +0000
@@ -9,6 +9,9 @@
 /* locale directory */
 #undef GNOMELOCALEDIR
 
+/* Define to 1 to enable APT support */
+#undef HAVE_APT
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
@@ -21,6 +24,12 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
+/* whether gtk3 is available */
+#undef HAVE_GTK3
+
+/* Define to 1 to enable GTK Logout Helper */
+#undef HAVE_GTKLOGOUTHELPER
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 

=== modified file 'configure'
--- configure	2012-02-08 02:41:26 +0000
+++ configure	2012-02-08 16:05:23 +0000
@@ -629,8 +629,14 @@
 DBUSSERVICEDIR
 INDICATORICONSDIR
 INDICATORDIR
+BUILD_APT_FALSE
+BUILD_APT_TRUE
+BUILD_GTKLOGOUTHELPER_FALSE
+BUILD_GTKLOGOUTHELPER_TRUE
 GTKLOGOUTHELPER_LIBS
 GTKLOGOUTHELPER_CFLAGS
+USE_GTK3_FALSE
+USE_GTK3_TRUE
 SESSIONERVICE_LIBS
 SESSIONERVICE_CFLAGS
 SESSIONSERVICE_LIBS
@@ -802,6 +808,8 @@
 enable_libtool_lock
 enable_silent_rules
 with_gtk
+enable_gtklogouthelper
+enable_apt
 enable_localinstall
 '
       ac_precious_vars='build_alias
@@ -1454,13 +1462,16 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-gtklogouthelper
+                          enable GTK Logout Helper
+  --disable-apt           disable APT support
   --enable-localinstall   install all of the files localy instead of system
                           directories (for distcheck)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -2745,7 +2756,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.3.7.1
+ VERSION=0.3.90
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4196,7 +4207,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -4522,7 +4533,7 @@
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -5819,8 +5830,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6535,6 +6546,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6574,7 +6590,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -7003,7 +7019,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7643,13 +7659,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7796,6 +7812,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -8184,7 +8201,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -8195,7 +8212,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8835,7 +8865,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8846,6 +8882,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8878,6 +8915,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8899,7 +8937,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -9054,7 +9094,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -9132,6 +9187,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9587,7 +9646,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9678,18 +9739,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -10051,7 +10127,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10304,8 +10379,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10685,6 +10759,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10730,6 +10805,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10758,10 +10834,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10774,7 +10846,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10813,7 +10885,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11437,11 +11508,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11531,7 +11597,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11540,7 +11606,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11605,7 +11671,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11744,7 +11810,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11752,10 +11818,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11763,7 +11825,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11781,7 +11843,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11801,7 +11863,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -11812,7 +11874,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11873,7 +11935,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11889,7 +11951,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11926,9 +11988,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12022,7 +12084,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -12091,7 +12153,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12116,7 +12178,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12140,7 +12202,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -12171,7 +12233,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12181,7 +12243,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12963,6 +13025,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -12995,7 +13059,7 @@
 GTK_REQUIRED_VERSION=2.12
 GTK3_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
-DBUSMENUGTK_REQUIRED_VERSION=0.4.92
+DBUSMENUGTK_REQUIRED_VERSION=0.5.90
 POLKIT_REQUIRED_VERSION=0.92
 
 
@@ -13239,6 +13303,7 @@
 
 
 
+
 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
 
 if test "x$with_gtk" = x3; then :
@@ -13523,8 +13588,37 @@
 
 
 
+ if test "x$with_gtk" = "x3"; then
+  USE_GTK3_TRUE=
+  USE_GTK3_FALSE='#'
+else
+  USE_GTK3_TRUE='#'
+  USE_GTK3_FALSE=
+fi
+
 if test "x$with_gtk" = x3; then :
 
+
+$as_echo "#define HAVE_GTK3 1" >>confdefs.h
+
+
+fi
+
+###########################
+# GTK Logout Helper
+###########################
+
+# Check whether --enable-gtklogouthelper was given.
+if test "${enable_gtklogouthelper+set}" = set; then :
+  enableval=$enable_gtklogouthelper;
+else
+  enable_gtklogouthelper=auto
+fi
+
+
+if test x"$enable_gtklogouthelper" != x"no" ; then
+   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; }
@@ -13534,14 +13628,14 @@
  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
@@ -13554,14 +13648,14 @@
  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
@@ -13583,46 +13677,25 @@
 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:
-
-$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
+	have_gtklogouthelper=no
 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; }
+	have_gtklogouthelper=no
 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; }
-
+	have_gtklogouthelper=yes
 fi
 
 elif test "x$with_gtk" = x2; then :
@@ -13636,14 +13709,14 @@
  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
+                                           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
+                                           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`
+                                           polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13656,14 +13729,14 @@
  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
+                                           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
+                                           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`
+                                           polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13685,54 +13758,76 @@
 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`
+                                           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`
+                                           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
+	have_gtklogouthelper=no
 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; }
+	have_gtklogouthelper=no
 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
-
-
-
-
+	have_gtklogouthelper=yes
+fi
+
+
+fi
+   if test x${have_gtklogouthelper} = xyes; then
+
+$as_echo "#define HAVE_GTKLOGOUTHELPER 1" >>confdefs.h
+
+   fi
+   if test x${enable_gtklogouthelper} = xyes && test x${have_gtklogouthelper} = xno; then
+     as_fn_error $? "GTK Logout Helper configured but polkit-gobject not found" "$LINENO" 5
+   fi
+else
+   have_gtklogouthelper=no
+fi
+ if test x${have_gtklogouthelper} = xyes; then
+  BUILD_GTKLOGOUTHELPER_TRUE=
+  BUILD_GTKLOGOUTHELPER_FALSE='#'
+else
+  BUILD_GTKLOGOUTHELPER_TRUE='#'
+  BUILD_GTKLOGOUTHELPER_FALSE=
+fi
+
+
+
+
+
+###########################
+# APT support
+###########################
+# Check whether --enable-apt was given.
+if test "${enable_apt+set}" = set; then :
+  enableval=$enable_apt;
+else
+  enable_apt=yes
+fi
+
+ if test "x$enable_apt" != "xno"; then
+  BUILD_APT_TRUE=
+  BUILD_APT_FALSE='#'
+else
+  BUILD_APT_TRUE='#'
+  BUILD_APT_FALSE=
+fi
+
+
+if test "x$enable_apt" != "xno"; then
+
+$as_echo "#define HAVE_APT 1" >>confdefs.h
+
+fi
 
 ###########################
 # Check to see if we're local
@@ -14391,6 +14486,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -14654,6 +14753,18 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_GTK3_TRUE}" && test -z "${USE_GTK3_FALSE}"; then
+  as_fn_error $? "conditional \"USE_GTK3\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_GTKLOGOUTHELPER_TRUE}" && test -z "${BUILD_GTKLOGOUTHELPER_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_GTKLOGOUTHELPER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_APT_TRUE}" && test -z "${BUILD_APT_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_APT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -15266,6 +15377,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -15348,7 +15460,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -15404,6 +15515,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -15454,7 +15566,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -16273,8 +16384,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -16328,6 +16439,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -16629,10 +16743,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -16956,6 +17066,8 @@
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
 	Indicator GTK: $with_gtk
+	Logout Helper: $have_gtklogouthelper
+	APT support:   $enable_apt
 " >&5
 $as_echo "$as_me:
 
@@ -16964,4 +17076,6 @@
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
 	Indicator GTK: $with_gtk
+	Logout Helper: $have_gtklogouthelper
+	APT support:   $enable_apt
 " >&6;}

=== modified file 'configure.ac'
--- configure.ac	2012-02-08 02:49:57 +0000
+++ configure.ac	2012-02-08 16:05:23 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.7.1)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.90)
 
 AM_MAINTAINER_MODE
 
@@ -30,7 +30,7 @@
 GTK_REQUIRED_VERSION=2.12
 GTK3_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
-DBUSMENUGTK_REQUIRED_VERSION=0.4.92
+DBUSMENUGTK_REQUIRED_VERSION=0.5.90
 POLKIT_REQUIRED_VERSION=0.92
 
 AC_ARG_WITH([gtk],
@@ -51,6 +51,7 @@
         ],
       [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])]
 )
+
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
@@ -77,21 +78,60 @@
 AC_SUBST(SESSIONERVICE_CFLAGS)
 AC_SUBST(SESSIONERVICE_LIBS)
 
-AS_IF([test "x$with_gtk" = x3],
-    [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-    ],
-    [test "x$with_gtk" = x2],
-    [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-    ]
-)
-
+AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
+AS_IF([test "x$with_gtk" = x3], [
+       AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
+     ])
+
+###########################
+# GTK Logout Helper
+###########################
+
+AC_ARG_ENABLE([gtklogouthelper],
+            AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper]),,
+            enable_gtklogouthelper=auto)
+
+if test x"$enable_gtklogouthelper" != x"no" ; then
+   AS_IF([test "x$with_gtk" = x3],
+       [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                           polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
+	                                   [have_gtklogouthelper=yes],
+	                                   [have_gtklogouthelper=no])
+       ],
+       [test "x$with_gtk" = x2],
+       [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                           polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
+	                                   [have_gtklogouthelper=yes],
+	                                   [have_gtklogouthelper=no])
+       ]
+   )
+   if test x${have_gtklogouthelper} = xyes; then
+      AC_DEFINE(HAVE_GTKLOGOUTHELPER, 1, [Define to 1 to enable GTK Logout Helper])
+   fi
+   if test x${enable_gtklogouthelper} = xyes && test x${have_gtklogouthelper} = xno; then
+     AC_MSG_ERROR([GTK Logout Helper configured but polkit-gobject not found])
+   fi
+else
+   have_gtklogouthelper=no
+fi
+AM_CONDITIONAL(BUILD_GTKLOGOUTHELPER, test x${have_gtklogouthelper} = xyes)
 
 AC_SUBST(GTKLOGOUTHELPER_CFLAGS)
 AC_SUBST(GTKLOGOUTHELPER_LIBS)
 
 ###########################
+# APT support
+###########################
+AC_ARG_ENABLE([apt],
+	AC_HELP_STRING([--disable-apt], [disable APT support]),,
+	[enable_apt=yes])
+AM_CONDITIONAL([BUILD_APT], [test "x$enable_apt" != "xno"])
+
+if test "x$enable_apt" != "xno"; then
+   AC_DEFINE(HAVE_APT, 1, [Define to 1 to enable APT support])
+fi
+
+###########################
 # Check to see if we're local
 ###########################
 
@@ -192,4 +232,6 @@
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
 	Indicator GTK: $with_gtk
+	Logout Helper: $have_gtklogouthelper
+	APT support:   $enable_apt
 ])

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-08-23 20:28:24 +0000
+++ data/Makefile.am	2012-02-08 16:05:23 +0000
@@ -18,6 +18,15 @@
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = indicator-session.convert
 
+EXTRA_DIST =					\
+	$(service_in_files)			\
+	$(gsettings_SCHEMAS:.xml=.xml.in)
+
+CLEANFILES =					\
+	$(dbus_services_DATA)			\
+	$(gsettings_SCHEMAS)
+
+if BUILD_GTKLOGOUTHELPER
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in
@@ -37,14 +46,9 @@
 	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
 logout_helper_DATA = $(logout_helper_desktop_files)
 
-EXTRA_DIST =					\
-	$(service_in_files)			\
-	$(gsettings_SCHEMAS:.xml=.xml.in) \
+EXTRA_DIST +=					\
 	$(logout_helper_desktop_in_in_files)
 
-
-CLEANFILES =					\
-	$(dbus_services_DATA)			\
-	$(gsettings_SCHEMAS) \
+CLEANFILES +=					\
 	$(logout_helper_desktop_files)
-
+endif

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2011-08-25 19:25:38 +0000
+++ data/Makefile.in	2012-02-08 16:05:23 +0000
@@ -34,6 +34,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_in_in_files)
+
+@BUILD_GTKLOGOUTHELPER_TRUE@am__append_2 = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_files)
+
 subdir = data
 DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -285,27 +291,21 @@
 gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = indicator-session.convert
-logout_helper_desktop_in_in_files = \
-	indicator-session-lock-screen.desktop.in.in \
-	indicator-session-logout.desktop.in.in \
-	indicator-session-restart.desktop.in.in \
-	indicator-session-shutdown.desktop.in.in
-
-logout_helperdir = $(datadir)/applications
-logout_helper_desktop_files = \
-	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
-
-logout_helper_DATA = $(logout_helper_desktop_files)
-EXTRA_DIST = \
-	$(service_in_files)			\
-	$(gsettings_SCHEMAS:.xml=.xml.in) \
-	$(logout_helper_desktop_in_in_files)
-
-CLEANFILES = \
-	$(dbus_services_DATA)			\
-	$(gsettings_SCHEMAS) \
-	$(logout_helper_desktop_files)
-
+EXTRA_DIST = $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in) \
+	$(am__append_1)
+CLEANFILES = $(dbus_services_DATA) $(gsettings_SCHEMAS) \
+	$(am__append_2)
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_in_in_files = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-lock-screen.desktop.in.in \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-logout.desktop.in.in \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-restart.desktop.in.in \
+@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-shutdown.desktop.in.in
+
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helperdir = $(datadir)/applications
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_files = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
+
+@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_DATA = $(logout_helper_desktop_files)
 all: all-recursive
 
 .SUFFIXES:
@@ -730,13 +730,13 @@
 
 @GSETTINGS_RULES@
 
-@INTLTOOL_DESKTOP_RULE@
+@BUILD_GTKLOGOUTHELPER_TRUE@@INTLTOOL_DESKTOP_RULE@
 
-%.desktop.in: %.desktop.in.in
-	sed \
-		-e "s|\@libexecdir\@|$(libexecdir)|" \
-		-e "s|\@bindir\@|$(bindir)|" \
-		$< > $@
+@BUILD_GTKLOGOUTHELPER_TRUE@%.desktop.in: %.desktop.in.in
+@BUILD_GTKLOGOUTHELPER_TRUE@	sed \
+@BUILD_GTKLOGOUTHELPER_TRUE@		-e "s|\@libexecdir\@|$(libexecdir)|" \
+@BUILD_GTKLOGOUTHELPER_TRUE@		-e "s|\@bindir\@|$(bindir)|" \
+@BUILD_GTKLOGOUTHELPER_TRUE@		$< > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-08 03:03:44 +0000
+++ debian/changelog	2012-02-08 16:05:23 +0000
@@ -1,3 +1,19 @@
+indicator-session (0.3.90-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Screensaver code cleanup
+    * Fix ordering of items on request
+    * Removing GOA support
+    * Fix GTK3 Box Deprecation
+    * Updating to dbusmenu 0.5.90
+    * Making the gtk logout helper and apt optional build time choices
+    * Add name hints to the indicators
+    * bump version for release
+  * Drop debian/patches/01-remove-dead-gss-handling.patch: Upstream
+  * debian/control: Updating dbusmenu dep to 0.5.90
+
+ -- Ted Gould <[e-mail]>  Tue, 07 Feb 2012 21:19:27 -0600
+
 indicator-session (0.3.7.1-1ubuntu2) precise; urgency=low
 
   * debian/patches/01-remove-dead-gss-handling.patch: Remove dead GSS

=== modified file 'debian/control'
--- debian/control	2012-02-08 03:03:44 +0000
+++ debian/control	2012-02-08 16:05:23 +0000
@@ -12,9 +12,9 @@
                gnome-doc-utils,
                libindicator-dev (>= 0.3.90),
                libindicator3-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.4.92),
-               libdbusmenu-gtk-dev (>= 0.4.92),
-               libdbusmenu-gtk3-dev (>= 0.4.92),
+               libdbusmenu-glib-dev (>= 0.5.90),
+               libdbusmenu-gtk-dev (>= 0.5.90),
+               libdbusmenu-gtk3-dev (>= 0.5.90),
                libpolkit-gobject-1-dev,
                intltool
 Standards-Version: 3.9.2

=== removed file 'debian/patches/01-remove-dead-gss-handling.patch'
--- debian/patches/01-remove-dead-gss-handling.patch	2012-02-08 03:03:44 +0000
+++ debian/patches/01-remove-dead-gss-handling.patch	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-Description: Remove dead GSS throttling code. Let gnome-settings-daemon
- handle locking the screen when UPower requests it.
-Author: Marc Deslauriers <[e-mail]>
-
-Index: indicator-session-0.3.7.1/src/device-menu-mgr.c
-===================================================================
---- indicator-session-0.3.7.1.orig/src/device-menu-mgr.c	2012-01-28 17:19:05.650929258 -0500
-+++ indicator-session-0.3.7.1/src/device-menu-mgr.c	2012-01-28 17:29:47.274923139 -0500
-@@ -74,7 +74,6 @@
- static void device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self);
- static void setup_up (DeviceMenuMgr* self);
- static void device_menu_mgr_rebuild_items (DeviceMenuMgr *self);
--static void lock_if_possible (DeviceMenuMgr* self);
- static void machine_sleep_with_context (DeviceMenuMgr* self,
-                                         gchar* type);
- static void show_system_settings_with_context (DbusmenuMenuitem * mi,
-@@ -162,27 +161,6 @@
- 	return;
- }
- 
--/* Check to see if the lockdown key is protecting from
--   locking the screen.  If not, lock it. */
--static void
--lock_if_possible (DeviceMenuMgr* self) {
--	device_menu_mgr_ensure_settings_client (self);
--
--	if (!g_settings_get_boolean (lockdown_settings, LOCKDOWN_KEY_SCREENSAVER)) {
--		lock_screen (NULL, 0, NULL);
--	}
--	return;
--}
--
--/* A return from the command to sleep the system.  Make sure
--   that we unthrottle the screensaver. */
--static void
--sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
--{
--	screensaver_unthrottle();
--	return;
--}
--
- static void
- machine_sleep_from_suspend (DbusmenuMenuitem * mi,
-                             guint timestamp,
-@@ -210,11 +188,9 @@
- 		g_warning("Can not %s as no upower proxy", type);
- 	}
- 
--	screensaver_throttle(type);
--	lock_if_possible (self);
- 	dbus_g_proxy_begin_call(up_main_proxy,
- 	                        type,
--	                        sleep_response,
-+	                        NULL,
- 	                        NULL,
- 	                        NULL,
- 	                        G_TYPE_INVALID);
-Index: indicator-session-0.3.7.1/src/lock-helper.c
-===================================================================
---- indicator-session-0.3.7.1.orig/src/lock-helper.c	2012-01-28 17:19:05.634929258 -0500
-+++ indicator-session-0.3.7.1/src/lock-helper.c	2012-01-28 17:19:07.142929243 -0500
-@@ -29,8 +29,6 @@
- 
- static DBusGProxy * gss_proxy = NULL;
- static GMainLoop * gss_mainloop = NULL;
--static guint cookie = 0;
--static DBusGProxyCall * cookie_call = NULL;
- 
- static gboolean is_guest = FALSE;
- 
-@@ -38,90 +36,6 @@
- 
- void build_gss_proxy (void);
- 
--/* Checks to see if there is an error and reports
--   it.  Not much else we can do. */
--static void
--unthrottle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
--{
--	GError * error = NULL;
--	dbus_g_proxy_end_call(proxy, call, &error,
--	                      G_TYPE_INVALID);
--
--	if (error != NULL) {
--		g_warning("Unable to unthrottle: %s", error->message);
--	}
--	return;
--}
--
--/* Sends an unthrottle if we're throttled. */
--void
--screensaver_unthrottle (void)
--{
--	g_return_if_fail(cookie != 0);
--
--	build_gss_proxy();
--	g_return_if_fail(gss_proxy != NULL);
--
--	dbus_g_proxy_begin_call(gss_proxy, "UnThrottle",
--	                        unthrottle_return, NULL,
--	                        NULL,
--	                        G_TYPE_UINT, cookie,
--	                        G_TYPE_INVALID);
--
--	cookie = 0;
--	return;
--}
--
--/* Gets there return cookie from the throttle command
--   and sets things valid */
--static void
--throttle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
--{
--	GError * error = NULL;
--	cookie_call = NULL;
--
--	dbus_g_proxy_end_call(proxy, call, &error,
--	                      G_TYPE_UINT, &cookie,
--	                      G_TYPE_INVALID);
--
--	if (error != NULL) {
--		g_warning("Unable to throttle the screensaver: %s", error->message);
--		return;
--	}
--
--
--	if (cookie == 0) {
--		g_warning("We didn't get a throttle cookie!");
--	}
--
--	return;
--}
--
--/* Throttling the screensaver by using the screen saver
--   command. */
--void
--screensaver_throttle (gchar * reason)
--{
--	g_return_if_fail(cookie_call == NULL);
--	g_return_if_fail(will_lock_screen());
--
--	if (cookie != 0) {
--		screensaver_unthrottle();
--	}
--
--	build_gss_proxy();
--	g_return_if_fail(gss_proxy != NULL);
--
--	cookie_call = dbus_g_proxy_begin_call(gss_proxy, "Throttle",
--	                                      throttle_return, NULL,
--	                                      NULL,
--	                                      G_TYPE_STRING, "Session Menu",
--	                                      G_TYPE_STRING, reason,
--	                                      G_TYPE_INVALID);
--
--	return;
--}
--
- /* This is our logic on whether the screen should be locked
-    or not.  It effects everything else. */
- gboolean
-Index: indicator-session-0.3.7.1/src/lock-helper.h
-===================================================================
---- indicator-session-0.3.7.1.orig/src/lock-helper.h	2012-01-28 17:19:05.666929258 -0500
-+++ indicator-session-0.3.7.1/src/lock-helper.h	2012-01-28 17:19:07.142929243 -0500
-@@ -24,9 +24,6 @@
- 
- #include <libdbusmenu-glib/menuitem.h>
- 
--void screensaver_throttle (gchar * reason);
--void screensaver_unthrottle (void);
--
- gboolean will_lock_screen (void);
- void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data);
- gboolean lock_screen_setup (gpointer data);

=== removed file 'debian/patches/series'
--- debian/patches/series	2012-02-08 03:03:44 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-01-remove-dead-gss-handling.patch

=== modified file 'ltmain.sh' (properties changed: +x to -x)
--- ltmain.sh	2011-06-21 15:39:54 +0000
+++ ltmain.sh	2012-02-08 16:05:23 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <[e-mail]>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-2ubuntu1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7319,6 +7333,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7438,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8056,7 +8076,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8064,11 +8084,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9158,6 +9174,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9267,7 +9285,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

=== modified file 'po/Makefile.in.in'
--- po/Makefile.in.in	2010-04-09 16:05:57 +0000
+++ po/Makefile.in.in	2012-02-08 16:05:23 +0000
@@ -49,8 +49,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-08-31 18:38:17 +0000
+++ src/Makefile.am	2012-02-08 16:05:23 +0000
@@ -1,7 +1,11 @@
 
 libexec_PROGRAMS = \
-	indicator-session-service \
+	indicator-session-service
+
+if BUILD_GTKLOGOUTHELPER
+libexec_PROGRAMS += \
 	gtk-logout-helper
+endif
 
 ###################
 # Indicator Stuff
@@ -103,13 +107,18 @@
 	user-menu-mgr.c \
 	device-menu-mgr.h \
 	device-menu-mgr.c \
+	udev-mgr.h \
+	udev-mgr.c \
+	sane-rules.h
+
+if BUILD_APT
+indicator_session_service_SOURCES += \
 	apt-watcher.h \
 	apt-watcher.c \
 	apt-transaction.h \
-	apt-transaction.c \
-	udev-mgr.h \
-	udev-mgr.c \
-	sane-rules.h
+	apt-transaction.c
+endif
+
 indicator_session_service_CFLAGS = \
 	$(SESSIONSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -124,6 +133,7 @@
 # GTK Logout Stuff
 #################
 
+if BUILD_GTKLOGOUTHELPER
 gtk_logout_helper_SOURCES = \
 	gtk-logout-helper.c \
 	settings-helper.c \
@@ -142,6 +152,7 @@
 	$(SESSIONSERVICE_LIBS) \
 	$(GTKLOGOUTHELPER_LIBS) \
 	$(GCONF_LIBS)
+endif
 
 
 ###############

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-08-25 19:25:38 +0000
+++ src/Makefile.in	2012-02-08 16:05:23 +0000
@@ -35,8 +35,16 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-libexec_PROGRAMS = indicator-session-service$(EXEEXT) \
-	gtk-logout-helper$(EXEEXT)
+libexec_PROGRAMS = indicator-session-service$(EXEEXT) $(am__EXEEXT_1)
+@BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk-logout-helper
+
+@BUILD_APT_TRUE@am__append_2 = \
+@BUILD_APT_TRUE@	apt-watcher.h \
+@BUILD_APT_TRUE@	apt-watcher.c \
+@BUILD_APT_TRUE@	apt-transaction.h \
+@BUILD_APT_TRUE@	apt-transaction.c
+
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -82,18 +90,30 @@
 libsession_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsession_la_CFLAGS) \
 	$(CFLAGS) $(libsession_la_LDFLAGS) $(LDFLAGS) -o $@
+@BUILD_GTKLOGOUTHELPER_TRUE@am__EXEEXT_1 = gtk-logout-helper$(EXEEXT)
 PROGRAMS = $(libexec_PROGRAMS)
-am_gtk_logout_helper_OBJECTS =  \
-	gtk_logout_helper-gtk-logout-helper.$(OBJEXT) \
-	gtk_logout_helper-settings-helper.$(OBJEXT) \
-	gtk_logout_helper-dialog.$(OBJEXT)
+am__gtk_logout_helper_SOURCES_DIST = gtk-logout-helper.c \
+	settings-helper.c settings-helper.h dialog.c dialog.h
+@BUILD_GTKLOGOUTHELPER_TRUE@am_gtk_logout_helper_OBJECTS = gtk_logout_helper-gtk-logout-helper.$(OBJEXT) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk_logout_helper-settings-helper.$(OBJEXT) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk_logout_helper-dialog.$(OBJEXT)
 gtk_logout_helper_OBJECTS = $(am_gtk_logout_helper_OBJECTS)
-gtk_logout_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_DEPENDENCIES =  \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(am__DEPENDENCIES_1)
 gtk_logout_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(gtk_logout_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+am__indicator_session_service_SOURCES_DIST = lock-helper.c \
+	lock-helper.h session-service.c session-dbus.c session-dbus.h \
+	gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \
+	users-service-dbus.h users-service-dbus.c user-menu-mgr.h \
+	user-menu-mgr.c device-menu-mgr.h device-menu-mgr.c udev-mgr.h \
+	udev-mgr.c sane-rules.h apt-watcher.h apt-watcher.c \
+	apt-transaction.h apt-transaction.c
+@BUILD_APT_TRUE@am__objects_1 = indicator_session_service-apt-watcher.$(OBJEXT) \
+@BUILD_APT_TRUE@	indicator_session_service-apt-transaction.$(OBJEXT)
 am_indicator_session_service_OBJECTS =  \
 	indicator_session_service-lock-helper.$(OBJEXT) \
 	indicator_session_service-session-service.$(OBJEXT) \
@@ -103,9 +123,7 @@
 	indicator_session_service-users-service-dbus.$(OBJEXT) \
 	indicator_session_service-user-menu-mgr.$(OBJEXT) \
 	indicator_session_service-device-menu-mgr.$(OBJEXT) \
-	indicator_session_service-apt-watcher.$(OBJEXT) \
-	indicator_session_service-apt-transaction.$(OBJEXT) \
-	indicator_session_service-udev-mgr.$(OBJEXT)
+	indicator_session_service-udev-mgr.$(OBJEXT) $(am__objects_1)
 indicator_session_service_OBJECTS =  \
 	$(am_indicator_session_service_OBJECTS)
 indicator_session_service_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -141,8 +159,9 @@
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libsession_la_SOURCES) $(gtk_logout_helper_SOURCES) \
 	$(indicator_session_service_SOURCES)
-DIST_SOURCES = $(libsession_la_SOURCES) $(gtk_logout_helper_SOURCES) \
-	$(indicator_session_service_SOURCES)
+DIST_SOURCES = $(libsession_la_SOURCES) \
+	$(am__gtk_logout_helper_SOURCES_DIST) \
+	$(am__indicator_session_service_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -329,29 +348,12 @@
 #################
 # Session Stuff
 #################
-indicator_session_service_SOURCES = \
-	lock-helper.c \
-	lock-helper.h \
-	session-service.c \
-	session-dbus.c \
-	session-dbus.h \
-	gen-session-dbus.xml.c \
-	dbusmenu-shared.h \
-	settings-helper.c \
-	users-service-dbus.h \
-	users-service-dbus.c \
-	user-menu-mgr.h \
-	user-menu-mgr.c \
-	device-menu-mgr.h \
-	device-menu-mgr.c \
-	apt-watcher.h \
-	apt-watcher.c \
-	apt-transaction.h \
-	apt-transaction.c \
-	udev-mgr.h \
-	udev-mgr.c \
-	sane-rules.h
-
+indicator_session_service_SOURCES = lock-helper.c lock-helper.h \
+	session-service.c session-dbus.c session-dbus.h \
+	gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \
+	users-service-dbus.h users-service-dbus.c user-menu-mgr.h \
+	user-menu-mgr.c device-menu-mgr.h device-menu-mgr.c udev-mgr.h \
+	udev-mgr.c sane-rules.h $(am__append_2)
 indicator_session_service_CFLAGS = \
 	$(SESSIONSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -367,24 +369,24 @@
 #################
 # GTK Logout Stuff
 #################
-gtk_logout_helper_SOURCES = \
-	gtk-logout-helper.c \
-	settings-helper.c \
-	settings-helper.h \
-	dialog.c \
-	dialog.h
-
-gtk_logout_helper_CFLAGS = \
-	$(SESSIONSERVICE_CFLAGS) \
-	$(GTKLOGOUTHELPER_CFLAGS) \
-	$(GCONF_CFLAGS) \
-	-Wall -Werror \
-	-DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
-
-gtk_logout_helper_LDADD = \
-	$(SESSIONSERVICE_LIBS) \
-	$(GTKLOGOUTHELPER_LIBS) \
-	$(GCONF_LIBS)
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_SOURCES = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk-logout-helper.c \
+@BUILD_GTKLOGOUTHELPER_TRUE@	settings-helper.c \
+@BUILD_GTKLOGOUTHELPER_TRUE@	settings-helper.h \
+@BUILD_GTKLOGOUTHELPER_TRUE@	dialog.c \
+@BUILD_GTKLOGOUTHELPER_TRUE@	dialog.h
+
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_CFLAGS = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(SESSIONSERVICE_CFLAGS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GTKLOGOUTHELPER_CFLAGS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GCONF_CFLAGS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	-Wall -Werror \
+@BUILD_GTKLOGOUTHELPER_TRUE@	-DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
+
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_LDADD = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(SESSIONSERVICE_LIBS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GTKLOGOUTHELPER_LIBS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GCONF_LIBS)
 
 
 ###############
@@ -771,6 +773,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-device-menu-mgr.obj `if test -f 'device-menu-mgr.c'; then $(CYGPATH_W) 'device-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/device-menu-mgr.c'; fi`
 
+indicator_session_service-udev-mgr.o: udev-mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.o -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
+
+indicator_session_service-udev-mgr.obj: udev-mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
+
 indicator_session_service-apt-watcher.o: apt-watcher.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-apt-watcher.o -MD -MP -MF $(DEPDIR)/indicator_session_service-apt-watcher.Tpo -c -o indicator_session_service-apt-watcher.o `test -f 'apt-watcher.c' || echo '$(srcdir)/'`apt-watcher.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-apt-watcher.Tpo $(DEPDIR)/indicator_session_service-apt-watcher.Po
@@ -803,22 +821,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-transaction.obj `if test -f 'apt-transaction.c'; then $(CYGPATH_W) 'apt-transaction.c'; else $(CYGPATH_W) '$(srcdir)/apt-transaction.c'; fi`
 
-indicator_session_service-udev-mgr.o: udev-mgr.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.o -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
-
-indicator_session_service-udev-mgr.obj: udev-mgr.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 

=== modified file 'src/apt-watcher.h'
--- src/apt-watcher.h	2011-07-22 16:40:20 +0000
+++ src/apt-watcher.h	2012-02-08 16:05:23 +0000
@@ -25,11 +25,7 @@
 #include <libdbusmenu-glib/client.h>
 
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3, 0, 0)
-#include <libdbusmenu-gtk3/menuitem.h>
-#else
 #include <libdbusmenu-gtk/menuitem.h>
-#endif
 
 #include "session-dbus.h"
 

=== modified file 'src/device-menu-mgr.c'
--- src/device-menu-mgr.c	2011-08-31 14:51:16 +0000
+++ src/device-menu-mgr.c	2012-02-08 16:05:23 +0000
@@ -17,8 +17,8 @@
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <libdbusmenu-glib/client.h>
-#include <libdbusmenu-gtk3/menuitem.h>
 
 #include "device-menu-mgr.h"
 #include "settings-helper.h"
@@ -26,7 +26,11 @@
 #include "dbusmenu-shared.h"
 #include "lock-helper.h"
 #include "upower-client.h"
+
+#ifdef HAVE_APT
 #include "apt-watcher.h"
+#endif  /* HAVE_APT */
+
 #include "udev-mgr.h"
 
 #define UP_ADDRESS    "org.freedesktop.UPower"
@@ -40,7 +44,9 @@
 	GObject parent_instance;
   DbusmenuMenuitem* root_item;
   SessionDbus* session_dbus_interface;  
+#ifdef HAVE_APT
   AptWatcher* apt_watcher;                              
+#endif  /* HAVE_APT */
   UdevMgr* udev_mgr;
 };
 
@@ -50,7 +56,9 @@
 static DbusmenuMenuitem  *system_settings_menuitem = NULL;
 static DbusmenuMenuitem  *display_settings_menuitem = NULL;
 static DbusmenuMenuitem  *login_settings_menuitem = NULL;
+#ifdef HAVE_APT
 static DbusmenuMenuitem  *software_updates_menuitem = NULL;
+#endif  /* HAVE_APT */
 static DbusmenuMenuitem  *printers_menuitem = NULL;
 static DbusmenuMenuitem  *scanners_menuitem = NULL;
 static DbusmenuMenuitem  *webcam_menuitem = NULL;
@@ -74,7 +82,6 @@
 static void device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self);
 static void setup_up (DeviceMenuMgr* self);
 static void device_menu_mgr_rebuild_items (DeviceMenuMgr *self);
-static void lock_if_possible (DeviceMenuMgr* self);
 static void machine_sleep_with_context (DeviceMenuMgr* self,
                                         gchar* type);
 static void show_system_settings_with_context (DbusmenuMenuitem * mi,
@@ -102,7 +109,9 @@
 static void
 device_menu_mgr_init (DeviceMenuMgr *self)
 {
+#ifdef HAVE_APT
   self->apt_watcher = NULL;
+#endif  /* HAVE_APT */
   self->root_item = dbusmenu_menuitem_new ();  
 	setup_up(self);  
 	g_idle_add(lock_screen_setup, NULL);  
@@ -162,27 +171,6 @@
 	return;
 }
 
-/* Check to see if the lockdown key is protecting from
-   locking the screen.  If not, lock it. */
-static void
-lock_if_possible (DeviceMenuMgr* self) {
-	device_menu_mgr_ensure_settings_client (self);
-
-	if (!g_settings_get_boolean (lockdown_settings, LOCKDOWN_KEY_SCREENSAVER)) {
-		lock_screen (NULL, 0, NULL);
-	}
-	return;
-}
-
-/* A return from the command to sleep the system.  Make sure
-   that we unthrottle the screensaver. */
-static void
-sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	screensaver_unthrottle();
-	return;
-}
-
 static void
 machine_sleep_from_suspend (DbusmenuMenuitem * mi,
                             guint timestamp,
@@ -210,11 +198,9 @@
 		g_warning("Can not %s as no upower proxy", type);
 	}
 
-	screensaver_throttle(type);
-	lock_if_possible (self);
 	dbus_g_proxy_begin_call(up_main_proxy,
 	                        type,
-	                        sleep_response,
+	                        NULL,
 	                        NULL,
 	                        NULL,
 	                        G_TYPE_INVALID);
@@ -410,7 +396,11 @@
 show_dialog (DbusmenuMenuitem * mi, guint timestamp, gchar * type)
 {
 
+#ifdef HAVE_GTKLOGOUTHELPER
 	gchar * helper = g_build_filename(LIBEXECDIR, "gtk-logout-helper", NULL);
+#else
+	gchar * helper = g_build_filename("gnome-session-quit", NULL);
+#endif  /* HAVE_GTKLOGOUTHELPER */
 	gchar * dialog_line = g_strdup_printf("%s --%s", helper, type);
 	g_free(helper);
 
@@ -480,12 +470,14 @@
   {
     g_warning("Unable to launch simple-scan: %s", error->message);
     g_error_free(error);
+#ifdef HAVE_APT
     if (!g_spawn_command_line_async("software-center simple-scan", &error))
     {
       g_warning ("Unable to launch software-centre simple-scan: %s",
                  error->message);
       g_error_free(error);
     }    
+#endif  /* HAVE_APT */
   }  
 }                              
 
@@ -498,12 +490,14 @@
   {
     g_warning("Unable to launch cheese: %s", error->message);
     g_error_free(error);
+#ifdef HAVE_APT
     if (!g_spawn_command_line_async("software-center cheese", &error))
     {
       g_warning ("Unable to launch software-centre cheese: %s",
                  error->message);
       g_error_free(error);
     }    
+#endif  /* HAVE_APT */
   }  
 }                              
 
@@ -542,6 +536,7 @@
   dbusmenu_menuitem_child_add_position(self->root_item,
                                        login_settings_menuitem,                                  
                                        2);
+#ifdef HAVE_APT
   software_updates_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (software_updates_menuitem,
                                   DBUSMENU_MENUITEM_PROP_LABEL,
@@ -549,6 +544,7 @@
   dbusmenu_menuitem_child_add_position(self->root_item,
                                        software_updates_menuitem,
                                        3);
+#endif  /* HAVE_APT */
 
   DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (separator1,
@@ -726,7 +722,11 @@
 	dbusmenu_menuitem_child_append (self->root_item, shutdown_mi);
 	g_signal_connect (G_OBJECT(shutdown_mi),
                     DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+#ifdef HAVE_GTKLOGOUTHELPER
                     G_CALLBACK(show_dialog), "shutdown");
+#else
+                    G_CALLBACK(show_dialog), "power-off");
+#endif  /* HAVE_GTKLOGOUTHELPER */
 
 	RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = g_new0 (RestartShutdownLogoutMenuItems, 1);
 	restart_shutdown_logout_mi->logout_mi = logout_mi;
@@ -778,9 +778,11 @@
   DeviceMenuMgr* device_mgr = g_object_new (DEVICE_TYPE_MENU_MGR, NULL);
   device_mgr->session_dbus_interface = session_dbus;
   device_menu_mgr_build_static_items (device_mgr, greeter_mode);
+#ifdef HAVE_APT
   if (software_updates_menuitem != NULL) {
     device_mgr->apt_watcher = apt_watcher_new (session_dbus,
                                                software_updates_menuitem);
   }
+#endif  /* HAVE_APT */
   return device_mgr;
 }

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2011-09-27 22:05:28 +0000
+++ src/indicator-session.c	2012-02-08 16:05:23 +0000
@@ -31,11 +31,7 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#if GTK_CHECK_VERSION(3, 0, 0)
-#include <libdbusmenu-gtk3/menu.h>
-#else
 #include <libdbusmenu-gtk/menu.h>
-#endif
 
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
@@ -118,8 +114,8 @@
 	object_class->finalize = indicator_session_finalize;
 
 	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
-  io_class->get_entries = indicator_session_get_entries;
-  io_class->get_location = indicator_session_get_location;
+	io_class->get_entries = indicator_session_get_entries;
+	io_class->get_location = indicator_session_get_location;
 	return;
 }
 
@@ -140,6 +136,7 @@
 
   GtkWidget* avatar_icon = NULL;
   // users
+  self->users.name_hint = PACKAGE"-users";
   self->users.menu =  GTK_MENU (dbusmenu_gtkmenu_new (INDICATOR_USERS_DBUS_NAME,
                                                       INDICATOR_USERS_DBUS_OBJECT));
   // Set the image to the default avator image
@@ -169,7 +166,9 @@
   const gchar *greeter_var;
   greeter_var = g_getenv("INDICATOR_GREETER_MODE");
   greeter_mode = g_strcmp0(greeter_var, "1") == 0;
+
   // devices
+  self->devices.name_hint = PACKAGE"-devices";
   self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME,
                                                       INDICATOR_SESSION_DBUS_OBJECT));
   if (greeter_mode){
@@ -277,11 +276,11 @@
 {  
 	IndicatorSession * self = INDICATOR_SESSION (io);
   if (entry == &self->users){
+    return 0;
+  }
+  else if (entry == &self->devices){
     return 1;
   }
-  else if (entry == &self->devices){
-    return 0;
-  }
   g_warning ("IOEntry handed to us to position but we don't own it!");
   return 0;
 }

=== modified file 'src/lock-helper.c'
--- src/lock-helper.c	2011-08-18 18:51:48 +0000
+++ src/lock-helper.c	2012-02-08 16:05:23 +0000
@@ -29,8 +29,6 @@
 
 static DBusGProxy * gss_proxy = NULL;
 static GMainLoop * gss_mainloop = NULL;
-static guint cookie = 0;
-static DBusGProxyCall * cookie_call = NULL;
 
 static gboolean is_guest = FALSE;
 
@@ -38,90 +36,6 @@
 
 void build_gss_proxy (void);
 
-/* Checks to see if there is an error and reports
-   it.  Not much else we can do. */
-static void
-unthrottle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	GError * error = NULL;
-	dbus_g_proxy_end_call(proxy, call, &error,
-	                      G_TYPE_INVALID);
-
-	if (error != NULL) {
-		g_warning("Unable to unthrottle: %s", error->message);
-	}
-	return;
-}
-
-/* Sends an unthrottle if we're throttled. */
-void
-screensaver_unthrottle (void)
-{
-	g_return_if_fail(cookie != 0);
-
-	build_gss_proxy();
-	g_return_if_fail(gss_proxy != NULL);
-
-	dbus_g_proxy_begin_call(gss_proxy, "UnThrottle",
-	                        unthrottle_return, NULL,
-	                        NULL,
-	                        G_TYPE_UINT, cookie,
-	                        G_TYPE_INVALID);
-
-	cookie = 0;
-	return;
-}
-
-/* Gets there return cookie from the throttle command
-   and sets things valid */
-static void
-throttle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	GError * error = NULL;
-	cookie_call = NULL;
-
-	dbus_g_proxy_end_call(proxy, call, &error,
-	                      G_TYPE_UINT, &cookie,
-	                      G_TYPE_INVALID);
-
-	if (error != NULL) {
-		g_warning("Unable to throttle the screensaver: %s", error->message);
-		return;
-	}
-
-
-	if (cookie == 0) {
-		g_warning("We didn't get a throttle cookie!");
-	}
-
-	return;
-}
-
-/* Throttling the screensaver by using the screen saver
-   command. */
-void
-screensaver_throttle (gchar * reason)
-{
-	g_return_if_fail(cookie_call == NULL);
-	g_return_if_fail(will_lock_screen());
-
-	if (cookie != 0) {
-		screensaver_unthrottle();
-	}
-
-	build_gss_proxy();
-	g_return_if_fail(gss_proxy != NULL);
-
-	cookie_call = dbus_g_proxy_begin_call(gss_proxy, "Throttle",
-	                                      throttle_return, NULL,
-	                                      NULL,
-	                                      G_TYPE_STRING, "Session Menu",
-	                                      G_TYPE_STRING, reason,
-	                                      G_TYPE_INVALID);
-
-	return;
-}
-
 /* This is our logic on whether the screen should be locked
    or not.  It effects everything else. */
 gboolean

=== modified file 'src/lock-helper.h'
--- src/lock-helper.h	2010-08-06 15:43:18 +0000
+++ src/lock-helper.h	2012-02-08 16:05:23 +0000
@@ -24,9 +24,6 @@
 
 #include <libdbusmenu-glib/menuitem.h>
 
-void screensaver_throttle (gchar * reason);
-void screensaver_unthrottle (void);
-
 gboolean will_lock_screen (void);
 void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data);
 gboolean lock_screen_setup (gpointer data);

=== modified file 'src/session-service.c'
--- src/session-service.c	2011-08-26 14:44:10 +0000
+++ src/session-service.c	2012-02-08 16:05:23 +0000
@@ -39,11 +39,7 @@
 #include <libdbusmenu-glib/client.h>
 
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3, 0, 0)
-#include <libdbusmenu-gtk3/menuitem.h>
-#else
 #include <libdbusmenu-gtk/menuitem.h>
-#endif
 
 #include <libindicator/indicator-service.h>
 

=== modified file 'src/udev-mgr.h'
--- src/udev-mgr.h	2011-07-27 16:23:28 +0000
+++ src/udev-mgr.h	2012-02-08 16:05:23 +0000
@@ -24,11 +24,7 @@
 #include <libdbusmenu-glib/client.h>
 
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3, 0, 0)
-#include <libdbusmenu-gtk3/menuitem.h>
-#else
 #include <libdbusmenu-gtk/menuitem.h>
-#endif
 
 G_BEGIN_DECLS
 

=== modified file 'src/user-menu-mgr.c'
--- src/user-menu-mgr.c	2011-10-25 21:25:02 +0000
+++ src/user-menu-mgr.c	2012-02-08 16:05:23 +0000
@@ -48,9 +48,6 @@
                                     gpointer user_data);
 static gint compare_users_by_username (const gchar *a,
                                        const gchar *b);
-static void activate_online_accounts (DbusmenuMenuitem *mi,
-                                      guint timestamp,
-                                      gpointer user_data);
 static void activate_user_accounts (DbusmenuMenuitem *mi,
                                     guint timestamp,
                                     gpointer user_data);                                      
@@ -255,26 +252,12 @@
     }
     g_list_free(users);
   }
-  // Add the online accounts and separator
+  // Add the user accounts and separator
   DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (separator1,
                                   DBUSMENU_MENUITEM_PROP_TYPE,
                                   DBUSMENU_CLIENT_TYPES_SEPARATOR);
   dbusmenu_menuitem_child_append (self->root_item, separator1);
-  DbusmenuMenuitem * online_accounts_item = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set (online_accounts_item,
-                                  DBUSMENU_MENUITEM_PROP_TYPE,
-                                  DBUSMENU_CLIENT_TYPES_DEFAULT);
-  dbusmenu_menuitem_property_set (online_accounts_item,
-                                  DBUSMENU_MENUITEM_PROP_LABEL,
-                                  _("Online Accounts…"));
-
-  g_signal_connect (G_OBJECT (online_accounts_item),
-                    DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-                    G_CALLBACK (activate_online_accounts),
-                    NULL);
-                                  
-  dbusmenu_menuitem_child_append (self->root_item, online_accounts_item);
 
   DbusmenuMenuitem * user_accounts_item = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (user_accounts_item,
@@ -359,22 +342,6 @@
   return retval;
 }
 
-// TODO
-// Wait until dialog is complete to find out name to pass
-// to the control centre.
-static void
-activate_online_accounts (DbusmenuMenuitem *mi,
-                          guint timestamp,
-                          gpointer user_data)
-{
-  GError * error = NULL;
-  if (!g_spawn_command_line_async("gnome-control-center online-accounts", &error))
-  {
-    g_warning("Unable to show control centre: %s", error->message);
-    g_error_free(error);
-  }
-}
-
 static void
 activate_user_accounts (DbusmenuMenuitem *mi,
                           guint timestamp,

=== modified file 'src/user-menu-mgr.h'
--- src/user-menu-mgr.h	2011-08-18 11:45:50 +0000
+++ src/user-menu-mgr.h	2012-02-08 16:05:23 +0000
@@ -23,7 +23,7 @@
 
 
 #include <glib-object.h>
-#include <libdbusmenu-gtk3/menuitem.h>
+#include <libdbusmenu-gtk/menuitem.h>
 
 #include "session-dbus.h"
 

=== modified file 'src/user-widget.c'
--- src/user-widget.c	2011-08-24 11:45:58 +0000
+++ src/user-widget.c	2012-02-08 16:05:23 +0000
@@ -136,7 +136,11 @@
   gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0);
   
   priv->user_name = gtk_label_new ("");
+#if HAVE_GTK3
+  priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+#else
   priv->container = gtk_hbox_new (FALSE, 0);
+#endif
 	priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in",
                                                    GTK_ICON_SIZE_MENU);
  	gtk_misc_set_alignment(GTK_MISC(priv->tick_icon), 1.0, 0.5);

=== modified file 'src/user-widget.h'
--- src/user-widget.h	2011-07-12 15:03:02 +0000
+++ src/user-widget.h	2012-02-08 16:05:23 +0000
@@ -20,11 +20,7 @@
 #define __USER_WIDGET_H__
 
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3, 0, 0)
-#include <libdbusmenu-gtk3/menuitem.h>
-#else
 #include <libdbusmenu-gtk/menuitem.h>
-#endif
 
 G_BEGIN_DECLS