23 files changed, 348 insertions, 67 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
diff --git a/configure.ac b/configure.ac
index 33923e8..ad743f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.1.3)
+AM_INIT_AUTOMAKE(indicator-session, 0.1.4)
 
 AM_MAINTAINER_MODE
 
@@ -28,6 +28,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 GTK_REQUIRED_VERSION=2.12
 INDICATOR_REQUIRED_VERSION=0.2.0
 DBUSMENUGTK_REQUIRED_VERSION=0.1.1
+POLKIT_REQUIRED_VERSION=0.92
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
@@ -55,7 +56,8 @@ AC_SUBST(SESSIONERVICE_CFLAGS)
 AC_SUBST(SESSIONERVICE_LIBS)
 
 PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                   polkit-gnome)
+                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+
 
 AC_SUBST(GTKLOGOUTHELPER_CFLAGS)
 AC_SUBST(GTKLOGOUTHELPER_LIBS)
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index 7b286f6..fa874bf 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\
diff --git a/data/icons/16x16/status/user-online.png b/data/icons/16x16/status/user-available.png
index 5435e02..5435e02 100644
--- a/data/icons/16x16/status/user-online.png
+++ b/data/icons/16x16/status/user-available.png
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index c0a7f76..0171b82 100644
--- a/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\
diff --git a/data/icons/22x22/status/user-online.png b/data/icons/22x22/status/user-available.png
index ec8c452..ec8c452 100644
--- a/data/icons/22x22/status/user-online.png
+++ b/data/icons/22x22/status/user-available.png
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
index e26596c..f92e8f1 100644
--- a/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\
diff --git a/data/icons/24x24/status/user-online.png b/data/icons/24x24/status/user-available.png
index 95f2534..95f2534 100644
--- a/data/icons/24x24/status/user-online.png
+++ b/data/icons/24x24/status/user-available.png
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
index e7967f4..92f55f4 100644
--- a/data/icons/32x32/status/Makefile.am
+++ b/data/icons/32x32/status/Makefile.am
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\
diff --git a/data/icons/32x32/status/user-online.png b/data/icons/32x32/status/user-available.png
index 5d04e0a..5d04e0a 100644
--- a/data/icons/32x32/status/user-online.png
+++ b/data/icons/32x32/status/user-available.png
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
index a2ff495..a0f2d82 100644
--- a/data/icons/48x48/status/Makefile.am
+++ b/data/icons/48x48/status/Makefile.am
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\
diff --git a/data/icons/48x48/status/user-online.png b/data/icons/48x48/status/user-available.png
index 5bcae55..5bcae55 100644
--- a/data/icons/48x48/status/user-online.png
+++ b/data/icons/48x48/status/user-available.png
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index 2c70d33..479ef2c 100644
--- a/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
 
 icons_DATA =  \
-	user-online.svg			\
+	user-available.svg			\
 	user-offline.svg		\
 	user-away.svg			\
 	user-busy.svg			\
diff --git a/data/icons/scalable/status/user-online.svg b/data/icons/scalable/status/user-available.svg
index 8d4cc58..8d4cc58 100644
--- a/data/icons/scalable/status/user-online.svg
+++ b/data/icons/scalable/status/user-available.svg
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..633d101
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,183 @@
+indicator-session (0.1.4-0ubuntu3~ppa2~mc3) UNRELEASED; urgency=low
+
+  * Comments.  But getting everything up to date.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Sep 2009 21:46:38 -0500
+
+indicator-session (0.1.4-0ubuntu3~ppa2~mc2) karmic; urgency=low
+
+  * Merging in and making clean with trunk
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Sep 2009 21:42:56 -0500
+
+indicator-session (0.1.4-0ubuntu1~ppa2~mc1) karmic; urgency=low
+
+  * Merging in the MC5 branch
+  * debian/control: Adding in a libempathy-dev build dependency
+    as it's now required by upstream.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Sep 2009 20:07:57 -0500
+
+indicator-session (0.1.4-0ubuntu3~ppa1) karmic; urgency=low
+
+  * Merging in trunk (PK Changes)
+  * Removing patches 01_polkit-1.patch and 99_autoreconf.patch
+    as they were merged upstream.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 22 Sep 2009 21:35:10 -0500
+
+indicator-session (0.1.4-0ubuntu2) karmic; urgency=low
+
+  * Add 01_polkit-1.patch: Port to polkit-1. (LP: #412601)
+  * Add 99_autoreconf.patch: Autoconf changes for above patch.
+  * debian/control: libpolkit-gnome-dev → libpolkit-gobject-1-dev
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 22 Sep 2009 09:17:43 +0200
+
+indicator-session (0.1.4-0ubuntu1) karmic; urgency=low
+
+  * Upstream release (LP: #432120)
+  * Fixes to issues brought up by the design team.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Sep 2009 11:08:07 -0500
+
+indicator-session (0.1.3-0ubuntu1) karmic; urgency=low
+
+  * Upstream release 0.1.3
+    * GConf Key change listening
+    * Pidgin and Empathy (2.26) startup detection
+    * Label fixes
+    * Icon fixes for logout windows (LP: #426355)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Sep 2009 20:38:44 -0500
+
+indicator-session (0.1.2-0ubuntu1) karmic; urgency=low
+
+  * debian/control:
+    - build-depends on libgconf2-dev
+
+  [ Ted Gould ]
+  * Upstream version 0.1.2
+    * Adds translation setup.  (fixes LP: #425598)
+    * Packaging fix to use upstream tarball.  (fixes LP: #418769)
+    * Shows elipsis when dialogs are enabled (fixes LP: #421693)
+    * Adds GConf key for configure whether dialogs on shutdown and
+      logout are shown.  (fixes LP: #422025)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 08 Sep 2009 18:15:03 +0200
+
+indicator-session (0.1.2-0ubuntu1~ppa1) karmic; urgency=low
+
+  * Upstream version 0.1.2 fixes LP: #425598, LP: #418769, LP: #421693
+    and LP: #422025.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 08 Sep 2009 10:51:59 -0500
+
+indicator-session (0.1.1-0ubuntu2~ppa2) karmic; urgency=low
+
+  * Merging in c_korn's branch.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 08 Sep 2009 10:18:56 -0500
+
+indicator-session (0.1.1-0ubuntu2~ppa1) karmic; urgency=low
+
+  * Removing printing DBus error message as it sometimes isn't
+    valid.  (LP: #420238)
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 04 Sep 2009 13:44:45 -0500
+
+indicator-session (0.1.1-0ubuntu1) karmic; urgency=low
+
+  * set bzr-builddeb merge mode to true for easy tarball build
+
+  [ Ted Gould ]
+  * Upstream update 0.1.1 for dbusmenu 0.1.2 (LP: #423975)
+  * debian/control: Increasing dbusmenu dep to 0.1.2
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 04 Sep 2009 11:46:25 +0200
+
+indicator-session (0.1-0ubuntu1) karmic; urgency=low
+
+  [ Ted Gould ]
+  * Upstream version 0.1 (LP: #420108)
+  * debian/control: Looking for libdbusmenu* >= 0.1.0
+  * debian/control: Shortening the short description and lengthening
+    the long one.  Fixes a bug (LP: #412024)
+  * debian/watch:
+    - fixed url
+
+  [ Martin Pitt ]
+  * Re-add dropped debian/compat.
+
+  Re-add fixes which got lost in branch renaming:
+  * debian/control: Fix Vcs-* links.
+  * debian/rules: debian/rules: Update *.a/*.la cleanup for -sus → -session
+    renaming.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 Aug 2009 21:30:27 +0200
+
+indicator-session (0.1~bzr17-0ubuntu1) karmic; urgency=low
+
+  * New snapshot (LP: #417035)
+  * Package rename from 'indicator-sus' to 'indicator-session'
+  * Merging in the branch that adds in the status icons to
+    the panel.
+  * debian/control:
+    - Switching to indicator-session and conflicting
+    - Changed Vcs-Bzr to point to ~ubuntu-desktop
+    - Changed the project homepage
+    and replacing indicator-sus
+  * debian/watch: Switching to indicator-session*
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 21 Aug 2009 12:28:13 -0400
+
+indicator-sus (0.1-0ubuntu2) UNRELEASE; urgency=low
+
+  * Fixed Vcs-Bzr location, part of the  indicator-applet project
+  * specify Vcs-Bzr-Browser
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 11 Aug 2009 17:26:15 +0200
+
+indicator-sus (0.1-0ubuntu1) karmic; urgency=low
+
+  * Include icons in the tarball
+  * Added license files
+  * Corrected the FSF address
+  * debian/control
+    - Set Homepage and Vcs-Bzr
+  * Added debian/watch 
+  * Changed conflicts for gdm to <= 2.27.4-0ubuntu9
+  * Depend on indicator-applet >= 0.2
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 11 Aug 2009 09:53:56 -0400
+
+indicator-sus (0.1~ppa6) karmic; urgency=low
+
+  * debian/control: Conflicting with gdm < 2.27.4-0ubuntu9 or
+    lower to stop people from having problems with the PPA.
+
+ -- Ted Gould <ted@ubuntu.com>  Sat, 08 Aug 2009 00:19:34 +0100
+
+indicator-sus (0.1~ppa5) karmic; urgency=low
+
+  * Legal headers on the source files.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 07 Aug 2009 23:57:19 +0100
+
+indicator-sus (0.1~ppa4) karmic; urgency=low
+
+  * Merging in status shuffle branch.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 07 Aug 2009 21:55:52 +0100
+
+indicator-sus (0.1~ppa3) karmic; urgency=low
+
+  * Fleshing out significantly.  Inital rerelease.
+
+ -- Ted Gould <ted@ubuntu.com>  Sun, 26 Jul 2009 23:50:47 -0500
+
+indicator-sus (0.1~ppa1) intrepid; urgency=low
+
+  * Initial release
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Dec 2008 23:51:41 -0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..57aba13
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,36 @@
+Source: indicator-session
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Build-Depends: debhelper (>= 5.0),
+               cdbs (>= 0.4.41),
+               libgtk2.0-dev (>= 2.12.0),
+               libgconf2-dev,
+               libdbus-glib-1-dev,
+               gnome-doc-utils,
+               scrollkeeper,
+               libindicator-dev,
+               libdbusmenu-glib-dev (>= 0.1.2),
+               libdbusmenu-gtk-dev (>= 0.1.2),
+               libpolkit-gobject-1-dev,
+               intltool,
+               libempathy-dev (>= 2.27.0)
+Standards-Version: 3.8.2
+Homepage: https://launchpad.net/indicator-session
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
+
+Package: indicator-session
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet (>= 0.2), devicekit-power, gdm
+Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
+Replaces: indicator-sus
+Description: An indicator showing session management, status and user switching.
+ .
+ This indicator is designed to be placed on the right side of a panel and
+ give the user easy control for changing their instant message status.  Switching
+ to another user.  Starting a guest session.  Or controlling the status of
+ their own session.
+ .
+ It requires some way to be hosted into a panel.  For the GNOME Panel the
+ appropriate package is indicator-applet-session.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..9a36417
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,53 @@
+This package was debianized by Ted Gould <ted@canonical.com> on
+Thu, 06 Aug 2009 17:23:01 +0100.
+
+It was downloaded from https://launchpad.net/indicator-applet
+
+Upstream Author:
+
+    Ted Gould <ted@canonical.com>
+
+Copyright:
+
+    Copyright (C) 2009 Canonical Ltd
+    Copyright (C) 2004 Gustavo Noronha Silva
+
+License:
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 3 as
+    published by the Free Software Foundation.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Two files (logout-dialog.h logout-dialog.c) are under:
+  
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+  
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+  
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+   Boston, MA 02110-1301 USA
+
+
+The Debian packaging is:
+
+    Copyright (C) 2009 Ted Gould <ted@canonical.com>
+
+On Debian/Ubuntu systems, the full text of the LGPL v2 can be found in
+`/usr/share/common-licenses/LGPL-2', the full text of the GPL v3 can be
+found in `/usr/share/common-licenses/GPL-3'
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..b632517
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+
+DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators
+
+binary-install/indicator-session::
+	# remove .a/.la clutter
+	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
+	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la
+
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0205543
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/indicator-session/+download .*/indicator-session-([0-9.]+)\.tar\.gz
diff --git a/src/gtk-dialog/ck-pk-helper.c b/src/gtk-dialog/ck-pk-helper.c
index 466ccbc..dc7d900 100644
--- a/src/gtk-dialog/ck-pk-helper.c
+++ b/src/gtk-dialog/ck-pk-helper.c
@@ -24,7 +24,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <unistd.h>
 #include <glib.h>
 #include <dbus/dbus-glib.h>
-#include <polkit-gnome/polkit-gnome.h>
+#include <polkit/polkit.h>
 
 #include "logout-dialog.h"
 #include "ck-pk-helper.h"
@@ -170,67 +170,53 @@ pk_require_auth (LogoutDialogAction action) {
 		}
 	}
 
-	PolKitResult polres;
+	PolkitAuthorizationResult *polres = NULL;
+	gboolean ret = FALSE;
 	if (pk_can_do_action(pk_action, &polres)) {
-		if (polres == POLKIT_RESULT_YES) {
-			return FALSE;
+		if (polkit_authorization_result_get_is_challenge (polres)) {
+			ret = TRUE;
 		}
-		return TRUE;
+		g_debug ("pk_require_auth(%s): authorized, is_challenge: %i", pk_action, ret);
+	} else {
+		g_debug ("pk_require_auth(%s): not authorized", pk_action);
+	}
+	if (polres) {
+		g_object_unref (polres);
 	}
-	return FALSE;
+	return ret;
 }
 
 gboolean
-pk_can_do_action (const gchar    *action_id, PolKitResult * pol_result)
+pk_can_do_action (const gchar    *action_id, PolkitAuthorizationResult ** pol_result)
 {
-        PolKitGnomeContext *gnome_context;
-        PolKitAction *action;
-        PolKitCaller *caller;
-        DBusError dbus_error;
-        PolKitError *error;
-        PolKitResult result;
-
-        gnome_context = polkit_gnome_context_get (NULL);
-
-        if (gnome_context == NULL) {
-                return FALSE;
-        }
-
-        if (gnome_context->pk_tracker == NULL) {
-                return FALSE;
-        }
-
-        dbus_error_init (&dbus_error);
-        caller = polkit_tracker_get_caller_from_pid (gnome_context->pk_tracker,
-                                                     getpid (),
-                                                     &dbus_error);
-        dbus_error_free (&dbus_error);
-
-        if (caller == NULL) {
-                return FALSE;
-        }
-
-        action = polkit_action_new ();
-        if (!polkit_action_set_action_id (action, action_id)) {
-                polkit_action_unref (action);
-                polkit_caller_unref (caller);
-                return FALSE;
-        }
-
-        result = POLKIT_RESULT_UNKNOWN;
-        error = NULL;
-        result = polkit_context_is_caller_authorized (gnome_context->pk_context,
-                                                      action, caller, FALSE,
-                                                      &error);
-        if (polkit_error_is_set (error)) {
-                polkit_error_free (error);
-        }
-        polkit_action_unref (action);
-                polkit_caller_unref (caller);
-
-		if (pol_result != NULL) {
-			*pol_result = result;
-		}
+	PolkitAuthority *authority;
+	PolkitSubject *subject;
+	PolkitAuthorizationResult *result;
+	gboolean ret;
+
+	authority = polkit_authority_get();
+	if (!authority) {
+		g_warning ("Could not get PolicyKit authority instance");
+		return FALSE;
+	}
+	subject = polkit_unix_process_new (getpid());
 
-        return result != POLKIT_RESULT_NO && result != POLKIT_RESULT_UNKNOWN;
+	result = polkit_authority_check_authorization_sync (authority, subject, action_id, NULL, 0, NULL, NULL);
+	g_object_unref (authority);
+
+	ret = FALSE;
+	if (result) {
+		ret = polkit_authorization_result_get_is_authorized (result) || 
+		      polkit_authorization_result_get_is_challenge (result);
+		g_debug ("pk_can_do_action(%s): %i", action_id, ret);
+	} else {
+		g_warning ("pk_can_do_action(%s): check_authorization returned NULL", action_id);
+	}
+	if (pol_result) {
+		*pol_result = result;
+	} else {
+		g_object_unref (result);
+	}
+	return ret;
+	
 }
diff --git a/src/gtk-dialog/ck-pk-helper.h b/src/gtk-dialog/ck-pk-helper.h
index 98bce56..501a8c8 100644
--- a/src/gtk-dialog/ck-pk-helper.h
+++ b/src/gtk-dialog/ck-pk-helper.h
@@ -24,9 +24,9 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef __CK_PK_HELPER_H__
 #define __CK_PK_HELPER_H__ 1
 
-#include <polkit-gnome/polkit-gnome.h>
+#include <polkit/polkit.h>
 
 gboolean pk_require_auth (LogoutDialogAction action);
-gboolean pk_can_do_action (const gchar *action_id, PolKitResult * pol_result);
+gboolean pk_can_do_action (const gchar *action_id, PolkitAuthorizationResult ** pol_result);
 
 #endif /* __CK_PK_HELPER__ */
diff --git a/src/status-service.c b/src/status-service.c
index 37ae7c4..d8b3631 100644
--- a/src/status-service.c
+++ b/src/status-service.c
@@ -63,7 +63,7 @@ static const gchar * status_strings [STATUS_PROVIDER_STATUS_LAST] = {
 };
 
 static const gchar * status_icons[STATUS_PROVIDER_STATUS_LAST] = {
-  /* STATUS_PROVIDER_STATUS_ONLINE, */     "user-online",
+  /* STATUS_PROVIDER_STATUS_ONLINE, */     "user-available",
   /* STATUS_PROVIDER_STATUS_AWAY, */       "user-away",
   /* STATUS_PROVIDER_STATUS_DND, */        "user-busy",
   /* STATUS_PROVIDER_STATUS_INVISIBLE, */  "user-invisible",