Merge lp:~seb128/unity-control-center/users-backport-commits into lp:unity-control-center

[Sebastien Bacher]

update to the GNOME 3.8 codebase, remove quite some custom code to use
libaccountsservice. The update also includes a view of the login history
informations and bugfixes.

update to the GNOME 3.8 codebase, remove quite some custom code to use
libaccountsservice. The update also includes a view of the login history
informations and bugfixes.

[Sebastien Bacher (seb128)]

The changes are a bit much to review, but that's basically the list of commits on https://git.gnome.org/browse/gnome-control-center/log/panels/user-accounts?h=gnome-3-8 (first 2 screens).

That features quite some fixes and dropping code in favor of using accountsservice
diffstat: 37 files changed, 1757 insertions(+), 2467 deletions(-)

I've tested the update, builds/works fine here

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12725
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/40/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Is login history meant to work? It's just blank for my user.

Also, I get some Gtk warnings:

(unity-control-center:15501): Gtk-WARNING **: Unknown property: CcEditableEntry.width-chars

(unity-control-center:15501): Gtk-WARNING **: Unknown property: CcEditableEntry.max-width-chars

(unity-control-center:15501): Gtk-WARNING **: Unknown property: CcEditableEntry.ellipsize

I think you need de1fc65ab3f843d6525e07c5a32661a2dd5feb5e for those?

review: Needs Fixing

[Sebastien Bacher (seb128)]

> Is login history meant to work? It's just blank for my user.

it's supposed to be working yet, it has entries here for my user and test users (though the log seems incomplete)

Do you have an history if you go check the LoginHistory priority for your user in d-feet?

> I think you need de1fc65ab3f843d6525e07c5a32661a2dd5feb5e for those?

Thanks, I'm having a look to that

[lp:~seb128/unity-control-center/users-backport-commits]

12726. By Sebastien Bacher on 2014-02-21

updated translations template

12727. By Sebastien Bacher on 2014-02-21

backport commit needed to fix warnings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12727
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/42/rebuild

review: Approve (continuous-integration)

[lp:~seb128/unity-control-center/users-backport-commits]

12728. By Sebastien Bacher on 2014-02-24

Include "pty" sessions in the login history, that's the type lightdm uses

[Sebastien Bacher (seb128)]

> Is login history meant to work? It's just blank for my user.

Seems like wtmp is not really well described, our session types use "pty", I've added that to the sessions to list, which seems to work

The merge request should be good to go now

[lp:~seb128/unity-control-center/users-backport-commits]

12729. By Sebastien Bacher on 2014-02-24

the type is "pts" not "pty", should be correct this time

[Iain Lane (laney)]

Looks good now, thanks for that!

(be nice to forward the change upstream, even if they then decide to reject it)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12728
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/44/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

> (be nice to forward the change upstream, even if they then decide to reject it)

https://bugzilla.gnome.org/show_bug.cgi?id=725053

=== modified file 'configure.ac'
--- configure.ac	2014-02-21 18:46:14 +0000
+++ configure.ac	2014-02-24 09:46:44 +0000
@@ -70,17 +70,6 @@
 
 AC_CHECK_LIB(m, floor)
 
-AC_ARG_ENABLE([systemd],
-              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-              [with_systemd=$enableval],
-              [with_systemd=no])
-if test "$with_systemd" = "yes" ; then
-  SYSTEMD=libsystemd-login
-  AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
-else
-  SYSTEMD=
-fi
-
 # IBus support
 IBUS_REQUIRED_VERSION=1.4.99
 
@@ -115,6 +104,7 @@
 LIBWACOM_REQUIRED_VERSION=0.7
 CLUTTER_REQUIRED_VERSION=1.11.3
 GOA_REQUIRED_VERSION=3.5.90
+ACCOUNTSSERVICE_REQUIRED_VERSION=0.6.30
 
 COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
  glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -163,7 +153,7 @@
                   gnome-desktop-3.0
                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
                   pwquality
-                  $SYSTEMD)
+                  accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION)
 
 AM_PROG_VALAC([0.20.0])
 
@@ -480,7 +470,6 @@
 panels/user-accounts/Makefile
 panels/user-accounts/data/Makefile
 panels/user-accounts/data/unity-user-accounts-panel.desktop.in
-panels/user-accounts/data/icons/Makefile
 panels/wacom/Makefile
 panels/wacom/calibrator/Makefile
 panels/wacom/unity-wacom-panel.desktop.in
@@ -516,11 +505,6 @@
 else
 	AC_MSG_NOTICE([   Appearance panel Flickr support disabled])
 fi
-if test "x$with_systemd" = "xyes"; then
-	AC_MSG_NOTICE([** systemd (Systemd session tracking)])
-else
-	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
-fi
 if test "x$have_wacom" = "xyes"; then
 	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
 else
 
=== modified file 'debian/control'
--- debian/control	2014-02-21 18:46:14 +0000
+++ debian/control	2014-02-24 09:46:44 +0000
@@ -15,6 +15,7 @@
                gsettings-desktop-schemas-dev (>= 3.7.2.2),
                hardening-wrapper,
                intltool (>= 0.37.1),
+               libaccountsservice-dev (>= 0.6.30),
                libcanberra-gtk3-dev,
                libcheese-gtk-dev (>= 2.91.91.1),
                libcolord-dev,
@@ -40,7 +41,6 @@
                libpulse-dev (>= 1:2.0),
                libpwquality-dev,
                libupower-glib-dev (>= 0.9.1),
-               libsystemd-login-dev,
                libtimezonemap1-dev,
                libwacom-dev (>= 0.7),
                libx11-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2014-02-21 18:17:40 +0000
+++ debian/rules	2014-02-24 09:46:44 +0000
@@ -11,8 +11,7 @@
 
 DEB_CONFIGURE_SCRIPT := ./autogen.sh
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-                             --disable-update-mimedb \
-                             --enable-systemd
+                             --disable-update-mimedb
 
 DEB_DH_MAKESHLIBS_ARGS_unity-control-center = --no-act
 
 
=== modified file 'panels/user-accounts/Makefile.am'
--- panels/user-accounts/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/user-accounts/Makefile.am	2014-02-24 09:46:44 +0000
@@ -8,9 +8,6 @@
 ccpanels_LTLIBRARIES = libuser-accounts.la
 
 AM_CPPFLAGS =						\
-	-DDATADIR=\""$(datadir)"\"			\
-	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\"	\
-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
 	-DHAVE_LIBPWQUALITY				\
@@ -24,16 +21,14 @@
 endif
 
 BUILT_SOURCES = \
-       um-realm-generated.c \
-       um-realm-generated.h
+	um-realm-generated.c \
+	um-realm-generated.h \
+	um-resources.c \
+	um-resources.h
 
 libuser_accounts_la_SOURCES =		\
 	um-account-type.h		\
 	um-account-type.c 		\
-	um-user.h 			\
-	um-user.c 			\
-	um-user-manager.h 		\
-	um-user-manager.c 		\
 	um-account-dialog.h		\
 	um-account-dialog.c		\
 	um-password-dialog.h		\
@@ -60,6 +55,8 @@
 	um-user-module.c		\
 	um-realm-manager.c		\
 	um-realm-manager.h		\
+	um-history-dialog.h		\
+	um-history-dialog.c		\
 	$(BUILT_SOURCES)
 
 libuser_accounts_la_LIBADD = 		\
@@ -83,6 +80,12 @@
 		--c-generate-object-manager $<
 um-realm-generated.h: um-realm-generated.c
 
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/user-accounts.gresource.xml)
+um-resources.c: user-accounts.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name um $<
+um-resources.h: user-accounts.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name um $<
+
 noinst_PROGRAMS = frob-account-dialog
 
 frob_account_dialog_SOURCES = \
@@ -91,10 +94,6 @@
 	um-account-dialog.c \
 	um-realm-manager.c \
 	um-realm-manager.h \
-	um-user.h \
-	um-user.c \
-	um-user-manager.c \
-	um-user-manager.h \
 	um-utils.h \
 	um-utils.c \
 	$(BUILT_SOURCES)
@@ -103,8 +102,7 @@
 	$(libuser_accounts_la_LIBADD)
 
 frob_account_dialog_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\"
+	$(AM_CFLAGS)
 
 polkitdir = $(datadir)/polkit-1/actions
 polkit_in_files = com.canonical.controlcenter.user-accounts.policy.in
@@ -114,6 +112,8 @@
 
 EXTRA_DIST =				\
 	$(polkit_in_files)		\
+	$(resource_files)		\
+	user-accounts.gresource.xml	\
 	$(NULL)
 
 CLEANFILES =				\
 
=== modified file 'panels/user-accounts/data/Makefile.am'
--- panels/user-accounts/data/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/user-accounts/data/Makefile.am	2014-02-24 09:46:44 +0000
@@ -1,13 +1,3 @@
-SUBDIRS = icons
-
-uidir = $(pkgdatadir)/ui/user-accounts
-ui_DATA = \
-	account-dialog.ui	\
-	password-dialog.ui	\
-	photo-dialog.ui		\
-	user-accounts-dialog.ui \
-	account-fingerprint.ui
-
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
@@ -16,8 +6,7 @@
 
 EXTRA_DIST = 					\
 	unity-user-accounts-panel.desktop.in.in	\
-	org.freedesktop.realmd.xml		\
-	$(ui_DATA)
+	org.freedesktop.realmd.xml
 
 CLEANFILES =					\
 	unity-user-accounts-panel.desktop	\
 
=== modified file 'panels/user-accounts/data/account-dialog.ui'
--- panels/user-accounts/data/account-dialog.ui	2012-09-16 20:15:22 +0000
+++ panels/user-accounts/data/account-dialog.ui	2014-02-24 09:46:44 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 3.8 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="username-model">
     <columns>
@@ -285,6 +285,7 @@
                         <child internal-child="entry">
                           <object class="GtkEntry" id="combobox-entry">
                             <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                           </object>
                         </child>
                       </object>
@@ -322,6 +323,7 @@
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">●</property>
+                    <property name="activates_default">True</property>
                     <property name="invisible_char_set">True</property>
                   </object>
                   <packing>
 
=== modified file 'panels/user-accounts/data/account-fingerprint.ui'
--- panels/user-accounts/data/account-fingerprint.ui	2011-08-25 16:31:16 +0000
+++ panels/user-accounts/data/account-fingerprint.ui	2014-02-24 09:46:44 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.8 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="model1">
     <columns>
 
=== added file 'panels/user-accounts/data/history-dialog.ui'
--- panels/user-accounts/data/history-dialog.ui	1970-01-01 00:00:00 +0000
+++ panels/user-accounts/data/history-dialog.ui	2014-02-24 09:46:44 +0000
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.8 -->
+  <object class="GtkDialog" id="dialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Login History</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="icon_name">system-users</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="close-button">
+                <property name="label" translatable="yes">Close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox" id="box3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">6</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkButton" id="previous-button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="previous-button-atkobject">
+                        <property name="accessible-name" translatable="yes">Previous Week</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkArrow" id="arrow1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="arrow_type">left</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="week-label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="next-button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="next-button-atkobject">
+                        <property name="accessible-name" translatable="yes">Next Week</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkArrow" id="arrow2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="arrow2-atkobject">
+                            <property name="accessible-name" translatable="yes">Next week</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="width_request">350</property>
+                <property name="height_request">300</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="border_width">6</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkViewport" id="viewport1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkGrid" id="history-grid">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="border_width">12</property>
+                        <property name="row_spacing">12</property>
+                        <property name="column_spacing">12</property>
+                        <property name="column_homogeneous">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">close-button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
 
=== removed file 'panels/user-accounts/data/icons/Makefile.am'
--- panels/user-accounts/data/icons/Makefile.am	2012-03-08 15:09:09 +0000
+++ panels/user-accounts/data/icons/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-pixmapsdir = $(pkgdatadir)/pixmaps
-pixmaps_DATA =			\
-	gnome-about-me-lock.png	\
-	gnome-about-me-lock-open.png	\
-	left-index-finger.svg	\
-	left-little-finger.svg	\
-	left-middle-finger.svg	\
-	left-ring-finger.svg	\
-	left-thumb.svg		\
-	print_error.svg		\
-	print_ok.svg		\
-	right-index-finger.svg	\
-	right-little-finger.svg	\
-	right-middle-finger.svg	\
-	right-ring-finger.svg	\
-	right-thumb.svg		\
-	left-index-finger.png	\
-	left-middle-finger.png	\
-	left-little-finger.png	\
-	left-ring-finger.png	\
-	left-thumb.png		\
-	print_error.png		\
-	print_ok.png		\
-	right-index-finger.png	\
-	right-middle-finger.png	\
-	right-little-finger.png	\
-	right-ring-finger.png	\
-	right-thumb.png
-
-EXTRA_DIST = $(pixmaps_DATA)
-
--include $(top_srcdir)/git.mk
 
=== removed file 'panels/user-accounts/data/icons/gnome-about-me-lock-open.png'
 Binary files panels/user-accounts/data/icons/gnome-about-me-lock-open.png	2010-10-30 22:04:15 +0000 and panels/user-accounts/data/icons/gnome-about-me-lock-open.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'panels/user-accounts/data/icons/gnome-about-me-lock.png'
 Binary files panels/user-accounts/data/icons/gnome-about-me-lock.png	2010-10-30 22:04:15 +0000 and panels/user-accounts/data/icons/gnome-about-me-lock.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'panels/user-accounts/data/password-dialog.ui'
--- panels/user-accounts/data/password-dialog.ui	2012-07-16 10:29:25 +0000
+++ panels/user-accounts/data/password-dialog.ui	2014-02-24 09:46:44 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 3.8 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="action-model">
     <columns>
@@ -133,6 +133,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="visibility">False</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -208,6 +209,7 @@
                             <property name="visibility">False</property>
                             <property name="secondary-icon-name">system-run-symbolic</property>
                             <property name="secondary-icon-tooltip-text" translatable="yes">Generate a password</property>
+                            <property name="activates_default">True</property>
                           </object>
                           <packing>
                             <property name="position">0</property>
@@ -249,7 +251,7 @@
                           <object class="GtkLabel" id="strength-indicator-label">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Fair</property>
+                            <property name="label"></property>
                           </object>
                           <packing>
                             <property name="position">1</property>
@@ -289,6 +291,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="visibility">False</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -394,6 +397,8 @@
                       <object class="GtkLabel" id="user-name">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
+                        <property name="ellipsize">end</property>
+                        <property name="max_width_chars">30</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                           <attribute name="scale" value="1.200000"/>
 
=== modified file 'panels/user-accounts/data/photo-dialog.ui'
--- panels/user-accounts/data/photo-dialog.ui	2010-10-30 22:04:15 +0000
+++ panels/user-accounts/data/photo-dialog.ui	2014-02-24 09:46:44 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <interface>
+  <!-- interface-requires gtk+ 3.8 -->
   <object class="GtkAdjustment" id="browse-scale-adjustment">
     <property name="lower">0</property>
     <property name="upper">100</property>
 
=== modified file 'panels/user-accounts/data/user-accounts-dialog.ui'
--- panels/user-accounts/data/user-accounts-dialog.ui	2014-02-14 03:32:04 +0000
+++ panels/user-accounts/data/user-accounts-dialog.ui	2014-02-24 09:46:44 +0000
@@ -1,6 +1,5 @@
-
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.8 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="shortname-model">
     <columns>
@@ -50,7 +49,7 @@
             <child>
               <object class="GtkHBox" id="hbox2">
                 <property name="visible">True</property>
-                <property name="spacing">12</property>
+                <property name="spacing">18</property>
                 <child>
                   <object class="GtkVBox" id="userlist-vbox">
                     <property name="visible">True</property>
@@ -131,16 +130,16 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
-                      <object class="GtkTable" id="table1">
+                      <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
-                        <property name="n_rows">7</property>
-                        <property name="n_columns">2</property>
+                        <property name="can_focus">False</property>
                         <property name="column_spacing">10</property>
                         <child>
                           <object class="GtkNotebook" id="account-fingerprint-notebook">
                             <property name="visible">True</property>
                             <property name="show_tabs">False</property>
                             <property name="show_border">False</property>
+                            <property name="hexpand">True</property>
                             <child>
                               <object class="GtkLabel" id="account-fingerprint-value-label">
                                 <property name="visible">True</property>
@@ -167,10 +166,9 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">6</property>
-                            <property name="bottom_attach">7</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -178,13 +176,13 @@
                             <property name="visible">True</property>
                             <property name="model">account-type-model</property>
                             <property name="text-column">0</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -199,10 +197,10 @@
                             </style>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -214,9 +212,11 @@
                                 <property name="visible">True</property>
                                 <property name="scale">1.2</property>
                                 <property name="weight">700</property>
+                                <property name="width-chars">30</property>
+                                <property name="max-width-chars">30</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
                                 <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
@@ -224,8 +224,9 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -239,10 +240,10 @@
                             </attributes>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -257,22 +258,22 @@
                             </style>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="UmEditableButton" id="account-password-button">
                             <property name="visible">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -287,10 +288,10 @@
                             </style>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -312,10 +313,9 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -330,10 +330,10 @@
                             </style>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">6</property>
-                            <property name="bottom_attach">7</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -342,6 +342,7 @@
                             <child>
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
+                                <property name="hexpand">True</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -399,8 +400,10 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -415,10 +418,10 @@
                             </style>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -426,42 +429,76 @@
                             <property name="visible">True</property>
                             <property name="model">language-model</property>
                             <property name="text-column">1</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="show-login-name-spacer">
+                          <object class="GtkLabel" id="last-login-label">
                             <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">7</property>
-                            <property name="bottom_attach">8</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="show-login-name-checkbutton">
-                            <property name="label" translatable="yes">_Show my login name in the menu bar</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Last Login</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">last-login-value-label</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">7</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkGrid" id="last-login-grid">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkLabel" id="last-login-value-label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_left">6</property>
+                                <property name="margin_right">6</property>
+                                <property name="margin_top">6</property>
+                                <property name="margin_bottom">6</property>
+                                <property name="hexpand">True</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="last-login-history-button">
+                                <property name="label" translatable="yes">History</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">8</property>
-                            <property name="bottom_attach">9</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">0</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">7</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -471,6 +508,33 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="show-login-name-spacer">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="show-login-name-checkbutton">
+                        <property name="label" translatable="yes">_Show my login name in the menu bar</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
 
=== modified file 'panels/user-accounts/frob-account-dialog.c'
--- panels/user-accounts/frob-account-dialog.c	2012-06-12 10:03:29 +0000
+++ panels/user-accounts/frob-account-dialog.c	2014-02-24 09:46:44 +0000
@@ -27,13 +27,13 @@
                     gpointer user_data)
 {
 	GMainLoop *loop = user_data;
-	UmUser *user;
+	ActUser *user;
 
 	user = um_account_dialog_finish (UM_ACCOUNT_DIALOG (object), result);
 	if (user == NULL) {
 		g_printerr ("No user created\n");
 	} else {
-		g_printerr ("User created: %s\n", um_user_get_user_name (user));
+		g_printerr ("User created: %s\n", act_user_get_user_name (user));
 		g_object_unref (user);
 	}
 
@@ -52,7 +52,7 @@
 	dialog = um_account_dialog_new ();
 	loop = g_main_loop_new (NULL, FALSE);
 
-	um_account_dialog_show (dialog, NULL, on_dialog_complete, loop);
+	um_account_dialog_show (dialog, NULL, NULL, on_dialog_complete, loop);
 
 	g_main_loop_run (loop);
 	g_main_loop_unref (loop);
 
=== modified file 'panels/user-accounts/um-account-dialog.c'
--- panels/user-accounts/um-account-dialog.c	2012-12-12 11:57:06 +0000
+++ panels/user-accounts/um-account-dialog.c	2014-02-24 09:46:44 +0000
@@ -24,10 +24,10 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <act/act.h>
 
 #include "um-account-dialog.h"
 #include "um-realm-manager.h"
-#include "um-user-manager.h"
 #include "um-utils.h"
 
 typedef enum {
@@ -49,6 +49,9 @@
                                     GAsyncResult *result,
                                     gpointer user_data);
 
+static void   um_account_dialog_response  (GtkDialog *dialog,
+                                           gint response_id);
+
 #define UM_ACCOUNT_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \
                                                                     UmAccountDialogClass))
 #define UM_IS_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UM_TYPE_ACCOUNT_DIALOG))
@@ -60,6 +63,7 @@
         GtkWidget *container_widget;
         GSimpleAsyncResult *async;
         GCancellable *cancellable;
+        GPermission *permission;
         GtkSpinner *spinner;
 
         /* Buttons to switch modes between local/enterprise */
@@ -149,7 +153,7 @@
 
 static void
 complete_dialog (UmAccountDialog *self,
-                 UmUser *user)
+                 ActUser         *user)
 {
         if (user != NULL) {
                 g_simple_async_result_set_op_res_gpointer (self->async,
@@ -162,34 +166,48 @@
 }
 
 static void
-create_user_done (UmUserManager   *manager,
+user_loaded_cb (ActUser         *user,
+                GParamSpec      *pspec,
+                UmAccountDialog *self)
+{
+  finish_action (self);
+  complete_dialog (self, user);
+}
+
+static void
+create_user_done (ActUserManager  *manager,
                   GAsyncResult    *res,
                   UmAccountDialog *self)
 {
-        UmUser *user;
+        ActUser *user;
         GError *error;
 
-        finish_action (self);
-
         /* Note that user is returned without an extra reference */
 
         error = NULL;
-        if (!um_user_manager_create_user_finish (manager, res, &user, &error)) {
+        user = act_user_manager_create_user_finish (manager, res, &error);
+
+        if (user == NULL) {
+                finish_action (self);
                 g_debug ("Failed to create user: %s", error->message);
-                if (!g_error_matches (error, UM_USER_MANAGER_ERROR, UM_USER_MANAGER_ERROR_PERMISSION_DENIED))
+                if (!g_error_matches (error, ACT_USER_MANAGER_ERROR, ACT_USER_MANAGER_ERROR_PERMISSION_DENIED))
                        show_error_dialog (self, _("Failed to add account"), error);
                 g_error_free (error);
                 gtk_widget_grab_focus (self->local_name);
         } else {
-                g_debug ("Created user: %s", um_user_get_user_name (user));
-                complete_dialog (self, user);
+                g_debug ("Created user: %s", act_user_get_user_name (user));
+                /* Check if the returned object is fully loaded before returning it */
+                if (act_user_is_loaded (user))
+                        user_loaded_cb (user, NULL, self);
+                else
+                        g_signal_connect (user, "notify::is-loaded", G_CALLBACK (user_loaded_cb), self);
         }
 }
 
 static void
 local_create_user (UmAccountDialog *self)
 {
-        UmUserManager *manager;
+        ActUserManager *manager;
         const gchar *username;
         const gchar *name;
         gint account_type;
@@ -206,16 +224,14 @@
 
         g_debug ("Creating local user: %s", username);
 
-        manager = um_user_manager_ref_default ();
-        um_user_manager_create_user (manager,
-                                     username,
-                                     name,
-                                     account_type,
-                                     self->cancellable,
-                                     (GAsyncReadyCallback)create_user_done,
-                                     self,
-                                     NULL);
-        g_object_unref (manager);
+        manager = act_user_manager_get_default ();
+        act_user_manager_create_user_async (manager,
+                                            username,
+                                            name,
+                                            account_type,
+                                            self->cancellable,
+                                            (GAsyncReadyCallback)create_user_done,
+                                            self);
 }
 
 static gboolean
@@ -258,13 +274,19 @@
         UmAccountDialog *self = UM_ACCOUNT_DIALOG (user_data);
         GtkTreeModel *model;
         const char *name;
+        GtkWidget *entry;
 
         model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->local_username));
         gtk_list_store_clear (GTK_LIST_STORE (model));
 
         name = gtk_entry_get_text (GTK_ENTRY (editable));
-        generate_username_choices (name, GTK_LIST_STORE (model));
-        gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_username), 0);
+        if (strlen (name) == 0) {
+                entry = gtk_bin_get_child (GTK_BIN (self->local_username));
+                gtk_entry_set_text (GTK_ENTRY (entry), "");
+        } else {
+                generate_username_choices (name, GTK_LIST_STORE (model));
+                gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_username), 0);
+        }
 
         dialog_validate (self);
 }
@@ -352,6 +374,7 @@
                 g_free (name);
                 if (match) {
                         g_debug ("ignoring duplicate realm: %s", realm_name);
+                        g_object_unref (common);
                         return;
                 }
                 ret = gtk_tree_model_iter_next (model, &iter);
@@ -389,14 +412,13 @@
 {
         UmAccountDialog *self = UM_ACCOUNT_DIALOG (user_data);
         GError *error = NULL;
-        UmUser *user = NULL;
+        ActUser *user;
 
-        um_user_manager_cache_user_finish (UM_USER_MANAGER (source),
-                                           result, &user, &error);
+        user = act_user_manager_cache_user_finish (ACT_USER_MANAGER (source), result, &error);
 
         /* This is where we're finally done */
-        if (error == NULL) {
-                g_debug ("Successfully cached remote user: %s", um_user_get_user_name (user));
+        if (user != NULL) {
+                g_debug ("Successfully cached remote user: %s", act_user_get_user_name (user));
                 finish_action (self);
                 complete_dialog (self, user);
 
@@ -406,6 +428,8 @@
                 finish_action (self);
                 g_error_free (error);
         }
+
+        g_object_unref (self);
 }
 
 static void
@@ -415,7 +439,7 @@
 {
         UmAccountDialog *self = UM_ACCOUNT_DIALOG (user_data);
         UmRealmCommon *common;
-        UmUserManager *manager;
+        ActUserManager *manager;
         GError *error = NULL;
         gchar *login;
 
@@ -428,18 +452,16 @@
                  * should also lookup information about this via the realm and make
                  * sure all that is functional.
                  */
-                manager = um_user_manager_ref_default ();
+                manager = act_user_manager_get_default ();
                 login = um_realm_calculate_login (common, gtk_entry_get_text (self->enterprise_login));
                 g_return_if_fail (login != NULL);
 
                 g_debug ("Caching remote user: %s", login);
 
-                um_user_manager_cache_user (manager, login, self->cancellable,
-                                            on_register_user, g_object_ref (self),
-                                            g_object_unref);
+                act_user_manager_cache_user_async (manager, login, self->cancellable,
+                                                   on_register_user, g_object_ref (self));
 
                 g_free (login);
-                g_object_unref (manager);
 
         } else {
                 show_error_dialog (self, _("Failed to register account"), error);
@@ -645,9 +667,19 @@
 {
         UmAccountDialog *self = UM_ACCOUNT_DIALOG (user_data);
         GError *error = NULL;
-        GBytes *creds;
+        GBytes *creds = NULL;
 
         um_realm_login_finish (result, &creds, &error);
+
+        /*
+         * User login is valid, but cannot authenticate right now (eg: user needs
+         * to change password at next login etc.)
+         */
+        if (g_error_matches (error, UM_REALM_ERROR, UM_REALM_ERROR_CANNOT_AUTH)) {
+                g_clear_error (&error);
+                creds = NULL;
+        }
+
         if (error == NULL) {
 
                 /* Already joined to the domain, just register this user */
@@ -656,7 +688,8 @@
                         enterprise_permit_user_login (self);
 
                 /* Join the domain, try using the user's creds */
-                } else if (!um_realm_join_as_user (self->selected_realm,
+                } else if (creds == NULL ||
+                           !um_realm_join_as_user (self->selected_realm,
                                                    gtk_entry_get_text (self->enterprise_login),
                                                    gtk_entry_get_text (self->enterprise_password),
                                                    creds, self->cancellable,
@@ -1024,7 +1057,6 @@
 {
         GtkBuilder *builder;
         GtkWidget *widget;
-        const gchar *filename;
         GError *error = NULL;
         GtkDialog *dialog;
         GtkWidget *content;
@@ -1033,10 +1065,9 @@
 
         builder = gtk_builder_new ();
 
-        filename = UIDIR "/account-dialog.ui";
-        if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-                filename = "data/account-dialog.ui";
-        if (!gtk_builder_add_from_file (builder, filename, &error)) {
+        if (!gtk_builder_add_from_resource (builder,
+                                            "/org/gnome/control-center/user-accounts/account-dialog.ui",
+                                            &error)) {
                 g_error ("%s", error->message);
                 g_error_free (error);
                 return;
@@ -1069,6 +1100,7 @@
 
         gtk_dialog_add_button (dialog, _("Cancel"), GTK_RESPONSE_CANCEL);
         widget = gtk_dialog_add_button (dialog, _("_Add"), GTK_RESPONSE_OK);
+        gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
         gtk_widget_grab_default (widget);
 
         widget = (GtkWidget *) gtk_builder_get_object (builder, "account-dialog");
@@ -1084,6 +1116,28 @@
 }
 
 static void
+on_permission_acquired (GObject *source_object,
+                        GAsyncResult *res,
+                        gpointer user_data)
+{
+	UmAccountDialog *self = UM_ACCOUNT_DIALOG (user_data);
+	GError *error = NULL;
+
+	/* Paired with begin_action in um_account_dialog_response () */
+	finish_action (self);
+
+	if (g_permission_acquire_finish (self->permission, res, &error)) {
+		g_return_if_fail (g_permission_get_allowed (self->permission));
+		um_account_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
+	} else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+		g_warning ("Failed to acquire permission: %s", error->message);
+	}
+
+	g_clear_error (&error);
+	g_object_unref (self);
+}
+
+static void
 um_account_dialog_response (GtkDialog *dialog,
                             gint response_id)
 {
@@ -1091,6 +1145,14 @@
 
         switch (response_id) {
         case GTK_RESPONSE_OK:
+                /* We don't (or no longer) have necessary permissions */
+                if (self->permission && !g_permission_get_allowed (self->permission)) {
+                        begin_action (self);
+                        g_permission_acquire_async (self->permission, self->cancellable,
+                                                    on_permission_acquired, g_object_ref (self));
+                        return;
+                }
+
                 switch (self->mode) {
                 case UM_LOCAL:
                         local_create_user (self);
@@ -1140,6 +1202,7 @@
 
         if (self->cancellable)
                 g_object_unref (self->cancellable);
+        g_clear_object (&self->permission);
         g_object_unref (self->enterprise_realms);
 
         G_OBJECT_CLASS (um_account_dialog_parent_class)->finalize (obj);
@@ -1166,6 +1229,7 @@
 void
 um_account_dialog_show (UmAccountDialog     *self,
                         GtkWindow           *parent,
+                        GPermission         *permission,
                         GAsyncReadyCallback  callback,
                         gpointer             user_data)
 {
@@ -1181,6 +1245,9 @@
                 g_object_unref (self->cancellable);
         self->cancellable = g_cancellable_new ();
 
+        g_clear_object (&self->permission);
+        self->permission = permission ? g_object_ref (permission) : NULL;
+
         local_prepare (self);
         enterprise_prepare (self);
         mode_change (self, UM_LOCAL);
@@ -1192,11 +1259,11 @@
         gtk_widget_grab_focus (self->local_name);
 }
 
-UmUser *
+ActUser *
 um_account_dialog_finish (UmAccountDialog     *self,
                           GAsyncResult        *result)
 {
-        UmUser *user;
+        ActUser *user;
 
         g_return_val_if_fail (UM_IS_ACCOUNT_DIALOG (self), NULL);
         g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self),
 
=== modified file 'panels/user-accounts/um-account-dialog.h'
--- panels/user-accounts/um-account-dialog.h	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-account-dialog.h	2014-02-24 09:46:44 +0000
@@ -22,8 +22,8 @@
 #ifndef __UM_ACCOUNT_DIALOG_H__
 #define __UM_ACCOUNT_DIALOG_H__
 
+#include <act/act.h>
 #include <gtk/gtk.h>
-#include "um-user.h"
 
 G_BEGIN_DECLS
 
@@ -38,9 +38,10 @@
 UmAccountDialog *um_account_dialog_new      (void);
 void             um_account_dialog_show     (UmAccountDialog     *self,
                                              GtkWindow           *parent,
+                                             GPermission         *permission,
                                              GAsyncReadyCallback  callback,
                                              gpointer             user_data);
-UmUser *         um_account_dialog_finish   (UmAccountDialog     *self,
+ActUser *        um_account_dialog_finish   (UmAccountDialog     *self,
                                              GAsyncResult        *result);
 
 G_END_DECLS
 
=== modified file 'panels/user-accounts/um-fingerprint-dialog.c'
--- panels/user-accounts/um-fingerprint-dialog.c	2014-02-18 03:09:04 +0000
+++ panels/user-accounts/um-fingerprint-dialog.c	2014-02-24 09:46:44 +0000
@@ -256,7 +256,7 @@
 delete_fingerprints_question (GtkWindow *parent,
                               GtkWidget *label1,
                               GtkWidget *label2,
-                              UmUser    *user)
+                              ActUser   *user)
 {
         GtkWidget *question;
         GtkWidget *button;
@@ -446,8 +446,8 @@
 
                 data->num_stages_done++;
                 name = g_strdup_printf ("image%d", data->num_stages_done);
-                path = g_build_filename (UM_PIXMAP_DIR, "print_ok.png", NULL);
-                gtk_image_set_from_file (GTK_IMAGE (WID (name)), path);
+                path = g_strdup_printf ("/org/gnome/control-center/user-accounts/print_ok.png");
+                gtk_image_set_from_resource (GTK_IMAGE (WID (name)), path);
                 g_free (name);
                 g_free (path);
         }
@@ -577,16 +577,12 @@
                 }
                 /* And set the right image */
                 {
-                        char *filename;
-
-                        filename = g_strdup_printf ("%s.png", data->finger);
-                        path = g_build_filename (UM_PIXMAP_DIR, filename, NULL);
-                        g_free (filename);
+                        path = g_strdup_printf ("/org/gnome/control-center/user-accounts/%s.png", data->finger);
                 }
                 for (i = 1; i <= data->num_enroll_stages; i++) {
                         char *name;
                         name = g_strdup_printf ("image%d", i);
-                        gtk_image_set_from_file (GTK_IMAGE (WID (name)), path);
+                        gtk_image_set_from_resource (GTK_IMAGE (WID (name)), path);
                         g_free (name);
                 }
                 g_free (path);
@@ -628,13 +624,12 @@
 enroll_fingerprints (GtkWindow *parent,
                      GtkWidget *label1,
                      GtkWidget *label2,
-                     UmUser    *user)
+                     ActUser   *user)
 {
         GDBusProxy *device;
         GtkBuilder *dialog;
         EnrollData *data;
         GtkWidget *ass;
-        const char *filename;
         char *msg;
         GVariant *result;
         GError *error = NULL;
@@ -692,10 +687,9 @@
         }
 
         dialog = gtk_builder_new ();
-        filename = UIDIR "/account-fingerprint.ui";
-        if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-                filename = "data/account-fingerprint.ui";
-        if (!gtk_builder_add_from_file (dialog, filename, &error)) {
+        if (!gtk_builder_add_from_resource (dialog,
+                                            "/org/gnome/control-center/user-accounts/account-fingerprint.ui",
+                                            &error)) {
                 g_error ("%s", error->message);
                 g_error_free (error);
                 return;
@@ -766,7 +760,7 @@
 fingerprint_button_clicked (GtkWindow *parent,
                             GtkWidget *label1,
                             GtkWidget *label2,
-                            UmUser    *user)
+                            ActUser   *user)
 {
         bindtextdomain ("fprintd", GNOMELOCALEDIR);
         bind_textdomain_codeset ("fprintd", "UTF-8");
 
=== modified file 'panels/user-accounts/um-fingerprint-dialog.h'
--- panels/user-accounts/um-fingerprint-dialog.h	2010-10-30 22:04:15 +0000
+++ panels/user-accounts/um-fingerprint-dialog.h	2014-02-24 09:46:44 +0000
@@ -18,11 +18,11 @@
  */
 
 #include <gtk/gtk.h>
-#include "um-user.h"
+#include <act/act.h>
 
 gboolean set_fingerprint_label (GtkWidget *label1,
                                 GtkWidget *label2);
 void fingerprint_button_clicked (GtkWindow *parent,
                                  GtkWidget *label1,
                                  GtkWidget *label2,
-                                 UmUser    *user);
+                                 ActUser   *user);
 
=== added file 'panels/user-accounts/um-history-dialog.c'
--- panels/user-accounts/um-history-dialog.c	1970-01-01 00:00:00 +0000
+++ panels/user-accounts/um-history-dialog.c	2014-02-24 09:46:44 +0000
@@ -0,0 +1,377 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright 2012  Red Hat, Inc,
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by: Ondrej Holy <[e-mail]>
+ */
+
+#include "config.h"
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <act/act.h>
+
+#include "um-history-dialog.h"
+#include "um-utils.h"
+
+struct _UmHistoryDialog {
+        GtkWidget *dialog;
+        GtkBuilder *builder;
+
+        GDateTime *week;
+        GDateTime *current_week;
+
+        ActUser *user;
+};
+
+typedef struct {
+	gint64 login_time;
+	gint64 logout_time;
+	const gchar *type;
+} UmLoginHistory;
+
+static GtkWidget *
+get_widget (UmHistoryDialog *um,
+            const char *name)
+{
+        return (GtkWidget *)gtk_builder_get_object (um->builder, name);
+}
+
+static void
+close_history_dialog (GtkButton       *button,
+                      UmHistoryDialog *um)
+{
+        gtk_widget_hide (um->dialog);
+
+        um_history_dialog_set_user (um, NULL);
+
+        if (um->week) {
+                g_date_time_unref (um->week);
+                um->week = NULL;
+        }
+
+        if (um->current_week) {
+                g_date_time_unref (um->current_week);
+                um->current_week = NULL;
+        }
+}
+
+static void
+show_week_label (UmHistoryDialog *um)
+{
+        gchar *label, *from, *to;
+        GDateTime *date;
+        GTimeSpan span;
+
+        span = g_date_time_difference (um->current_week, um->week);
+        if (span == 0) {
+                label = g_strdup (_("This Week"));
+        }
+        else if (span == G_TIME_SPAN_DAY * 7) {
+                label = g_strdup (_("Last Week"));
+        }
+        else {
+                date = g_date_time_add_days (um->week, 6);
+                from = g_date_time_format (um->week, "%b %e");
+                if (g_date_time_get_year (um->week) == g_date_time_get_year (um->current_week)) {
+                        to = g_date_time_format (date, "%b %e");
+                }
+                else {
+                        to = g_date_time_format (date, "%b %e, %Y");
+                }
+
+                label = g_strconcat (from, " - ", to, NULL);
+
+                g_date_time_unref (date);
+                g_free (from);
+                g_free (to);
+        }
+
+        gtk_label_set_label (GTK_LABEL (get_widget (um, "week-label")), label);
+
+        g_free (label);
+}
+
+static void
+clear_history (UmHistoryDialog *um)
+{
+        GtkWidget *grid;
+        GList *list, *it;
+
+        grid = get_widget (um, "history-grid");
+        list = gtk_container_get_children (GTK_CONTAINER (grid));
+        for (it = list; it != NULL;  it = it->next) {
+                gtk_container_remove (GTK_CONTAINER (grid), GTK_WIDGET (it->data));
+        }
+        g_list_free (list);
+}
+
+static GArray *
+get_login_history (ActUser *user)
+{
+	GArray *login_history;
+	GVariantIter *iter, *iter2;
+	GVariant *variant;
+	const GVariant *value;
+	const gchar *key;
+	UmLoginHistory history;
+
+	login_history = NULL;
+	value = act_user_get_login_history (user);
+	g_variant_get ((GVariant *) value, "a(xxa{sv})", &iter);
+	while (g_variant_iter_loop (iter, "(xxa{sv})", &history.login_time, &history.logout_time, &iter2)) {
+		while (g_variant_iter_loop (iter2, "{sv}", &key, &variant)) {
+			if (g_strcmp0 (key, "type") == 0) {
+				history.type = g_variant_get_string (variant, NULL);
+			}
+		}
+
+		if (login_history == NULL) {
+			login_history = g_array_new (FALSE, TRUE, sizeof (UmLoginHistory));
+		}
+
+		g_array_append_val (login_history, history);
+	}
+
+	return login_history;
+}
+
+static void
+set_sensitivity (UmHistoryDialog *um)
+{
+        GArray *login_history;
+        UmLoginHistory history;
+        gboolean sensitive = FALSE;
+
+        login_history = get_login_history (um->user);
+        if (login_history != NULL) {
+                history = g_array_index (login_history, UmLoginHistory, 0);
+                sensitive = g_date_time_to_unix (um->week) > history.login_time;
+                g_array_free (login_history, TRUE);
+        }
+        gtk_widget_set_sensitive (get_widget (um, "previous-button"), sensitive);
+
+        sensitive = (g_date_time_compare (um->current_week, um->week) == 1);
+        gtk_widget_set_sensitive (get_widget (um, "next-button"), sensitive);
+}
+
+static void
+add_record (GtkWidget *grid, GDateTime *datetime, gchar *record_string, gint line)
+{
+        gchar *date, *time, *str;
+        GtkWidget *label;
+
+        date = get_smart_date (datetime);
+        time = g_date_time_format (datetime, "%k:%M");
+        str = g_strconcat (date, ", ", time, NULL);
+        label = gtk_label_new (str);
+        gtk_widget_set_halign (label, GTK_ALIGN_START);
+        gtk_grid_attach (GTK_GRID (grid), label, 1, line, 1, 1);
+        g_free (str);
+        g_free (date);
+        g_free (time);
+        g_date_time_unref (datetime);
+
+        label = gtk_label_new (record_string);
+        gtk_widget_set_halign (label, GTK_ALIGN_START);
+        gtk_grid_attach (GTK_GRID (grid), label, 2, line, 1, 1);
+}
+
+static void
+show_week (UmHistoryDialog *um)
+{
+        GArray *login_history;
+        GDateTime *datetime, *temp;
+        gint64 from, to;
+        gint i, line;
+        GtkWidget *grid;
+        UmLoginHistory history;
+
+        show_week_label (um);
+        clear_history (um);
+        set_sensitivity (um);
+
+        login_history = get_login_history (um->user);
+        if (login_history == NULL) {
+                return;
+        }
+
+        /* Find first record for week */
+        from = g_date_time_to_unix (um->week);
+        temp = g_date_time_add_weeks (um->week, 1);
+        to = g_date_time_to_unix (temp);
+        g_date_time_unref (temp);
+        for (i = login_history->len - 1; i >= 0; i--) {
+                history = g_array_index (login_history, UmLoginHistory, i);
+                if (history.login_time < to) {
+                        break;
+                }
+        }
+
+        /* Add new session records */
+        grid = get_widget (um, "history-grid");
+        line = 0;
+        for (;i >= 0; i--) {
+                history = g_array_index (login_history, UmLoginHistory, i);
+                if (history.logout_time > 0 && history.logout_time < from) {
+                        break;
+                }
+
+                /* Display only x-session and tty records */
+                if (!g_str_has_prefix (history.type, ":") &&
+                    !g_str_has_prefix (history.type, "tty")&&
+                    !g_str_has_prefix (history.type, "pts")) {
+                        continue;
+                }
+
+                if (history.logout_time > 0 && history.logout_time < to) {
+                        datetime = g_date_time_new_from_unix_local (history.logout_time);
+                        add_record (grid, datetime, "Session Ended", line);
+                        line++;
+                }
+
+                if (history.login_time >= from) {
+                        datetime = g_date_time_new_from_unix_local (history.login_time);
+                        add_record (grid, datetime, "Session Started", line);
+                        line++;
+                }
+        }
+
+        gtk_widget_show_all (grid);
+
+        g_array_free (login_history, TRUE);
+}
+
+static void
+show_previous (GtkButton       *button,
+               UmHistoryDialog *um)
+{
+        GDateTime *temp;
+
+        temp = um->week;
+        um->week = g_date_time_add_weeks (um->week, -1);
+        g_date_time_unref (temp);
+
+        show_week (um);
+}
+
+static void
+show_next (GtkButton       *button,
+           UmHistoryDialog *um)
+{
+        GDateTime *temp;
+
+        temp = um->week;
+        um->week = g_date_time_add_weeks (um->week, 1);
+        g_date_time_unref (temp);
+
+        show_week (um);
+}
+
+void
+um_history_dialog_set_user (UmHistoryDialog *um,
+                            ActUser         *user)
+{
+        if (um->user) {
+                g_clear_object (&um->user);
+        }
+
+        if (user) {
+                um->user = g_object_ref (user);
+        }
+}
+
+void
+um_history_dialog_show (UmHistoryDialog *um,
+                        GtkWindow       *parent)
+{
+        GDateTime *temp, *local;
+
+        /* Set the first day of this week */
+        local = g_date_time_new_now_local ();
+        temp = g_date_time_new_local (g_date_time_get_year (local),
+                                      g_date_time_get_month (local),
+                                      g_date_time_get_day_of_month (local),
+                                      0, 0, 0);
+        um->week = g_date_time_add_days (temp, 1 - g_date_time_get_day_of_week (temp));
+        um->current_week = g_date_time_ref (um->week);
+        g_date_time_unref (local);
+        g_date_time_unref (temp);
+
+        show_week (um);
+
+        gtk_window_set_transient_for (GTK_WINDOW (um->dialog), parent);
+        gtk_window_present (GTK_WINDOW (um->dialog));
+}
+
+UmHistoryDialog *
+um_history_dialog_new (void)
+{
+        GError *error = NULL;
+        UmHistoryDialog *um;
+        GtkWidget *widget;
+
+        um = g_new0 (UmHistoryDialog, 1);
+        um->builder = gtk_builder_new ();
+
+        if (!gtk_builder_add_from_resource (um->builder, "/org/gnome/control-center/user-accounts/history-dialog.ui", &error)) {
+                g_error ("%s", error->message);
+                g_error_free (error);
+                g_free (um);
+
+                return NULL;
+        }
+
+        um->dialog = get_widget (um, "dialog");
+        g_signal_connect (um->dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
+        widget = get_widget (um, "close-button");
+        g_signal_connect (widget, "clicked", G_CALLBACK (close_history_dialog), um);
+
+        widget = get_widget (um, "next-button");
+        g_signal_connect (widget, "clicked", G_CALLBACK (show_next), um);
+
+        widget = get_widget (um, "previous-button");
+        g_signal_connect (widget, "clicked", G_CALLBACK (show_previous), um);
+
+        return um;
+}
+
+void
+um_history_dialog_free (UmHistoryDialog *um)
+{
+        gtk_widget_destroy (um->dialog);
+
+        g_clear_object (&um->user);
+        g_clear_object (&um->builder);
+
+        if (um->week) {
+                g_date_time_unref (um->week);
+        }
+
+        if (um->current_week) {
+                g_date_time_unref (um->current_week);
+        }
+
+        g_free (um);
+}
 
=== added file 'panels/user-accounts/um-history-dialog.h'
--- panels/user-accounts/um-history-dialog.h	1970-01-01 00:00:00 +0000
+++ panels/user-accounts/um-history-dialog.h	2014-02-24 09:46:44 +0000
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright 2012  Red Hat, Inc,
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by: Ondrej Holy <[e-mail]>
+ */
+
+#ifndef __UM_HISTORY_DIALOG_H__
+#define __UM_HISTORY_DIALOG_H__
+
+#include <gtk/gtk.h>
+#include <act/act-user.h>
+
+G_BEGIN_DECLS
+
+typedef struct _UmHistoryDialog UmHistoryDialog;
+
+UmHistoryDialog *um_history_dialog_new      (void);
+void             um_history_dialog_free     (UmHistoryDialog *dialog);
+void             um_history_dialog_set_user (UmHistoryDialog *dialog,
+                                             ActUser         *user);
+void             um_history_dialog_show     (UmHistoryDialog *dialog,
+                                             GtkWindow       *parent);
+
+G_END_DECLS
+
+#endif
 
=== modified file 'panels/user-accounts/um-password-dialog.c'
--- panels/user-accounts/um-password-dialog.c	2013-11-28 04:33:51 +0000
+++ panels/user-accounts/um-password-dialog.c	2014-02-24 09:46:44 +0000
@@ -29,9 +29,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <act/act.h>
 
 #include "um-password-dialog.h"
-#include "um-user-manager.h"
 #include "um-utils.h"
 #include "run-passwd.h"
 #include "pw-utils.h"
@@ -51,7 +51,7 @@
         GtkWidget *show_password_button;
         GtkWidget *ok_button;
 
-        UmUser *user;
+        ActUser *user;
         gboolean using_ecryptfs;
 
         GtkWidget *old_password_label;
@@ -61,6 +61,39 @@
         PasswdHandler *passwd_handler;
 };
 
+typedef enum {
+        UM_PASSWORD_DIALOG_MODE_NORMAL = 0,
+        UM_PASSWORD_DIALOG_MODE_SET_AT_LOGIN,
+        UM_PASSWORD_DIALOG_MODE_NO_PASSWORD,
+        UM_PASSWORD_DIALOG_MODE_LOCK_ACCOUNT,
+        UM_PASSWORD_DIALOG_MODE_UNLOCK_ACCOUNT
+} UmPasswordDialogMode;
+
+static int
+update_password_strength (UmPasswordDialog *um)
+{
+        const gchar *password;
+        const gchar *old_password;
+        const gchar *username;
+        gint strength_level;
+        const gchar *hint;
+        const gchar *long_hint;
+
+        password = gtk_entry_get_text (GTK_ENTRY (um->password_entry));
+        old_password = gtk_entry_get_text (GTK_ENTRY (um->old_password_entry));
+        username = act_user_get_user_name (um->user);
+
+        pw_strength (password, old_password, username,
+                     &hint, &long_hint, &strength_level);
+
+        gtk_level_bar_set_value (GTK_LEVEL_BAR (um->strength_indicator), strength_level);
+        gtk_label_set_label (GTK_LABEL (um->strength_indicator_label), hint);
+        gtk_widget_set_tooltip_text (um->strength_indicator, long_hint);
+        gtk_widget_set_tooltip_text (um->strength_indicator_label, long_hint);
+
+        return strength_level;
+}
+
 static void
 generate_one_password (GtkWidget        *widget,
                        UmPasswordDialog *um)
@@ -198,26 +231,54 @@
         password = gtk_entry_get_text (GTK_ENTRY (um->password_entry));
         hint = gtk_entry_get_text (GTK_ENTRY (um->normal_hint_entry));
 
-        if (mode == 0 && um_user_get_uid (um->user) == getuid ()) {
-                GdkDisplay *display;
-                GdkCursor *cursor;
-
-                /* When setting a password for the current user,
-                 * use passwd directly, to preserve the audit trail
-                 * and to e.g. update the keyring password.
-                 */
-                passwd_change_password (um->passwd_handler, password, (PasswdCallback) password_changed_cb, um);
-                gtk_widget_set_sensitive (um->dialog, FALSE);
-                display = gtk_widget_get_display (um->dialog);
-                cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
-                gdk_window_set_cursor (gtk_widget_get_window (um->dialog), cursor);
-                gdk_display_flush (display);
-                g_object_unref (cursor);
-        }
-        else {
-                um_user_set_password (um->user, mode, password, hint);
-                finish_password_change (um);
-        }
+        switch (mode) {
+                case UM_PASSWORD_DIALOG_MODE_NORMAL:
+                        act_user_set_password_mode (um->user, ACT_USER_PASSWORD_MODE_REGULAR);
+                        if (act_user_get_uid (um->user) == getuid ()) {
+                                GdkDisplay *display;
+                                GdkCursor *cursor;
+
+                                /* When setting a password for the current user,
+                                 * use passwd directly, to preserve the audit trail
+                                 * and to e.g. update the keyring password.
+                                 */
+                                passwd_change_password (um->passwd_handler, password,
+                                                        (PasswdCallback) password_changed_cb, um);
+                                gtk_widget_set_sensitive (um->dialog, FALSE);
+                                display = gtk_widget_get_display (um->dialog);
+                                cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
+                                gdk_window_set_cursor (gtk_widget_get_window (um->dialog), cursor);
+                                gdk_display_flush (display);
+                                g_object_unref (cursor);
+                                return;
+                        }
+
+                        act_user_set_password (um->user, password, hint);
+                        break;
+
+                case UM_PASSWORD_DIALOG_MODE_SET_AT_LOGIN:
+                        act_user_set_password_mode (um->user, ACT_USER_PASSWORD_MODE_SET_AT_LOGIN);
+                        act_user_set_automatic_login (um->user, FALSE);
+                        break;
+
+                case UM_PASSWORD_DIALOG_MODE_NO_PASSWORD:
+                        act_user_set_password_mode (um->user, ACT_USER_PASSWORD_MODE_NONE);
+                        break;
+
+                case UM_PASSWORD_DIALOG_MODE_LOCK_ACCOUNT:
+                        act_user_set_locked (um->user, TRUE);
+                        act_user_set_automatic_login (um->user, FALSE);
+                        break;
+
+                case UM_PASSWORD_DIALOG_MODE_UNLOCK_ACCOUNT:
+                        act_user_set_locked (um->user, FALSE);
+                        break;
+
+                default:
+                        g_assert_not_reached ();
+        }
+
+        finish_password_change (um);
 }
 
 static void
@@ -227,18 +288,27 @@
         const gchar *old_password;
         const gchar *tooltip;
         gboolean can_change;
+        int strength_level;
 
         password = gtk_entry_get_text (GTK_ENTRY (um->password_entry));
         verify = gtk_entry_get_text (GTK_ENTRY (um->verify_entry));
         old_password = gtk_entry_get_text (GTK_ENTRY (um->old_password_entry));
 
-        if (strlen (password) < pw_min_length ()) {
+        /* Don't update the password strength if we didn't enter anything */
+        if (password && *password == '\0' &&
+            verify && *verify == '\0' &&
+            old_password && *old_password == '\0')
+                return;
+
+        strength_level = update_password_strength (um);
+
+        if (strength_level < 1) {
                 can_change = FALSE;
                 if (password[0] == '\0') {
                         tooltip = _("You need to enter a new password");
                 }
                 else {
-                        tooltip = _("The new password is too short");
+                        tooltip = _("The new password is not strong enough");
                 }
         }
         else if (strcmp (password, verify) != 0) {
@@ -312,29 +382,6 @@
 }
 
 static void
-update_password_strength (UmPasswordDialog *um)
-{
-        const gchar *password;
-        const gchar *old_password;
-        const gchar *username;
-        gint strength_level;
-        const gchar *hint;
-        const gchar *long_hint;
-
-        password = gtk_entry_get_text (GTK_ENTRY (um->password_entry));
-        old_password = gtk_entry_get_text (GTK_ENTRY (um->old_password_entry));
-        username = um_user_get_user_name (um->user);
-
-        pw_strength (password, old_password, username,
-                     &hint, &long_hint, &strength_level);
-
-        gtk_level_bar_set_value (GTK_LEVEL_BAR (um->strength_indicator), strength_level);
-        gtk_label_set_label (GTK_LABEL (um->strength_indicator_label), hint);
-        gtk_widget_set_tooltip_text (um->strength_indicator, long_hint);
-        gtk_widget_set_tooltip_text (um->strength_indicator_label, long_hint);
-}
-
-static void
 update_password_match (UmPasswordDialog *um)
 {
         const char *password;
@@ -405,6 +452,14 @@
          GError           *error,
          UmPasswordDialog *um)
 {
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+        gint mode;
+
+        model = gtk_combo_box_get_model (GTK_COMBO_BOX (um->action_combo));
+        gtk_combo_box_get_active_iter (GTK_COMBO_BOX (um->action_combo), &iter);
+        gtk_tree_model_get (model, &iter, 1, &mode, -1);
+
         if (error) {
                 um->old_password_ok = FALSE;
                 set_entry_validation_error (GTK_ENTRY (um->old_password_entry),
@@ -415,6 +470,11 @@
                 clear_entry_validation_error (GTK_ENTRY (um->old_password_entry));
         }
 
+        /* Check if we are still in normal mode */
+        if (mode != UM_PASSWORD_DIALOG_MODE_NORMAL){
+                return;
+        }
+
         update_sensitivity (um);
 }
 
@@ -510,7 +570,6 @@
 {
         GtkBuilder *builder;
         GError *error;
-        const gchar *filename;
         UmPasswordDialog *um;
         GtkWidget *widget;
         const char *old_label;
@@ -520,10 +579,9 @@
         builder = gtk_builder_new ();
 
         error = NULL;
-        filename = UIDIR "/password-dialog.ui";
-        if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-                filename = "data/password-dialog.ui";
-        if (!gtk_builder_add_from_file (builder, filename, &error)) {
+        if (!gtk_builder_add_from_resource (builder,
+                                            "/org/gnome/control-center/user-accounts/password-dialog.ui",
+                                            &error)) {
                 g_error ("%s", error->message);
                 g_error_free (error);
                 return NULL;
@@ -662,7 +720,7 @@
 {
         if (um->user) {
                 gint mode; 
-                gboolean locked = um_user_get_locked (um->user);
+                gboolean locked = act_user_get_locked (um->user);
 
                 gtk_tree_model_get (model, iter, 1, &mode, -1);
 
@@ -672,10 +730,15 @@
                 if (mode == 2 && um->using_ecryptfs)
                         return FALSE;
 
-                if (mode == 3 && locked)
+                /* We don't allow the current user to disable their own account,
+                 * as this can lead to them being 'locked out'.
+                 */
+                if (mode == UM_PASSWORD_DIALOG_MODE_LOCK_ACCOUNT &&
+                    (locked || act_user_get_uid (um->user) == getuid ()
+                     || would_demote_only_admin (um->user)))
                         return FALSE;
 
-                if (mode == 4 && !locked)
+                if (mode == UM_PASSWORD_DIALOG_MODE_UNLOCK_ACCOUNT && !locked)
                         return FALSE;
 
                 return TRUE;
@@ -686,7 +749,7 @@
 
 void
 um_password_dialog_set_user (UmPasswordDialog *um,
-                             UmUser           *user)
+                             ActUser          *user)
 {
         GdkPixbuf *pixbuf;
         GtkTreeModel *model;
@@ -698,22 +761,22 @@
         if (user) {
                 um->user = g_object_ref (user);
 
-                um->using_ecryptfs = is_using_ecryptfs (um_user_get_user_name (user));
+                um->using_ecryptfs = is_using_ecryptfs (act_user_get_user_name (user));
 
-                pixbuf = um_user_render_icon (user, FALSE, 48);
+                pixbuf = render_user_icon (user, UM_ICON_STYLE_NONE, 48);
                 gtk_image_set_from_pixbuf (GTK_IMAGE (um->user_icon), pixbuf);
                 g_object_unref (pixbuf);
 
                 gtk_label_set_label (GTK_LABEL (um->user_name),
-                                     um_user_get_real_name (user));
+                                     act_user_get_real_name (user));
 
                 gtk_entry_set_text (GTK_ENTRY (um->password_entry), "");
                 gtk_entry_set_text (GTK_ENTRY (um->verify_entry), "");
                 gtk_entry_set_text (GTK_ENTRY (um->normal_hint_entry), "");
                 gtk_entry_set_text (GTK_ENTRY (um->old_password_entry), "");
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (um->show_password_button), FALSE);
-                if (um_user_get_uid (um->user) == getuid () &&
-                    um_user_get_password_mode (um->user) == UM_PASSWORD_MODE_REGULAR) {
+                if (act_user_get_uid (um->user) == getuid () &&
+                    act_user_get_password_mode (um->user) == ACT_USER_PASSWORD_MODE_REGULAR) {
                         gtk_widget_show (um->old_password_label);
                         gtk_widget_show (um->old_password_entry);
                         um->old_password_ok = FALSE;
@@ -723,7 +786,7 @@
                         gtk_widget_hide (um->old_password_entry);
                         um->old_password_ok = TRUE;
                 }
-                if (um_user_get_uid (um->user) == getuid()) {
+                if (act_user_get_uid (um->user) == getuid()) {
                         if (um->passwd_handler != NULL)
                                 passwd_destroy (um->passwd_handler);
                         um->passwd_handler = passwd_init ();
 
=== modified file 'panels/user-accounts/um-password-dialog.h'
--- panels/user-accounts/um-password-dialog.h	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-password-dialog.h	2014-02-24 09:46:44 +0000
@@ -23,7 +23,7 @@
 #define __UM_PASSWORD_DIALOG_H__
 
 #include <gtk/gtk.h>
-#include "um-user.h"
+#include <act/act.h>
 
 G_BEGIN_DECLS
 
@@ -32,7 +32,7 @@
 UmPasswordDialog *um_password_dialog_new      (void);
 void              um_password_dialog_free     (UmPasswordDialog *dialog);
 void              um_password_dialog_set_user (UmPasswordDialog *dialog,
-                                               UmUser           *user);
+                                               ActUser          *user);
 void              um_password_dialog_set_privileged (UmPasswordDialog *dialog,
                                                      gboolean          privileged);
 void              um_password_dialog_show     (UmPasswordDialog *dialog,
 
=== modified file 'panels/user-accounts/um-photo-dialog.c'
--- panels/user-accounts/um-photo-dialog.c	2014-02-18 03:09:04 +0000
+++ panels/user-accounts/um-photo-dialog.c	2014-02-24 09:46:44 +0000
@@ -26,6 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <act/act.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-desktop-thumbnail.h>
 
@@ -36,7 +37,6 @@
 #endif /* HAVE_CHEESE */
 
 #include "um-photo-dialog.h"
-#include "um-user-manager.h"
 #include "um-crop-area.h"
 #include "um-utils.h"
 
@@ -55,7 +55,7 @@
 
         GnomeDesktopThumbnailFactory *thumb_factory;
 
-        UmUser *user;
+        ActUser *user;
 };
 
 static void
@@ -74,7 +74,7 @@
         pb = um_crop_area_get_picture (UM_CROP_AREA (um->crop_area));
         pb2 = gdk_pixbuf_scale_simple (pb, 96, 96, GDK_INTERP_BILINEAR);
 
-        um_user_set_icon_data (um->user, pb2);
+        set_user_icon_data (um->user, pb2);
 
         g_object_unref (pb2);
         g_object_unref (pb);
@@ -247,7 +247,7 @@
 none_icon_selected (GtkMenuItem   *menuitem,
                     UmPhotoDialog *um)
 {
-        um_user_set_icon_file (um->user, NULL);
+        act_user_set_icon_file (um->user, "");
 }
 
 static void
@@ -276,7 +276,7 @@
                 g_object_get (G_OBJECT (dialog), "pixbuf", &pb, NULL);
                 pb2 = gdk_pixbuf_scale_simple (pb, 96, 96, GDK_INTERP_BILINEAR);
 
-                um_user_set_icon_data (um->user, pb2);
+                set_user_icon_data (um->user, pb2);
 
                 g_object_unref (pb2);
                 g_object_unref (pb);
@@ -337,7 +337,7 @@
         const char *filename;
 
         filename = g_object_get_data (G_OBJECT (menuitem), "filename");
-        um_user_set_icon_file (um->user, filename);
+        act_user_set_icon_file (um->user, filename);
 }
 
 static GtkWidget *
@@ -458,7 +458,7 @@
         y++;
 
 #ifdef HAVE_CHEESE
-        um->take_photo_menuitem = gtk_menu_item_new_with_label (_("Take a photo..."));
+        um->take_photo_menuitem = gtk_menu_item_new_with_label (_("Take a photo…"));
         gtk_menu_attach (GTK_MENU (menu), GTK_WIDGET (um->take_photo_menuitem),
                          0, ROW_SPAN - 1, y, y + 1);
         g_signal_connect (G_OBJECT (um->take_photo_menuitem), "activate",
@@ -476,7 +476,7 @@
         y++;
 #endif /* HAVE_CHEESE */
 
-        menuitem = gtk_menu_item_new_with_label (_("Browse for more pictures..."));
+        menuitem = gtk_menu_item_new_with_label (_("Browse for more pictures…"));
         gtk_menu_attach (GTK_MENU (menu), GTK_WIDGET (menuitem),
                          0, ROW_SPAN - 1, y, y + 1);
         g_signal_connect (G_OBJECT (menuitem), "activate",
@@ -652,11 +652,11 @@
 
 void
 um_photo_dialog_set_user (UmPhotoDialog *um,
-                          UmUser        *user)
+                          ActUser       *user)
 {
-        UmUserManager *manager;
+        ActUserManager *manager;
         GSList *list, *l;
-        UmUser *u;
+        ActUser *u;
         GIcon *icon;
         GEmblem *emblem;
         GList *children, *c;
@@ -675,9 +675,8 @@
                 children = gtk_container_get_children (GTK_CONTAINER (um->photo_popup));
                 g_list_foreach (children, (GFunc) clear_tip, NULL);
 
-                manager = um_user_manager_ref_default ();
-                list = um_user_manager_list_users (manager);
-                g_object_unref (manager);
+                manager = act_user_manager_get_default ();
+                list = act_user_manager_list_users (manager);
 
                 icon = g_themed_icon_new ("avatar-default");
                 emblem = g_emblem_new (icon);
@@ -689,7 +688,7 @@
                         u = l->data;
                         if (u == user)
                                 continue;
-                        filename = um_user_get_icon_file (u);
+                        filename = act_user_get_icon_file (u);
                         if (filename  == NULL)
                                 continue;
                         for (c = children; c; c = c->next) {
@@ -702,7 +701,7 @@
                                         char *tip;
 
                                         tip = g_strdup_printf (_("Used by %s"),
-                                                               um_user_get_real_name (u));
+                                                               act_user_get_real_name (u));
                                         set_tip (GTK_WIDGET (c->data), tip, emblem);
                                         g_free (tip);
                                         break;
 
=== modified file 'panels/user-accounts/um-photo-dialog.h'
--- panels/user-accounts/um-photo-dialog.h	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-photo-dialog.h	2014-02-24 09:46:44 +0000
@@ -23,7 +23,7 @@
 #define __UM_PHOTO_DIALOG_H__
 
 #include <gtk/gtk.h>
-#include "um-user.h"
+#include <act/act.h>
 
 G_BEGIN_DECLS
 
@@ -32,7 +32,7 @@
 UmPhotoDialog *um_photo_dialog_new      (GtkWidget     *button);
 void           um_photo_dialog_free     (UmPhotoDialog *dialog);
 void           um_photo_dialog_set_user (UmPhotoDialog *dialog,
-                                         UmUser        *user);
+                                         ActUser       *user);
 
 G_END_DECLS
 
 
=== modified file 'panels/user-accounts/um-realm-manager.c'
--- panels/user-accounts/um-realm-manager.c	2012-10-19 08:56:05 +0000
+++ panels/user-accounts/um-realm-manager.c	2014-02-24 09:46:44 +0000
@@ -537,6 +537,7 @@
         GSimpleAsyncResult *async;
         GVariant *contents;
         GVariant *options;
+        GVariant *option;
         GVariant *creds;
         const gchar *type;
 
@@ -569,7 +570,8 @@
         }
 
         creds = g_variant_new ("(ssv)", type, owner, contents);
-        options = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
+        option = g_variant_new ("{sv}", "manage-system", g_variant_new_boolean (FALSE));
+        options = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), &option, 1);
 
         g_debug ("Calling the Join() method with %s credentials", owner);
 
@@ -801,18 +803,25 @@
                 break;
 
         case KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN:
-        case KRB5KDC_ERR_CLIENT_REVOKED:
-        case KRB5KDC_ERR_KEY_EXP:
         case KRB5KDC_ERR_POLICY:
-        case KRB5KDC_ERR_ETYPE_NOSUPP:
                 g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_BAD_LOGIN,
                                                  _("Cannot log in as %s at the %s domain"),
                                                  login->user, login->domain);
                 break;
         case KRB5KDC_ERR_PREAUTH_FAILED:
+        case KRB5KRB_AP_ERR_BAD_INTEGRITY:
                 g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_BAD_PASSWORD,
                                                  _("Invalid password, please try again"));
                 break;
+        case KRB5_PREAUTH_FAILED:
+        case KRB5KDC_ERR_KEY_EXP:
+        case KRB5KDC_ERR_CLIENT_REVOKED:
+        case KRB5KDC_ERR_ETYPE_NOSUPP:
+        case KRB5_PROG_ETYPE_NOSUPP:
+                g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_CANNOT_AUTH,
+                                                 _("Cannot log in as %s at the %s domain"),
+                                                 login->user, login->domain);
+                break;
         default:
                 g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
                                                  _("Couldn't connect to the %s domain: %s"),
 
=== modified file 'panels/user-accounts/um-realm-manager.h'
--- panels/user-accounts/um-realm-manager.h	2012-09-17 12:08:35 +0000
+++ panels/user-accounts/um-realm-manager.h	2014-02-24 09:46:44 +0000
@@ -29,6 +29,7 @@
 typedef enum {
 	UM_REALM_ERROR_BAD_LOGIN,
 	UM_REALM_ERROR_BAD_PASSWORD,
+	UM_REALM_ERROR_CANNOT_AUTH,
 	UM_REALM_ERROR_GENERIC,
 } UmRealmErrors;
 
 
=== removed file 'panels/user-accounts/um-user-manager.c'
--- panels/user-accounts/um-user-manager.c	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-user-manager.c	1970-01-01 00:00:00 +0000
@@ -1,734 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2009-2010 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Written by: Matthias Clasen <[e-mail]>
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <pwd.h>
-
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif /* HAVE_PATHS_H */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <glib-object.h>
-#include <gio/gio.h>
-
-#include "um-user-manager.h"
-
-enum {
-        USERS_LOADED,
-        USER_ADDED,
-        USER_REMOVED,
-        USER_CHANGED,
-        LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = { 0, };
-
-static void     um_user_manager_class_init (UmUserManagerClass *klass);
-static void     um_user_manager_init       (UmUserManager      *user_manager);
-static void     um_user_manager_finalize   (GObject            *object);
-
-static gpointer user_manager_object = NULL;
-
-G_DEFINE_TYPE (UmUserManager, um_user_manager, G_TYPE_OBJECT)
-
-static void
-um_user_manager_class_init (UmUserManagerClass *klass)
-{
-        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-
-        object_class->finalize = um_user_manager_finalize;
-
-       signals [USERS_LOADED] =
-                g_signal_new ("users-loaded",
-                              G_TYPE_FROM_CLASS (klass),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (UmUserManagerClass, users_loaded),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE, 0);
-
-        signals [USER_ADDED] =
-                g_signal_new ("user-added",
-                              G_TYPE_FROM_CLASS (klass),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (UmUserManagerClass, user_added),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__OBJECT,
-                              G_TYPE_NONE, 1, UM_TYPE_USER);
-        signals [USER_REMOVED] =
-                g_signal_new ("user-removed",
-                              G_TYPE_FROM_CLASS (klass),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (UmUserManagerClass, user_removed),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__OBJECT,
-                              G_TYPE_NONE, 1, UM_TYPE_USER);
-        signals [USER_CHANGED] =
-                g_signal_new ("user-changed",
-                              G_TYPE_FROM_CLASS (klass),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (UmUserManagerClass, user_changed),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__OBJECT,
-                              G_TYPE_NONE, 1, UM_TYPE_USER);
-}
-
-
-/* We maintain a ring for each group of users with the same real name.
- * We need this to pick the right display names.
- */
-static void
-remove_user_from_dupe_ring (UmUserManager *manager,
-                            UmUser        *user)
-{
-        GList *dupes;
-        UmUser *dup;
-
-        dup = NULL;
-        dupes = g_object_get_data (G_OBJECT (user), "dupes");
-
-        if (!dupes) {
-                goto out;
-        }
-
-        if (dupes->next == dupes->prev) {
-                dup = dupes->next->data;
-                g_list_free_1 (dupes->next);
-                g_object_set_data (G_OBJECT (dup), "dupes", NULL);
-        }
-        else {
-                dupes->next->prev = dupes->prev;
-                dupes->prev->next = dupes->next;
-        }
-
-        g_list_free_1 (dupes);
-        g_object_set_data (G_OBJECT (user), "dupes", NULL);
-
-out:
-        if (dup) {
-                um_user_show_short_display_name (dup);
-                g_signal_emit (manager, signals[USER_CHANGED], 0, dup);
-        }
-        um_user_show_short_display_name (user);
-        g_signal_emit (manager, signals[USER_CHANGED], 0, user);
-}
-
-static gboolean
-match_real_name_hrfunc (gpointer key,
-                        gpointer value,
-                        gpointer user)
-{
-        return (value != user && g_strcmp0 (um_user_get_real_name (user), um_user_get_real_name (value)) == 0);
-}
-
-static void
-add_user_to_dupe_ring (UmUserManager *manager,
-                       UmUser        *user)
-{
-        UmUser *dup;
-        GList *dupes;
-        GList *l;
-
-        dup = g_hash_table_find (manager->user_by_object_path,
-                                 match_real_name_hrfunc, user);
-
-        if (!dup) {
-                return;
-        }
-
-        dupes = g_object_get_data (G_OBJECT (dup), "dupes");
-        if (!dupes) {
-                dupes = g_list_append (NULL, dup);
-                g_object_set_data (G_OBJECT (dup), "dupes", dupes);
-                dupes->next = dupes->prev = dupes;
-        }
-        else {
-                dup = NULL;
-        }
-
-        l = g_list_append (NULL, user);
-        g_object_set_data (G_OBJECT (user), "dupes", l);
-        l->prev = dupes->prev;
-        dupes->prev->next = l;
-        l->next = dupes;
-        dupes->prev = l;
-
-        if (dup) {
-                um_user_show_full_display_name (dup);
-                g_signal_emit (manager, signals[USER_CHANGED], 0, dup);
-        }
-        um_user_show_full_display_name (user);
-        g_signal_emit (manager, signals[USER_CHANGED], 0, user);
-}
-
-static void
-user_changed_handler (UmUser        *user,
-                      UmUserManager *manager)
-{
-        remove_user_from_dupe_ring (manager, user);
-        add_user_to_dupe_ring (manager, user);
-        g_signal_emit (manager, signals[USER_CHANGED], 0, user);
-}
-
-static void
-user_added_handler (UmUserManager *manager,
-                    const char *object_path)
-{
-        UmUser *user;
- 
-        if (g_hash_table_lookup (manager->user_by_object_path, object_path))
-                return;
-
-        user = um_user_new_from_object_path (object_path);
-        if (!user)
-                return;
-
-        if (um_user_is_system_account (user)) {
-                g_object_unref (user);
-                return;
-        }
-
-        add_user_to_dupe_ring (manager, user);
-
-        g_signal_connect (user, "changed",
-                          G_CALLBACK (user_changed_handler), manager);
-        g_hash_table_insert (manager->user_by_object_path, g_strdup (um_user_get_object_path (user)), g_object_ref (user));
-        g_hash_table_insert (manager->user_by_name, g_strdup (um_user_get_user_name (user)), g_object_ref (user));
-
-        g_signal_emit (manager, signals[USER_ADDED], 0, user);
-        g_object_unref (user);
-}
-
-static void
-user_deleted_handler (UmUserManager *manager,
-                      const char *object_path)
-{
-        UmUser *user;
-
-        user = g_hash_table_lookup (manager->user_by_object_path, object_path);
-        if (!user)
-                return;
-        g_object_ref (user);
-        g_signal_handlers_disconnect_by_func (user, user_changed_handler, manager);
-
-        remove_user_from_dupe_ring (manager, user);
-
-        g_hash_table_remove (manager->user_by_object_path, um_user_get_object_path (user));
-        g_hash_table_remove (manager->user_by_name, um_user_get_user_name (user));
-        g_signal_emit (manager, signals[USER_REMOVED], 0, user);
-        g_object_unref (user);
-}
-
-static void
-manager_signal_cb (GDBusProxy *proxy, gchar *sender_name, gchar *signal_name, GVariant *parameters, UmUserManager *manager)
-{
-        if (strcmp (signal_name, "UserAdded") == 0) {
-                if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(o)"))) {
-                        gchar *object_path;
-                        g_variant_get (parameters, "(&o)", &object_path);
-                        user_added_handler (manager, object_path);
-                }
-        }
-        else if (strcmp (signal_name, "UserDeleted") == 0) {
-                if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(o)"))) {
-                        gchar *object_path;
-                        g_variant_get (parameters, "(&o)", &object_path);
-                        user_deleted_handler (manager, object_path);
-                }
-        }
-}
-
-static void
-got_users (GObject        *object,
-           GAsyncResult   *res,
-           gpointer        data)
-{
-        UmUserManager *manager = data;
-        GVariant *result;
-        GError *error = NULL;
-
-        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), res, &error);
-        if (!result) {
-                manager->no_service = TRUE;
-                g_error_free (error);
-                goto done;
-        }
-
-        if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(ao)"))) {
-                GVariantIter *iter;
-                gchar *object_path;
-
-                g_variant_get (result, "(ao)", &iter);
-                while (g_variant_iter_loop (iter, "&o", &object_path))
-                        user_added_handler (manager, object_path);
-                g_variant_iter_free (iter);
-        }
-
-        g_variant_unref (result);
-
- done:
-        g_signal_emit (G_OBJECT (manager), signals[USERS_LOADED], 0);
-}
-
-static void
-get_users (UmUserManager *manager)
-{
-        g_debug ("calling 'ListCachedUsers'");
-        g_dbus_proxy_call (manager->proxy,
-                           "ListCachedUsers",
-                           g_variant_new ("()"),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1,
-                           NULL,
-                           got_users,
-                           manager);
-}
-
-static void
-um_user_manager_init (UmUserManager *manager)
-{
-        GError *error = NULL;
-        GDBusConnection *bus;
-
-        manager->user_by_object_path = g_hash_table_new_full (g_str_hash,
-                                                              g_str_equal,
-                                                              g_free,
-                                                              g_object_unref);
-        manager->user_by_name = g_hash_table_new_full (g_str_hash,
-                                                       g_str_equal,
-                                                       g_free,
-                                                       g_object_unref);
-
-        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-        if (bus == NULL) {
-                g_warning ("Couldn't connect to system bus: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-
-        manager->proxy = g_dbus_proxy_new_sync (bus,
-                                                G_DBUS_PROXY_FLAGS_NONE,
-                                                NULL,
-                                                "org.freedesktop.Accounts",
-                                                "/org/freedesktop/Accounts",
-                                                "org.freedesktop.Accounts",
-                                                NULL,
-                                                &error);
-        if (manager->proxy == NULL) {
-                g_warning ("Couldn't get accounts proxy: %s", error->message);
-                g_error_free (error);
-                return;     
-        }
-
-        g_signal_connect (manager->proxy, "g-signal", G_CALLBACK (manager_signal_cb), manager);
-
-        get_users (manager);
-}
-
-static void
-clear_dup (gpointer key,
-           gpointer value,
-           gpointer data)
-{
-        GList *dupes;
-
-        /* don't bother maintaining the ring, we're destroying the
-         * entire hash table anyway
-         */
-        dupes = g_object_get_data (G_OBJECT (value), "dupes");
-
-        if (dupes) {
-                g_list_free_1 (dupes);
-                g_object_set_data (G_OBJECT (value), "dupes", NULL);
-        }
-}
-
-static void
-um_user_manager_finalize (GObject *object)
-{
-        UmUserManager *manager;
-
-        manager = UM_USER_MANAGER (object);
-
-        g_hash_table_foreach (manager->user_by_object_path, clear_dup, NULL);
-        g_hash_table_destroy (manager->user_by_object_path);
-        g_hash_table_destroy (manager->user_by_name);
-
-        g_object_unref (manager->proxy);
-
-        G_OBJECT_CLASS (um_user_manager_parent_class)->finalize (object);
-}
-
-UmUserManager *
-um_user_manager_ref_default (void)
-{
-        if (user_manager_object != NULL) {
-                g_object_ref (user_manager_object);
-        } else {
-                user_manager_object = g_object_new (UM_TYPE_USER_MANAGER, NULL);
-                g_object_add_weak_pointer (user_manager_object,
-                                           (gpointer *) &user_manager_object);
-        }
-
-        return UM_USER_MANAGER (user_manager_object);
-}
-
-typedef struct {
-        UmUserManager       *manager;
-        gchar               *user_name;
-        GAsyncReadyCallback  callback;
-        gpointer             data;
-        GDestroyNotify       destroy;
-}  AsyncUserOpData;
-
-static void
-async_user_op_data_free (gpointer d)
-{
-        AsyncUserOpData *data = d;
-
-        g_object_unref (data->manager);
-
-        g_free (data->user_name);
-
-        if (data->destroy)
-                data->destroy (data->data);
-
-        g_free (data);
-}
-
-/* Used for both create_user and cache_user */
-static void
-user_call_done (GObject        *proxy,
-                GAsyncResult   *r,
-                gpointer        user_data)
-{
-        AsyncUserOpData *data = user_data;
-        GSimpleAsyncResult *res;
-        GVariant *result;
-        GError *error = NULL;
-        gchar *remote;
-
-        res = g_simple_async_result_new (G_OBJECT (data->manager),
-                                         data->callback,
-                                         data->data,
-                                         um_user_manager_create_user);
-        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), r, &error);
-        if (!result) {
-                /* dbus-glib fail:
-                 * We have to translate the errors manually here, since
-                 * calling dbus_g_error_has_name on the error returned in
-                 * um_user_manager_create_user_finish doesn't work.
-                 */
-                remote = g_dbus_error_get_remote_error (error);
-                if (g_dbus_error_is_remote_error (error) &&
-                    strcmp (remote, "org.freedesktop.Accounts.Error.PermissionDenied") == 0) {
-                        g_simple_async_result_set_error (res,
-                                                         UM_USER_MANAGER_ERROR,
-                                                         UM_USER_MANAGER_ERROR_PERMISSION_DENIED,
-                                                         "Not authorized");
-                }
-                if (g_dbus_error_is_remote_error (error) &&
-                    strcmp (remote, "org.freedesktop.Accounts.Error.UserExists") == 0) {
-                        g_simple_async_result_set_error (res,
-                                                         UM_USER_MANAGER_ERROR,
-                                                         UM_USER_MANAGER_ERROR_USER_EXISTS,
-                                                         _("A user with name '%s' already exists."),
-                                                         data->user_name);
-                } else if (g_dbus_error_is_remote_error (error) &&
-                    strcmp (remote, "org.freedesktop.Accounts.Error.UserDoesNotExist") == 0) {
-                        g_simple_async_result_set_error (res,
-                                                         UM_USER_MANAGER_ERROR,
-                                                         UM_USER_MANAGER_ERROR_USER_DOES_NOT_EXIST,
-                                                         _("No user with the name '%s' exists."),
-                                                         data->user_name);
-                }
-                else {
-                        g_simple_async_result_set_from_error (res, error);
-                }
-                g_error_free (error);
-                g_free (remote);
-        }
-        else {
-                if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(o)"))) {
-                        gchar *path;
-                        g_variant_get (result, "(o)", &path);
-                        g_simple_async_result_set_op_res_gpointer (res, path, g_free);
-                }
-                else
-                        g_simple_async_result_set_error (res,
-                                                         UM_USER_MANAGER_ERROR,
-                                                         UM_USER_MANAGER_ERROR_FAILED,
-                                                         "Got invalid response from AccountsService");
-                g_variant_unref (result);
-        }
-
-        data->callback (G_OBJECT (data->manager), G_ASYNC_RESULT (res), data->data);
-        async_user_op_data_free (data);
-        g_object_unref (res);
-}
-
-gboolean
-um_user_manager_create_user_finish (UmUserManager  *manager,
-                                    GAsyncResult   *result,
-                                    UmUser        **user,
-                                    GError        **error)
-{
-        gchar *path;
-        GSimpleAsyncResult *res;
-
-        res = G_SIMPLE_ASYNC_RESULT (result);
-
-        *user = NULL;
-
-        if (g_simple_async_result_propagate_error (res, error)) {
-                return FALSE;
-        }
-
-        path = g_simple_async_result_get_op_res_gpointer (res);
-        *user = g_hash_table_lookup (manager->user_by_object_path, path);
-
-        return TRUE;
-}
-
-void
-um_user_manager_create_user (UmUserManager       *manager,
-                             const char          *user_name,
-                             const char          *real_name,
-                             gint                 account_type,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  done,
-                             gpointer             done_data,
-                             GDestroyNotify       destroy)
-{
-        AsyncUserOpData *data;
-
-        data = g_new0 (AsyncUserOpData, 1);
-        data->manager = g_object_ref (manager);
-        data->user_name = g_strdup (user_name);
-        data->callback = done;
-        data->data = done_data;
-        data->destroy = destroy;
-
-        g_dbus_proxy_call (manager->proxy,
-                           "CreateUser",
-                           g_variant_new ("(ssi)", user_name, real_name, account_type),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1,
-                           cancellable,
-                           user_call_done,
-                           data);
-}
-
-gboolean
-um_user_manager_cache_user_finish (UmUserManager       *manager,
-                                   GAsyncResult        *result,
-                                   UmUser             **user,
-                                   GError             **error)
-{
-        gchar *path;
-        GSimpleAsyncResult *res;
-
-        res = G_SIMPLE_ASYNC_RESULT (result);
-
-        *user = NULL;
-
-        if (g_simple_async_result_propagate_error (res, error)) {
-                return FALSE;
-        }
-
-        path = g_simple_async_result_get_op_res_gpointer (res);
-        *user = g_hash_table_lookup (manager->user_by_object_path, path);
-
-        return TRUE;
-}
-
-void
-um_user_manager_cache_user (UmUserManager       *manager,
-                            const char          *user_name,
-                            GCancellable        *cancellable,
-                            GAsyncReadyCallback  done,
-                            gpointer             done_data,
-                            GDestroyNotify       destroy)
-{
-        AsyncUserOpData *data;
-
-        data = g_new0 (AsyncUserOpData, 1);
-        data->manager = g_object_ref (manager);
-        data->user_name = g_strdup (user_name);
-        data->callback = done;
-        data->data = done_data;
-        data->destroy = destroy;
-
-        g_dbus_proxy_call (manager->proxy,
-                           "CacheUser",
-                           g_variant_new ("(s)", user_name),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1,
-                           cancellable,
-                           user_call_done,
-                           data);
-}
-
-static void
-delete_user_done (GObject        *proxy,
-                  GAsyncResult   *r,
-                  gpointer        user_data)
-{
-        AsyncUserOpData *data = user_data;
-        GSimpleAsyncResult *res;
-        GVariant *result;
-        GError *error = NULL;
-
-        res = g_simple_async_result_new (G_OBJECT (data->manager),
-                                         data->callback,
-                                         data->data,
-                                         um_user_manager_delete_user);
-        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), r, &error);
-        if (!result) {
-                if (g_dbus_error_is_remote_error (error) &&
-                    strcmp (g_dbus_error_get_remote_error(error), "org.freedesktop.Accounts.Error.PermissionDenied") == 0) {
-                        g_simple_async_result_set_error (res,
-                                                         UM_USER_MANAGER_ERROR,
-                                                         UM_USER_MANAGER_ERROR_PERMISSION_DENIED,
-                                                         "Not authorized");
-                }
-                else if (g_dbus_error_is_remote_error (error) &&
-                    strcmp (g_dbus_error_get_remote_error(error), "org.freedesktop.Accounts.Error.UserExists") == 0) {
-                        g_simple_async_result_set_error (res,
-                                                         UM_USER_MANAGER_ERROR,
-                                                         UM_USER_MANAGER_ERROR_USER_DOES_NOT_EXIST,
-                                                         _("This user does not exist."));
-                }
-                else {
-                        g_simple_async_result_set_from_error (res, error);
-                        g_error_free (error);
-                }
-        }
-        else
-                g_variant_unref (result);
-
-        data->callback (G_OBJECT (data->manager), G_ASYNC_RESULT (res), data->data);
-        async_user_op_data_free (data);
-        g_object_unref (res);
-}
-
-gboolean
-um_user_manager_delete_user_finish (UmUserManager  *manager,
-                                    GAsyncResult   *result,
-                                    GError        **error)
-{
-        GSimpleAsyncResult *res;
-
-        res = G_SIMPLE_ASYNC_RESULT (result);
-
-        if (g_simple_async_result_propagate_error (res, error)) {
-                return FALSE;
-        }
-
-        return TRUE;
-}
-
-void
-um_user_manager_delete_user (UmUserManager       *manager,
-                             UmUser              *user,
-                             gboolean             remove_files,
-                             GAsyncReadyCallback  done,
-                             gpointer             done_data,
-                             GDestroyNotify       destroy)
-{
-        AsyncUserOpData *data;
-
-        data = g_new0 (AsyncUserOpData, 1);
-        data->manager = g_object_ref (manager);
-        data->callback = done;
-        data->data = done_data;
-        data->destroy = destroy;
-
-        g_dbus_proxy_call (manager->proxy,
-                           "DeleteUser",
-                           g_variant_new ("(xb)", (gint64) um_user_get_uid (user), remove_files),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1,
-                           NULL,
-                           delete_user_done,
-                           data);
-}
-
-GSList *
-um_user_manager_list_users (UmUserManager *manager)
-{
-        GSList *list = NULL;
-        GHashTableIter iter;
-        gpointer value;
-
-        g_hash_table_iter_init (&iter, manager->user_by_name);
-        while (g_hash_table_iter_next (&iter, NULL, &value)) {
-                list = g_slist_prepend (list, value);
-        }
-
-        return g_slist_sort (list, (GCompareFunc) um_user_collate);
-}
-
-UmUser *
-um_user_manager_get_user (UmUserManager *manager,
-                          const gchar   *name)
-{
-        return g_hash_table_lookup (manager->user_by_name, name);
-}
-
-UmUser *
-um_user_manager_get_user_by_id (UmUserManager *manager,
-                                uid_t          uid)
-{
-        struct passwd *pwent;
-
-        pwent = getpwuid (uid);
-        if (!pwent) {
-                return NULL;
-        }
-
-        return um_user_manager_get_user (manager, pwent->pw_name);
-}
-
-gboolean
-um_user_manager_no_service (UmUserManager *manager)
-{
-        return manager->no_service;
-}
-
-GQuark
-um_user_manager_error_quark (void)
-{
-        return g_quark_from_static_string ("um-user-manager-error-quark");
-}
 
=== removed file 'panels/user-accounts/um-user-manager.h'
--- panels/user-accounts/um-user-manager.h	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-user-manager.h	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2009-2010 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __UM_USER_MANAGER__
-#define __UM_USER_MANAGER__
-
-#include <glib-object.h>
-#include <gio/gio.h>
-
-#include "um-user.h"
-
-G_BEGIN_DECLS
-
-#define UM_TYPE_USER_MANAGER         (um_user_manager_get_type ())
-#define UM_USER_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), UM_TYPE_USER_MANAGER, UmUserManager))
-#define UM_USER_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), UM_TYPE_USER_MANAGER, UmUserManagerClass))
-#define UM_IS_USER_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), UM_TYPE_USER_MANAGER))
-#define UM_IS_USER_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), UM_TYPE_USER_MANAGER))
-#define UM_USER_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UM_TYPE_USER_MANAGER, UmUserManagerClass))
-
-typedef struct
-{
-        GObject parent;
-
-        GDBusProxy *proxy;
-
-        GHashTable *user_by_object_path;
-        GHashTable *user_by_name;
-
-        gboolean no_service;
-} UmUserManager;
-
-typedef struct
-{
-        GObjectClass   parent_class;
-
-        void          (* users_loaded)              (UmUserManager *user_managaer);
-        void          (* user_added)                (UmUserManager *user_manager,
-                                                     UmUser        *user);
-        void          (* user_removed)              (UmUserManager *user_manager,
-                                                     UmUser        *user);
-        void          (* user_changed)              (UmUserManager *user_manager,
-                                                     UmUser        *user);
-} UmUserManagerClass;
-
-
-typedef enum {
-        UM_USER_MANAGER_ERROR_FAILED,
-        UM_USER_MANAGER_ERROR_USER_EXISTS,
-        UM_USER_MANAGER_ERROR_USER_DOES_NOT_EXIST,
-        UM_USER_MANAGER_ERROR_PERMISSION_DENIED
-} UmUserManagerError;
-
-#define UM_USER_MANAGER_ERROR um_user_manager_error_quark ()
-
-GQuark             um_user_manager_error_quark (void);
-
-GType              um_user_manager_get_type              (void);
-
-UmUserManager *    um_user_manager_ref_default           (void);
-
-gboolean           um_user_manager_no_service            (UmUserManager *manager);
-
-GSList *           um_user_manager_list_users            (UmUserManager *manager);
-UmUser *           um_user_manager_get_user              (UmUserManager *manager,
-                                                          const char    *user_name);
-UmUser *           um_user_manager_get_user_by_id        (UmUserManager *manager,
-                                                          uid_t          uid);
-
-void               um_user_manager_create_user           (UmUserManager       *manager,
-                                                          const char          *user_name,
-                                                          const char          *real_name,
-                                                          gint                 account_type,
-                                                          GCancellable        *cancellable,
-                                                          GAsyncReadyCallback  done,
-                                                          gpointer             user_data,
-                                                          GDestroyNotify       destroy);
-gboolean           um_user_manager_create_user_finish    (UmUserManager       *manager,
-                                                          GAsyncResult        *result,
-                                                          UmUser             **user,
-                                                          GError             **error);
-void               um_user_manager_cache_user            (UmUserManager       *manager,
-                                                          const char          *user_name,
-                                                          GCancellable        *cancellable,
-                                                          GAsyncReadyCallback  done,
-                                                          gpointer             user_data,
-                                                          GDestroyNotify       destroy);
-gboolean           um_user_manager_cache_user_finish     (UmUserManager       *manager,
-                                                          GAsyncResult        *result,
-                                                          UmUser             **user,
-                                                          GError             **error);
-void               um_user_manager_delete_user           (UmUserManager       *manager,
-                                                          UmUser              *user,
-                                                          gboolean             remove_files,
-                                                          GAsyncReadyCallback  done,
-                                                          gpointer             user_data,
-                                                          GDestroyNotify       destroy);
-gboolean           um_user_manager_delete_user_finish    (UmUserManager       *manager,
-                                                          GAsyncResult        *result,
-                                                          GError             **error);
-
-G_END_DECLS
-
-#endif /* __UM_USER_MANAGER__ */
 
=== modified file 'panels/user-accounts/um-user-module.c'
--- panels/user-accounts/um-user-module.c	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-user-module.c	2014-02-24 09:46:44 +0000
@@ -39,7 +39,7 @@
 #endif
 
   /* register the panel */
-  um_user_panel_register (module);
+  cc_user_panel_register (module);
 }
 
 void
 
=== modified file 'panels/user-accounts/um-user-panel.c'
--- panels/user-accounts/um-user-panel.c	2014-02-20 09:30:01 +0000
+++ panels/user-accounts/um-user-panel.c	2014-02-24 09:46:44 +0000
@@ -32,6 +32,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <polkit/polkit.h>
+#include <act/act.h>
 
 #ifdef HAVE_CHEESE
 #include <gst/gst.h>
@@ -39,9 +40,6 @@
 
 #include "shell/cc-editable-entry.h"
 
-#include "um-user.h"
-#include "um-user-manager.h"
-
 #include "um-editable-button.h"
 #include "um-editable-combo.h"
 
@@ -51,19 +49,21 @@
 #include "um-photo-dialog.h"
 #include "um-fingerprint-dialog.h"
 #include "um-utils.h"
+#include "um-resources.h"
+#include "um-history-dialog.h"
 
 #include "cc-common-language.h"
 
 #define USER_ACCOUNTS_PERMISSION "com.canonical.controlcenter.user-accounts.administration"
 #define INDICATOR_SESSION_SCHEMA "com.canonical.indicator.session"
 
-CC_PANEL_REGISTER (UmUserPanel, um_user_panel)
+CC_PANEL_REGISTER (CcUserPanel, cc_user_panel)
 
 #define UM_USER_PANEL_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), UM_TYPE_USER_PANEL, UmUserPanelPrivate))
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), UM_TYPE_USER_PANEL, CcUserPanelPrivate))
 
-struct _UmUserPanelPrivate {
-        UmUserManager *um;
+struct _CcUserPanelPrivate {
+        ActUserManager *um;
         GtkBuilder *builder;
 
         GtkWidget *main_box;
@@ -72,12 +72,17 @@
 
         UmPasswordDialog *password_dialog;
         UmPhotoDialog *photo_dialog;
+        UmHistoryDialog *history_dialog;
+        gint other_accounts;
+        GtkTreeIter *other_iter;
+        
+        UmAccountDialog *account_dialog;
 
         GSettings *indicator_session_schema;
 };
 
 static GtkWidget *
-get_widget (UmUserPanelPrivate *d, const char *name)
+get_widget (CcUserPanelPrivate *d, const char *name)
 {
         return (GtkWidget *)gtk_builder_get_object (d->builder, name);
 }
@@ -94,14 +99,14 @@
         NUM_USER_LIST_COLS
 };
 
-static UmUser *
-get_selected_user (UmUserPanelPrivate *d)
+static ActUser *
+get_selected_user (CcUserPanelPrivate *d)
 {
         GtkTreeView *tv;
         GtkTreeIter iter;
         GtkTreeSelection *selection;
         GtkTreeModel *model;
-        UmUser *user;
+        ActUser *user;
 
         tv = (GtkTreeView *)get_widget (d, "list-treeview");
         selection = gtk_tree_view_get_selection (tv);
@@ -115,15 +120,15 @@
 }
 
 static char *
-get_name_col_str (UmUser *user)
+get_name_col_str (ActUser *user)
 {
         return g_markup_printf_escaped ("<b>%s</b>\n<small>%s</small>",
-                                        um_user_get_display_name (user),
-                                        um_user_get_user_name (user));
+                                        act_user_get_real_name (user),
+                                        act_user_get_user_name (user));
 }
 
 static void
-user_added (UmUserManager *um, UmUser *user, UmUserPanelPrivate *d)
+user_added (ActUserManager *um, ActUser *user, CcUserPanelPrivate *d)
 {
         GtkWidget *widget;
         GtkTreeModel *model;
@@ -131,26 +136,31 @@
         GtkTreeIter iter;
         GtkTreeIter dummy;
         GdkPixbuf *pixbuf;
-        gchar *text;
+        gchar *text, *title;
         GtkTreeSelection *selection;
         gint sort_key;
         gboolean is_autologin;
 
-        g_debug ("user added: %d %s\n", um_user_get_uid (user), um_user_get_real_name (user));
+        if (act_user_is_system_account (user)) {
+                return;
+        }
+
+        g_debug ("user added: %d %s\n", act_user_get_uid (user), act_user_get_real_name (user));
         widget = get_widget (d, "list-treeview");
         model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
         store = GTK_LIST_STORE (model);
         selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
 
-        pixbuf = um_user_render_icon (user, TRUE, 48);
+        pixbuf = render_user_icon (user, UM_ICON_STYLE_FRAME | UM_ICON_STYLE_STATUS, 48);
         text = get_name_col_str (user);
 
-        is_autologin = um_user_get_automatic_login (user);
+        is_autologin = act_user_get_automatic_login (user);
 
-        if (um_user_get_uid (user) == getuid ()) {
+        if (act_user_get_uid (user) == getuid ()) {
                 sort_key = 1;
         }
         else {
+                d->other_accounts++;
                 sort_key = 3;
         }
         gtk_list_store_append (store, &iter);
@@ -172,6 +182,19 @@
             !gtk_tree_selection_get_selected (selection, &model, &dummy)) {
                 gtk_tree_selection_select_iter (selection, &iter);
         }
+
+        /* Show heading for other accounts if new one have been added. */
+        if (d->other_accounts == 1 && sort_key == 3) {
+                title = g_strdup_printf ("<small><span foreground=\"#555555\">%s</span></small>", _("Other Accounts"));
+                gtk_list_store_append (store, &iter);
+                gtk_list_store_set (store, &iter,
+                                    TITLE_COL, title,
+                                    HEADING_ROW_COL, TRUE,
+                                    SORT_KEY_COL, 2,
+                                    -1);
+                d->other_iter = gtk_tree_iter_copy (&iter);
+                g_free (title);
+        }
 }
 
 static void
@@ -180,7 +203,7 @@
                        GtkTreeIter  *prev)
 {
         GtkTreePath *path;
-        UmUser *user;
+        ActUser *user;
 
         path = gtk_tree_model_get_path (model, iter);
         while (gtk_tree_path_prev (path)) {
@@ -199,7 +222,7 @@
                    GtkTreeIter  *iter,
                    GtkTreeIter  *next)
 {
-        UmUser *user;
+        ActUser *user;
 
         *next = *iter;
         while (gtk_tree_model_iter_next (model, next)) {
@@ -214,28 +237,32 @@
 }
 
 static void
-user_removed (UmUserManager *um, UmUser *user, UmUserPanelPrivate *d)
+user_removed (ActUserManager *um, ActUser *user, CcUserPanelPrivate *d)
 {
         GtkTreeView *tv;
         GtkTreeModel *model;
         GtkTreeSelection *selection;
         GtkListStore *store;
         GtkTreeIter iter, next;
-        UmUser *u;
+        ActUser *u;
+        gint key;
 
-        g_debug ("user removed: %s\n", um_user_get_user_name (user));
+        g_debug ("user removed: %s\n", act_user_get_user_name (user));
         tv = (GtkTreeView *)get_widget (d, "list-treeview");
         selection = gtk_tree_view_get_selection (tv);
         model = gtk_tree_view_get_model (tv);
         store = GTK_LIST_STORE (model);
         if (gtk_tree_model_get_iter_first (model, &iter)) {
                 do {
-                        gtk_tree_model_get (model, &iter, USER_COL, &u, -1);
+                        gtk_tree_model_get (model, &iter, USER_COL, &u, SORT_KEY_COL, &key, -1);
 
                         if (u != NULL) {
-                                if (um_user_get_uid (user) == um_user_get_uid (u)) {
+                                if (act_user_get_uid (user) == act_user_get_uid (u)) {
                                         if (!get_next_user_row (model, &iter, &next))
                                                 get_previous_user_row (model, &iter, &next);
+                                        if (key == 3) {
+                                                d->other_accounts--;
+                                        }
                                         gtk_list_store_remove (store, &iter);
                                         gtk_tree_selection_select_iter (selection, &next);
                                         g_object_unref (u);
@@ -245,18 +272,25 @@
                         }
                 } while (gtk_tree_model_iter_next (model, &iter));
         }
+
+        /* Hide heading for other accounts if last one have been removed. */
+        if (d->other_iter != NULL && d->other_accounts == 0 && key == 3) {
+                gtk_list_store_remove (store, d->other_iter);
+                gtk_tree_iter_free (d->other_iter);
+                d->other_iter = NULL;
+        }
 }
 
-static void show_user (UmUser *user, UmUserPanelPrivate *d);
+static void show_user (ActUser *user, CcUserPanelPrivate *d);
 
 static void
-user_changed (UmUserManager *um, UmUser *user, UmUserPanelPrivate *d)
+user_changed (ActUserManager *um, ActUser *user, CcUserPanelPrivate *d)
 {
         GtkTreeView *tv;
         GtkTreeSelection *selection;
         GtkTreeModel *model;
         GtkTreeIter iter;
-        UmUser *current;
+        ActUser *current;
         GdkPixbuf *pixbuf;
         char *text;
         gboolean is_autologin;
@@ -269,9 +303,9 @@
         do {
                 gtk_tree_model_get (model, &iter, USER_COL, &current, -1);
                 if (current == user) {
-                        pixbuf = um_user_render_icon (user, TRUE, 48);
+                        pixbuf = render_user_icon (user, UM_ICON_STYLE_FRAME | UM_ICON_STYLE_STATUS, 48);
                         text = get_name_col_str (user);
-                        is_autologin = um_user_get_automatic_login (user);
+                        is_autologin = act_user_get_automatic_login (user);
 
                         gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                                             USER_COL, user,
@@ -306,19 +340,21 @@
                      GAsyncResult *result,
                      gpointer user_data)
 {
-        UmUserPanelPrivate *d = user_data;
+        CcUserPanelPrivate *d = user_data;
         UmAccountDialog *dialog;
         GtkTreeView *tv;
         GtkTreeModel *model;
         GtkTreeSelection *selection;
         GtkTreeIter iter;
-        UmUser *current;
+        ActUser *current;
         GtkTreePath *path;
-        UmUser *user;
+        ActUser *user;
+        uid_t user_uid;
 
         dialog = UM_ACCOUNT_DIALOG (object);
         user = um_account_dialog_finish (dialog, result);
         gtk_widget_destroy (GTK_WIDGET (dialog));
+        d->account_dialog = NULL;
 
         if (user == NULL)
                 return;
@@ -326,45 +362,45 @@
         tv = (GtkTreeView *)get_widget (d, "list-treeview");
         model = gtk_tree_view_get_model (tv);
         selection = gtk_tree_view_get_selection (tv);
+        user_uid = act_user_get_uid (user);
 
         gtk_tree_model_get_iter_first (model, &iter);
         do {
                 gtk_tree_model_get (model, &iter, USER_COL, &current, -1);
-                if (user == current) {
-                        path = gtk_tree_model_get_path (model, &iter);
-                        gtk_tree_view_scroll_to_cell (tv, path, NULL, FALSE, 0.0, 0.0);
-                        gtk_tree_selection_select_path (selection, path);
-                        gtk_tree_path_free (path);
+                if (current) {
+                        if (user_uid == act_user_get_uid (current)) {
+                                path = gtk_tree_model_get_path (model, &iter);
+                                gtk_tree_view_scroll_to_cell (tv, path, NULL, FALSE, 0.0, 0.0);
+                                gtk_tree_selection_select_path (selection, path);
+                                gtk_tree_path_free (path);
+                                g_object_unref (current);
+                                break;
+                        }
                         g_object_unref (current);
-                        break;
                 }
-                if (current)
-                        g_object_unref (current);
         } while (gtk_tree_model_iter_next (model, &iter));
 
         g_object_unref (user);
 }
 
 static void
-add_user (GtkButton *button, UmUserPanelPrivate *d)
+add_user (GtkButton *button, CcUserPanelPrivate *d)
 {
-        UmAccountDialog *dialog;
-
-        dialog = um_account_dialog_new ();
-        um_account_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
-                                select_created_user, d);
+        d->account_dialog = um_account_dialog_new ();
+        um_account_dialog_show (d->account_dialog, GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
+                                d->permission, select_created_user, d);
 }
 
 static void
-delete_user_done (UmUserManager     *manager,
+delete_user_done (ActUserManager    *manager,
                   GAsyncResult      *res,
-                  UmUserPanelPrivate *d)
+                  CcUserPanelPrivate *d)
 {
         GError *error;
 
         error = NULL;
-        if (!um_user_manager_delete_user_finish (manager, res, &error)) {
-                if (!g_error_matches (error, UM_USER_MANAGER_ERROR, UM_USER_MANAGER_ERROR_PERMISSION_DENIED)) {
+        if (!act_user_manager_delete_user_finish (manager, res, &error)) {
+                if (!g_error_matches (error, ACT_USER_MANAGER_ERROR, ACT_USER_MANAGER_ERROR_PERMISSION_DENIED)) {
                         GtkWidget *dialog;
 
                         dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
@@ -387,9 +423,9 @@
 static void
 delete_user_response (GtkWidget         *dialog,
                       gint               response_id,
-                      UmUserPanelPrivate *d)
+                      CcUserPanelPrivate *d)
 {
-        UmUser *user;
+        ActUser *user;
         gboolean remove_files;
 
         gtk_widget_destroy (dialog);
@@ -406,27 +442,32 @@
 
         user = get_selected_user (d);
 
-        um_user_manager_delete_user (d->um,
-                                     user,
-                                     remove_files,
-                                     (GAsyncReadyCallback)delete_user_done,
-                                     d,
-                                     NULL);
+        /* remove autologin */
+        if (act_user_get_automatic_login (user)) {
+                act_user_set_automatic_login (user, FALSE);
+        }
+
+        act_user_manager_delete_user_async (d->um,
+                                            user,
+                                            remove_files,
+                                            NULL,
+                                            (GAsyncReadyCallback)delete_user_done,
+                                            d);
 
         g_object_unref (user);
 }
 
 static void
-delete_user (GtkButton *button, UmUserPanelPrivate *d)
+delete_user (GtkButton *button, CcUserPanelPrivate *d)
 {
-        UmUser *user;
+        ActUser *user;
         GtkWidget *dialog;
 
         user = get_selected_user (d);
         if (user == NULL) {
                 return;
         }
-        else if (um_user_get_uid (user) == getuid ()) {
+        else if (act_user_get_uid (user) == getuid ()) {
                 dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
                                                  0,
                                                  GTK_MESSAGE_INFO,
@@ -435,13 +476,13 @@
                 g_signal_connect (dialog, "response",
                                   G_CALLBACK (gtk_widget_destroy), NULL);
         }
-        else if (um_user_is_logged_in (user)) {
+        else if (act_user_is_logged_in_anywhere (user)) {
                 dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
                                                  0,
                                                  GTK_MESSAGE_INFO,
                                                  GTK_BUTTONS_CLOSE,
                                                  _("%s is still logged in"),
-                                                um_user_get_real_name (user));
+                                                act_user_get_real_name (user));
 
                 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                           _("Deleting a user while they are logged in can leave the system in an inconsistent state."));
@@ -454,7 +495,7 @@
                                                  GTK_MESSAGE_QUESTION,
                                                  GTK_BUTTONS_NONE,
                                                  _("Do you want to keep %s's files?"),
-                                                um_user_get_real_name (user));
+                                                act_user_get_real_name (user));
 
                 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                           _("It is possible to keep the home directory, mail spool and temporary files around when deleting a user account."));
@@ -508,22 +549,22 @@
 }
 
 static const gchar *
-get_password_mode_text (UmUser *user)
+get_password_mode_text (ActUser *user)
 {
         const gchar *text;
 
-        if (um_user_get_locked (user)) {
+        if (act_user_get_locked (user)) {
                 text = C_("Password mode", "Account disabled");
         }
         else {
-                switch (um_user_get_password_mode (user)) {
-                case UM_PASSWORD_MODE_REGULAR:
+                switch (act_user_get_password_mode (user)) {
+                case ACT_USER_PASSWORD_MODE_REGULAR:
                         text = get_invisible_text ();
                         break;
-                case UM_PASSWORD_MODE_SET_AT_LOGIN:
+                case ACT_USER_PASSWORD_MODE_SET_AT_LOGIN:
                         text = C_("Password mode", "To be set at next login");
                         break;
-                case UM_PASSWORD_MODE_NONE:
+                case ACT_USER_PASSWORD_MODE_NONE:
                         text = C_("Password mode", "None");
                         break;
                 default:
@@ -537,24 +578,24 @@
 static void
 autologin_changed (GObject            *object,
                    GParamSpec         *pspec,
-                   UmUserPanelPrivate *d)
+                   CcUserPanelPrivate *d)
 {
         gboolean active;
-        UmUser *user;
+        ActUser *user;
 
         active = gtk_switch_get_active (GTK_SWITCH (object));
         user = get_selected_user (d);
 
-        if (active != um_user_get_automatic_login (user)) {
-                um_user_set_automatic_login (user, active);
-                if (um_user_get_automatic_login (user)) {
+        if (active != act_user_get_automatic_login (user)) {
+                act_user_set_automatic_login (user, active);
+                if (act_user_get_automatic_login (user)) {
                         GSList *list;
                         GSList *l;
-                        list = um_user_manager_list_users (d->um);
+                        list = act_user_manager_list_users (d->um);
                         for (l = list; l != NULL; l = l->next) {
-                                UmUser *u = l->data;
-                                if (um_user_get_uid (u) != um_user_get_uid (user)) {
-                                        um_user_set_automatic_login (user, FALSE);
+                                ActUser *u = l->data;
+                                if (act_user_get_uid (u) != act_user_get_uid (user)) {
+                                        act_user_set_automatic_login (user, FALSE);
                                 }
                         }
                         g_slist_free (list);
@@ -564,21 +605,65 @@
         g_object_unref (user);
 }
 
+static gchar *
+get_login_time_text (ActUser *user)
+{
+        gchar *text, *date_str, *time_str;
+        GDateTime *date_time;
+        gint64 time;
+
+        time = act_user_get_login_time (user);
+        if (act_user_is_logged_in (user)) {
+                text = g_strdup (_("Logged in"));
+        }
+        else if (time > 0) {
+                date_time = g_date_time_new_from_unix_local (time);
+                date_str = get_smart_date (date_time);
+                time_str = g_date_time_format (date_time, "%k:%M");
+
+                text = g_strconcat (date_str, ", ", time_str, NULL);
+
+                g_date_time_unref (date_time);
+                g_free (date_str);
+                g_free (time_str);
+        }
+        else {
+                text = g_strdup ("—");
+        }
+
+        return text;
+}
+
+static gboolean
+get_autologin_possible (ActUser *user)
+{
+        gboolean locked;
+        gboolean set_password_at_login;
+
+        locked = act_user_get_locked (user);
+        set_password_at_login = (act_user_get_password_mode (user) == ACT_USER_PASSWORD_MODE_SET_AT_LOGIN);
+
+        return !(locked || set_password_at_login);
+}
+
+static void on_permission_changed (GPermission *permission, GParamSpec *pspec, gpointer data);
+
 static void
-show_user (UmUser *user, UmUserPanelPrivate *d)
+show_user (ActUser *user, CcUserPanelPrivate *d)
 {
         GtkWidget *image;
         GtkWidget *label;
         GtkWidget *label2;
         GtkWidget *label3;
         GdkPixbuf *pixbuf;
-        gchar *lang;
+        gchar *lang, *text;
         GtkWidget *widget;
         GtkTreeModel *model;
         GtkTreeIter iter;
         gboolean show, enable;
+        ActUser *current;
 
-        pixbuf = um_user_render_icon (user, FALSE, 48);
+        pixbuf = render_user_icon (user, UM_ICON_STYLE_NONE, 48);
         image = get_widget (d, "user-icon-image");
         gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
         image = get_widget (d, "user-icon-image2");
@@ -588,34 +673,32 @@
         um_photo_dialog_set_user (d->photo_dialog, user);
 
         widget = get_widget (d, "full-name-entry");
-        cc_editable_entry_set_text (CC_EDITABLE_ENTRY (widget), um_user_get_real_name (user));
-        gtk_widget_set_tooltip_text (widget, um_user_get_user_name (user));
+        cc_editable_entry_set_text (CC_EDITABLE_ENTRY (widget), act_user_get_real_name (user));
+        gtk_widget_set_tooltip_text (widget, act_user_get_user_name (user));
 
         widget = get_widget (d, "account-type-combo");
-        um_editable_combo_set_active (UM_EDITABLE_COMBO (widget), um_user_get_account_type (user));
+        um_editable_combo_set_active (UM_EDITABLE_COMBO (widget), act_user_get_account_type (user));
 
         widget = get_widget (d, "account-password-button");
         um_editable_button_set_text (UM_EDITABLE_BUTTON (widget), get_password_mode_text (user));
-        enable = um_user_is_local_account (user);
+        enable = act_user_is_local_account (user);
         gtk_widget_set_sensitive (widget, enable);
 
         widget = get_widget (d, "autologin-switch");
         g_signal_handlers_block_by_func (widget, autologin_changed, d);
-        gtk_switch_set_active (GTK_SWITCH (widget), um_user_get_automatic_login (user));
+        gtk_switch_set_active (GTK_SWITCH (widget), act_user_get_automatic_login (user));
         g_signal_handlers_unblock_by_func (widget, autologin_changed, d);
-
-        if (um_user_get_locked (user))
-                gtk_widget_set_sensitive (widget, FALSE);
+        gtk_widget_set_sensitive (widget, get_autologin_possible (user));
 
         widget = get_widget (d, "account-language-combo");
         model = um_editable_combo_get_model (UM_EDITABLE_COMBO (widget));
         cc_add_user_languages (model);
 
-        lang = g_strdup (um_user_get_language (user));
+        lang = g_strdup (act_user_get_language (user));
         if (!lang)
                 lang = cc_common_language_get_current_language ();
-        cc_common_language_get_iter_for_language (model, lang, &iter);
-        um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter);
+        if (cc_common_language_get_iter_for_language (model, lang, &iter))
+          um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter);
         g_free (lang);
 
         /* Fingerprint: show when self, possible, and local account */
@@ -623,8 +706,8 @@
         label = get_widget (d, "account-fingerprint-label");
         label2 = get_widget (d, "account-fingerprint-value-label");
         label3 = get_widget (d, "account-fingerprint-button-label");
-        show = (um_user_get_uid (user) == getuid() &&
-                um_user_is_local_account (user) &&
+        show = (act_user_get_uid (user) == getuid() &&
+                act_user_is_local_account (user) &&
                 set_fingerprint_label (label2, label3));
         gtk_widget_set_visible (label, show);
         gtk_widget_set_visible (widget, show);
@@ -634,34 +717,53 @@
         label = get_widget (d, "autologin-label");
         /* Don't show autologin option if ecryptfs is in use, because it won't
            work if user turns it on. */
-        show = um_user_is_local_account (user) &&
-               !is_using_ecryptfs (um_user_get_user_name (user));
+        show = act_user_is_local_account (user) &&
+               !is_using_ecryptfs (act_user_get_user_name (user));
         gtk_widget_set_visible (widget, show);
         gtk_widget_set_visible (label, show);
 
         /* Menu bar: show when self and have indicator schema */
         widget = get_widget (d, "show-login-name-checkbutton");
         label = get_widget (d, "show-login-name-spacer");
-        show = um_user_get_uid (user) == getuid() &&
+        show = act_user_get_uid (user) == getuid() &&
                d->indicator_session_schema;
         gtk_widget_set_visible (widget, show);
         gtk_widget_set_visible (label, show);
+
+        /* Last login: show when administrator or current user */
+        widget = get_widget (d, "last-login-value-label");
+        label = get_widget (d, "last-login-label");
+
+        current = act_user_manager_get_user_by_id (d->um, getuid ());
+        show = act_user_get_uid (user) == getuid () ||
+               act_user_get_account_type (current) == ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR;
+        if (show) {
+                text = get_login_time_text (user);
+                gtk_label_set_text (GTK_LABEL (widget), text);
+                g_free (text);
+        }
+        gtk_widget_set_visible (widget, show);
+        gtk_widget_set_visible (label, show);
+
+        enable = act_user_get_login_history (user) != NULL;
+        widget = get_widget (d, "last-login-history-button");
+        gtk_widget_set_visible (widget, show);
+        gtk_widget_set_sensitive (widget, enable);
+
+        if (d->permission != NULL)
+                on_permission_changed (d->permission, NULL, d);
 }
 
-static void on_permission_changed (GPermission *permission, GParamSpec *pspec, gpointer data);
-
 static void
-selected_user_changed (GtkTreeSelection *selection, UmUserPanelPrivate *d)
+selected_user_changed (GtkTreeSelection *selection, CcUserPanelPrivate *d)
 {
         GtkTreeModel *model;
         GtkTreeIter iter;
-        UmUser *user;
+        ActUser *user;
 
         if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
                 gtk_tree_model_get (model, &iter, USER_COL, &user, -1);
                 show_user (user, d);
-                if (d->permission != NULL)
-                        on_permission_changed (d->permission, NULL, d);
                 gtk_widget_set_sensitive (get_widget (d, "main-user-vbox"), TRUE);
                 g_object_unref (user);
         } else {
@@ -671,16 +773,17 @@
 
 static void
 change_name_done (GtkWidget          *entry,
-                  UmUserPanelPrivate *d)
+                  CcUserPanelPrivate *d)
 {
         const gchar *text;
-        UmUser *user;
+        ActUser *user;
 
         user = get_selected_user (d);
 
         text = cc_editable_entry_get_text (CC_EDITABLE_ENTRY (entry));
-        if (g_strcmp0 (text, um_user_get_real_name (user)) != 0) {
-                um_user_set_real_name (user, text);
+        if (g_strcmp0 (text, act_user_get_real_name (user)) != 0 &&
+            is_valid_name (text)) {
+                act_user_set_real_name (user, text);
         }
 
         g_object_unref (user);
@@ -688,9 +791,9 @@
 
 static void
 account_type_changed (UmEditableCombo    *combo,
-                      UmUserPanelPrivate *d)
+                      CcUserPanelPrivate *d)
 {
-        UmUser *user;
+        ActUser *user;
         GtkTreeModel *model;
         GtkTreeIter iter;
         gint account_type;
@@ -701,8 +804,8 @@
         um_editable_combo_get_active_iter (combo, &iter);
         gtk_tree_model_get (model, &iter, 1, &account_type, -1);
 
-        if (account_type != um_user_get_account_type (user)) {
-                um_user_set_account_type (user, account_type);
+        if (account_type != act_user_get_account_type (user)) {
+                act_user_set_account_type (user, account_type);
         }
 
         g_object_unref (user);
@@ -711,10 +814,10 @@
 static void
 language_response (GtkDialog         *dialog,
                    gint               response_id,
-                   UmUserPanelPrivate *d)
+                   CcUserPanelPrivate *d)
 {
         GtkWidget *combo;
-        UmUser *user;
+        ActUser *user;
         gchar *lang;
         GtkTreeModel *model;
         GtkTreeIter iter;
@@ -726,10 +829,10 @@
 
         if (response_id == GTK_RESPONSE_OK) {
                 lang = cc_language_chooser_get_language (GTK_WIDGET (dialog));
-                um_user_set_language (user, lang);
+                act_user_set_language (user, lang);
         }
         else {
-                lang = g_strdup (um_user_get_language (user));
+                lang = g_strdup (act_user_get_language (user));
                 if (!lang)
                         lang = cc_common_language_get_current_language ();
         }
@@ -745,12 +848,12 @@
 
 static void
 language_changed (UmEditableCombo    *combo,
-                  UmUserPanelPrivate *d)
+                  CcUserPanelPrivate *d)
 {
         GtkTreeModel *model;
         GtkTreeIter iter;
         gchar *lang;
-        UmUser *user;
+        ActUser *user;
 
         if (!um_editable_combo_get_active_iter (combo, &iter))
                  return;
@@ -761,8 +864,8 @@
 
         gtk_tree_model_get (model, &iter, 0, &lang, -1);
         if (lang) {
-                if (g_strcmp0 (lang, um_user_get_language (user)) != 0) {
-                        um_user_set_language (user, lang);
+                if (g_strcmp0 (lang, act_user_get_language (user)) != 0) {
+                        act_user_set_language (user, lang);
                 }
                 g_free (lang);
                 goto out;
@@ -791,9 +894,9 @@
 }
 
 static void
-change_password (GtkButton *button, UmUserPanelPrivate *d)
+change_password (GtkButton *button, CcUserPanelPrivate *d)
 {
-        UmUser *user;
+        ActUser *user;
 
         user = get_selected_user (d);
 
@@ -805,14 +908,14 @@
 }
 
 static void
-change_fingerprint (GtkButton *button, UmUserPanelPrivate *d)
+change_fingerprint (GtkButton *button, CcUserPanelPrivate *d)
 {
         GtkWidget *label, *label2;
-        UmUser *user;
+        ActUser *user;
 
         user = get_selected_user (d);
 
-        g_assert (g_strcmp0 (g_get_user_name (), um_user_get_user_name (user)) == 0);
+        g_assert (g_strcmp0 (g_get_user_name (), act_user_get_user_name (user)) == 0);
 
         label = get_widget (d, "account-fingerprint-value-label");
         label2 = get_widget (d, "account-fingerprint-button-label");
@@ -821,13 +924,26 @@
         g_object_unref (user);
 }
 
+static void
+show_history (GtkButton *button, CcUserPanelPrivate *d)
+{
+        ActUser *user;
+
+        user = get_selected_user (d);
+
+        um_history_dialog_set_user (d->history_dialog, user);
+        um_history_dialog_show (d->history_dialog, GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)));
+
+        g_object_unref (user);
+}
+
 static gint
 sort_users (GtkTreeModel *model,
             GtkTreeIter  *a,
             GtkTreeIter  *b,
             gpointer      data)
 {
-        UmUser *ua, *ub;
+        ActUser *ua, *ub;
         gint sa, sb;
         gint result;
 
@@ -841,7 +957,7 @@
                 result = 1;
         }
         else {
-                result = um_user_collate (ua, ub);
+                result = act_user_collate (ua, ub);
         }
 
         if (ua) {
@@ -871,14 +987,15 @@
 }
 
 static void
-users_loaded (UmUserManager     *manager,
-              UmUserPanelPrivate *d)
+users_loaded (ActUserManager     *manager,
+              GParamSpec         *pspec,
+              CcUserPanelPrivate *d)
 {
         GSList *list, *l;
-        UmUser *user;
+        ActUser *user;
         GtkWidget *dialog;
 
-        if (um_user_manager_no_service (d->um)) {
+        if (act_user_manager_no_service (d->um)) {
                 dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
                                                  GTK_DIALOG_MODAL,
                                                  GTK_MESSAGE_OTHER,
@@ -894,14 +1011,15 @@
                 gtk_widget_set_sensitive (d->main_box, FALSE);
         }
 
-        list = um_user_manager_list_users (d->um);
+        list = act_user_manager_list_users (d->um);
         g_debug ("Got %d users\n", g_slist_length (list));
 
         g_signal_connect (d->um, "user-changed", G_CALLBACK (user_changed), d);
+        g_signal_connect (d->um, "user-is-logged-in-changed", G_CALLBACK (user_changed), d);
 
         for (l = list; l; l = l->next) {
                 user = l->data;
-                g_debug ("adding user %s\n", um_user_get_real_name (user));
+                g_debug ("adding user %s\n", act_user_get_real_name (user));
                 user_added (d->um, user, d);
         }
         g_slist_free (list);
@@ -946,10 +1064,10 @@
                        GParamSpec  *pspec,
                        gpointer     data)
 {
-        UmUserPanelPrivate *d = data;
+        CcUserPanelPrivate *d = data;
         gboolean is_authorized;
         gboolean self_selected;
-        UmUser *user;
+        ActUser *user;
         GtkWidget *widget;
 
         user = get_selected_user (d);
@@ -958,7 +1076,7 @@
         }
 
         is_authorized = g_permission_get_allowed (G_PERMISSION (d->permission));
-        self_selected = um_user_get_uid (user) == geteuid ();
+        self_selected = act_user_get_uid (user) == geteuid ();
 
         widget = get_widget (d, "add-user-toolbutton");
         gtk_widget_set_sensitive (widget, is_authorized);
@@ -981,7 +1099,8 @@
         }
 
         widget = get_widget (d, "remove-user-toolbutton");
-        gtk_widget_set_sensitive (widget, is_authorized && !self_selected);
+        gtk_widget_set_sensitive (widget, is_authorized && !self_selected
+                                  && !would_demote_only_admin (user));
         if (is_authorized) {
                 setup_tooltip_with_embedded_icon (widget, _("Delete the selected user account"), NULL, NULL);
         }
@@ -1001,28 +1120,37 @@
                 g_object_unref (icon);
         }
 
-        if (!um_user_is_local_account (user)) {
+        if (!act_user_is_local_account (user)) {
                 um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), FALSE);
                 remove_unlock_tooltip (get_widget (d, "account-type-combo"));
                 gtk_widget_set_sensitive (GTK_WIDGET (get_widget (d, "autologin-switch")), FALSE);
                 remove_unlock_tooltip (get_widget (d, "autologin-switch"));
 
-        } else if (is_authorized && um_user_is_local_account (user)) {
-                um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), TRUE);
+        } else if (is_authorized && act_user_is_local_account (user)) {
+                if (would_demote_only_admin (user)) {
+                        um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), FALSE);
+                } else {
+                        um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), TRUE);
+                }
                 remove_unlock_tooltip (get_widget (d, "account-type-combo"));
-                gtk_widget_set_sensitive (GTK_WIDGET (get_widget (d, "autologin-switch")), TRUE);
+
+                gtk_widget_set_sensitive (GTK_WIDGET (get_widget (d, "autologin-switch")), get_autologin_possible (user));
                 remove_unlock_tooltip (get_widget (d, "autologin-switch"));
         }
         else {
                 um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), FALSE);
-                add_unlock_tooltip (get_widget (d, "account-type-combo"));
+                if (would_demote_only_admin (user)) {
+                        remove_unlock_tooltip (get_widget (d, "account-type-combo"));
+                } else {
+                        add_unlock_tooltip (get_widget (d, "account-type-combo"));
+                }
                 gtk_widget_set_sensitive (GTK_WIDGET (get_widget (d, "autologin-switch")), FALSE);
                 add_unlock_tooltip (get_widget (d, "autologin-switch"));
         }
 
         /* The full name entry: insensitive if remote or not authorized and not self */
         widget = get_widget (d, "full-name-entry");
-        if (!um_user_is_local_account (user)) {
+        if (!act_user_is_local_account (user)) {
                 cc_editable_entry_set_editable (CC_EDITABLE_ENTRY (widget), FALSE);
                 remove_unlock_tooltip (widget);
 
@@ -1060,6 +1188,7 @@
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (get_widget (d, "account-fingerprint-notebook")), 0);
         }
 
+        um_password_dialog_set_user (d->password_dialog, user);
         um_password_dialog_set_privileged (d->password_dialog, is_authorized);
 
         g_object_unref (user);
@@ -1072,7 +1201,7 @@
             GtkTreeIter  *iter,
             gpointer      search_data)
 {
-        UmUser *user;
+        ActUser *user;
         const gchar *name;
         gchar *normalized_key = NULL;
         gchar *normalized_name = NULL;
@@ -1097,10 +1226,10 @@
 
         for (i = 0; i < 2; i++) {
                 if (i == 0) {
-                        name = um_user_get_real_name (user);
+                        name = act_user_get_real_name (user);
                 }
                 else {
-                        name = um_user_get_user_name (user);
+                        name = act_user_get_user_name (user);
                 }
                 g_free (normalized_name);
                 normalized_name = g_utf8_normalize (name, -1, G_NORMALIZE_ALL);
@@ -1134,7 +1263,7 @@
                           GtkCellRenderer      *cell,
                           GtkTreeModel         *model,
                           GtkTreeIter          *iter,
-                          UmUserPanelPrivate   *d)
+                          CcUserPanelPrivate   *d)
 {
         gboolean is_autologin;
 
@@ -1148,7 +1277,7 @@
 }
 
 static void
-setup_main_window (UmUserPanelPrivate *d)
+setup_main_window (CcUserPanelPrivate *d)
 {
         GtkWidget *userlist;
         GtkTreeModel *model;
@@ -1163,10 +1292,11 @@
         GIcon *icon;
         GError *error = NULL;
         gchar *names[3];
+        gboolean loaded;
 
         userlist = get_widget (d, "list-treeview");
         store = gtk_list_store_new (NUM_USER_LIST_COLS,
-                                    UM_TYPE_USER,
+                                    ACT_TYPE_USER,
                                     GDK_TYPE_PIXBUF,
                                     G_TYPE_STRING,
                                     G_TYPE_BOOLEAN,
@@ -1183,8 +1313,6 @@
                                              match_user, NULL, NULL);
         g_object_unref (model);
 
-        g_signal_connect (d->um, "users-loaded", G_CALLBACK (users_loaded), d);
-
         gtk_widget_style_get (userlist, "expander-size", &expander_size, NULL);
         gtk_tree_view_set_level_indentation (GTK_TREE_VIEW (userlist), - (expander_size + 6));
 
@@ -1198,15 +1326,8 @@
                             -1);
         g_free (title);
 
-        title = g_strdup_printf ("<small><span foreground=\"#555555\">%s</span></small>", _("Other Accounts"));
-        gtk_list_store_append (store, &iter);
-        gtk_list_store_set (store, &iter,
-                            TITLE_COL, title,
-                            HEADING_ROW_COL, TRUE,
-                            SORT_KEY_COL, 2,
-                            AUTOLOGIN_COL, FALSE,
-                            -1);
-        g_free (title);
+        d->other_accounts = 0;
+        d->other_iter = NULL;
 
         column = gtk_tree_view_column_new ();
         cell = gtk_cell_renderer_pixbuf_new ();
@@ -1270,6 +1391,10 @@
         g_signal_connect (button, "clicked",
                           G_CALLBACK (change_fingerprint), d);
 
+        button = get_widget (d, "last-login-history-button");
+        g_signal_connect (button, "clicked",
+                          G_CALLBACK (show_history), d);
+
         d->permission = (GPermission *)polkit_permission_new_sync (USER_ACCOUNTS_PERMISSION, NULL, NULL, &error);
         if (d->permission != NULL) {
                 g_signal_connect (d->permission, "notify",
@@ -1295,20 +1420,26 @@
                                           "*",
                                           icon);
         g_object_unref (icon);
+
+        g_object_get (d->um, "is-loaded", &loaded, NULL);
+        if (loaded)
+                users_loaded (d->um, NULL, d);
+        else
+                g_signal_connect (d->um, "notify::is-loaded", G_CALLBACK (users_loaded), d);
 }
 
 static void
-um_user_panel_init (UmUserPanel *self)
+cc_user_panel_init (CcUserPanel *self)
 {
-        UmUserPanelPrivate *d;
+        CcUserPanelPrivate *d;
         GError *error;
         volatile GType type G_GNUC_UNUSED;
-        const gchar *filename;
         GtkWidget *button;
         GtkStyleContext *context;
         GSettingsSchema *schema;
 
         d = self->priv = UM_USER_PANEL_PRIVATE (self);
+        g_resources_register (um_get_resource ());
 
         /* register types that the builder might need */
         type = um_editable_button_get_type ();
@@ -1318,25 +1449,24 @@
         gtk_widget_set_size_request (GTK_WIDGET (self), -1, 350);
 
         d->builder = gtk_builder_new ();
-        d->um = um_user_manager_ref_default ();
+        d->um = act_user_manager_get_default ();
 
-        filename = UIDIR "/user-accounts-dialog.ui";
-        if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
-                filename = "data/user-accounts-dialog.ui";
-        }
         error = NULL;
-        if (!gtk_builder_add_from_file (d->builder, filename, &error)) {
+        if (!gtk_builder_add_from_resource (d->builder,
+                                            "/org/gnome/control-center/user-accounts/user-accounts-dialog.ui",
+                                            &error)) {
                 g_error ("%s", error->message);
                 g_error_free (error);
                 return;
         }
 
-        setup_main_window (d);
         d->password_dialog = um_password_dialog_new ();
         button = get_widget (d, "user-icon-button");
         d->photo_dialog = um_photo_dialog_new (button);
         d->main_box = get_widget (d, "accounts-vbox");
         gtk_widget_reparent (d->main_box, GTK_WIDGET (self));
+        d->history_dialog = um_history_dialog_new ();
+        setup_main_window (d);
 
         context = gtk_widget_get_style_context (get_widget (d, "list-scrolledwindow"));
         gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
@@ -1352,12 +1482,12 @@
 }
 
 static void
-um_user_panel_dispose (GObject *object)
+cc_user_panel_dispose (GObject *object)
 {
-        UmUserPanelPrivate *priv = UM_USER_PANEL (object)->priv;
+        CcUserPanelPrivate *priv = UM_USER_PANEL (object)->priv;
 
         if (priv->um) {
-                g_object_unref (priv->um);
+                g_signal_handlers_disconnect_by_data (priv->um, priv);
                 priv->um = NULL;
         }
         if (priv->builder) {
@@ -1372,6 +1502,14 @@
                 um_photo_dialog_free (priv->photo_dialog);
                 priv->photo_dialog = NULL;
         }
+        if (priv->history_dialog) {
+                um_history_dialog_free (priv->history_dialog);
+                priv->history_dialog = NULL;
+        }
+        if (priv->account_dialog) {
+                gtk_dialog_response (GTK_DIALOG (priv->account_dialog), GTK_RESPONSE_DELETE_EVENT);
+                priv->account_dialog = NULL;
+        }
         if (priv->language_chooser) {
                 gtk_widget_destroy (priv->language_chooser);
                 priv->language_chooser = NULL;
@@ -1380,19 +1518,23 @@
                 g_object_unref (priv->permission);
                 priv->permission = NULL;
         }
-        G_OBJECT_CLASS (um_user_panel_parent_class)->dispose (object);
+        if (priv->other_iter) {
+                gtk_tree_iter_free (priv->other_iter);
+                priv->other_iter = NULL;
+        }
+        G_OBJECT_CLASS (cc_user_panel_parent_class)->dispose (object);
 }
 
 static GPermission *
-um_user_panel_get_permission (CcPanel *panel)
+cc_user_panel_get_permission (CcPanel *panel)
 {
-        UmUserPanelPrivate *priv = UM_USER_PANEL (panel)->priv;
+        CcUserPanelPrivate *priv = UM_USER_PANEL (panel)->priv;
 
         return priv->permission;
 }
 
 static const char *
-um_user_panel_get_help_uri (CcPanel *panel)
+cc_user_panel_get_help_uri (CcPanel *panel)
 {
  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
    return "help:ubuntu-help/user-accounts";
@@ -1401,23 +1543,23 @@
 }
 
 static void
-um_user_panel_class_init (UmUserPanelClass *klass)
+cc_user_panel_class_init (CcUserPanelClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
         CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
 
-        object_class->dispose = um_user_panel_dispose;
-
-        panel_class->get_permission = um_user_panel_get_permission;
-        panel_class->get_help_uri = um_user_panel_get_help_uri;
-
-        g_type_class_add_private (klass, sizeof (UmUserPanelPrivate));
+        object_class->dispose = cc_user_panel_dispose;
+
+        panel_class->get_permission = cc_user_panel_get_permission;
+        panel_class->get_help_uri = cc_user_panel_get_help_uri;
+
+        g_type_class_add_private (klass, sizeof (CcUserPanelPrivate));
 }
 
 void
-um_user_panel_register (GIOModule *module)
+cc_user_panel_register (GIOModule *module)
 {
-        um_user_panel_register_type (G_TYPE_MODULE (module));
+        cc_user_panel_register_type (G_TYPE_MODULE (module));
         g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
                                         UM_TYPE_USER_PANEL, "user-accounts", 0);
 }
 
=== modified file 'panels/user-accounts/um-user-panel.h'
--- panels/user-accounts/um-user-panel.h	2012-09-06 23:07:09 +0000
+++ panels/user-accounts/um-user-panel.h	2014-02-24 09:46:44 +0000
@@ -26,33 +26,31 @@
 
 G_BEGIN_DECLS
 
-#define UM_TYPE_USER_PANEL um_user_panel_get_type()
+#define UM_TYPE_USER_PANEL cc_user_panel_get_type()
 
-#define UM_USER_PANEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UM_TYPE_USER_PANEL, UmUserPanel))
-#define UM_USER_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_USER_PANEL, UmUserPanelClass))
+#define UM_USER_PANEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UM_TYPE_USER_PANEL, CcUserPanel))
+#define UM_USER_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_USER_PANEL, CcUserPanelClass))
 #define UM_IS_USER_PANEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UM_TYPE_USER_PANEL))
 #define UM_IS_USER_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UM_TYPE_USER_PANEL))
-#define UM_USER_PANEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UM_TYPE_USER_PANEL, UmUserPanelClass))
-
-typedef struct _UmUserPanel UmUserPanel;
-typedef struct _UmUserPanelClass UmUserPanelClass;
-typedef struct _UmUserPanelPrivate UmUserPanelPrivate;
-
-struct _UmUserPanel
+#define UM_USER_PANEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UM_TYPE_USER_PANEL, CcUserPanelClass))
+
+typedef struct _CcUserPanel CcUserPanel;
+typedef struct _CcUserPanelClass CcUserPanelClass;
+typedef struct _CcUserPanelPrivate CcUserPanelPrivate;
+
+struct _CcUserPanel
 {
   CcPanel parent;
 
-  UmUserPanelPrivate *priv;
+  CcUserPanelPrivate *priv;
 };
 
-struct _UmUserPanelClass
+struct _CcUserPanelClass
 {
   CcPanelClass parent_class;
 };
 
-GType um_user_panel_get_type (void) G_GNUC_CONST;
-
-void  um_user_panel_register (GIOModule *module);
+GType cc_user_panel_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
 
=== removed file 'panels/user-accounts/um-user.c'
--- panels/user-accounts/um-user.c	2013-11-28 04:46:27 +0000
+++ panels/user-accounts/um-user.c	1970-01-01 00:00:00 +0000
@@ -1,991 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2004-2005 James M. Cape <[e-mail]>.
-  * Copyright (C) 2007-2008 William Jon McCann <[e-mail]>
-  * Copyright (C) 2009 Red Hat, Inc.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * 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, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#define _XOPEN_SOURCE
-
-#include "config.h"
-
-#include <float.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-
-#include <gio/gunixoutputstream.h>
-
-#include "um-user.h"
-#include "um-account-type.h"
-#include "um-utils.h"
-
-
- #define UM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_USER, UmUserClass))
- #define UM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UM_TYPE_USER))
-#define UM_USER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), UM_TYPE_USER, UmUserClass))
-
-#define MAX_FILE_SIZE     65536
-
-typedef struct {
-        uid_t           uid;
-        gchar          *user_name;
-        gchar          *real_name;
-        gint            account_type;
-        gint            password_mode;
-        gchar          *password_hint;
-        gchar          *email;
-        gchar          *language;
-        gchar          *location;
-        guint64         login_frequency;
-        gchar          *icon_file;
-        gboolean        locked;
-        gboolean        automatic_login;
-        gboolean        system_account;
-        gboolean        local_account;
-} UserProperties;
-
-static void
-user_properties_free (UserProperties *props)
-{
-        g_free (props->user_name);
-        g_free (props->real_name);
-        g_free (props->password_hint);
-        g_free (props->email);
-        g_free (props->language);
-        g_free (props->location);
-        g_free (props->icon_file);
-        g_free (props);
-}
-
-static UserProperties *
-user_properties_get (GDBusConnection *bus,
-                     const gchar     *object_path)
-{
-        GVariant *result;
-        GVariantIter *iter;
-        gchar *key;
-        GVariant *value;
-        UserProperties *props;
-        GError *error = NULL;
-
-        result = g_dbus_connection_call_sync (bus,
-                                              "org.freedesktop.Accounts",
-                                              object_path,
-                                              "org.freedesktop.DBus.Properties",
-                                              "GetAll",
-                                              g_variant_new ("(s)", "org.freedesktop.Accounts.User"),
-                                              G_VARIANT_TYPE ("(a{sv})"),
-                                              G_DBUS_CALL_FLAGS_NONE,
-                                              -1,
-                                              NULL,
-                                              &error);
-        if (!result) {
-                g_debug ("Error calling GetAll() when retrieving properties for %s: %s", object_path, error->message);
-                g_error_free (error);
-                return NULL;
-        }
-
-        /* Add some defaults that may not be received from some AccountsService versions */
-        props = g_new0 (UserProperties, 1);
-        props->local_account = TRUE;
-
-        g_variant_get (result, "(a{sv})", &iter);
-        while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) {
-                if (strcmp (key, "Uid") == 0) {
-                        g_variant_get (value, "t", &props->uid);
-                }
-                else if (strcmp (key, "UserName") == 0) {
-                        g_variant_get (value, "s", &props->user_name);
-                }
-                else if (strcmp (key, "RealName") == 0) {
-                        g_variant_get (value, "s", &props->real_name);
-                }
-                else if (strcmp (key, "AccountType") == 0) {
-                        g_variant_get (value, "i", &props->account_type);
-                }
-                else if (strcmp (key, "Email") == 0) {
-                        g_variant_get (value, "s", &props->email);
-                }
-                else if (strcmp (key, "Language") == 0) {
-                        g_variant_get (value, "s", &props->language);
-                }
-                else if (strcmp (key, "Location") == 0) {
-                        g_variant_get (value, "s", &props->location);
-                }
-                else if (strcmp (key, "LoginFrequency") == 0) {
-                        g_variant_get (value, "t", &props->login_frequency);
-                }
-                else if (strcmp (key, "IconFile") == 0) {
-                        g_variant_get (value, "s", &props->icon_file);
-                }
-                else if (strcmp (key, "Locked") == 0) {
-                        g_variant_get (value, "b", &props->locked);
-                }
-                else if (strcmp (key, "AutomaticLogin") == 0) {
-                        g_variant_get (value, "b", &props->automatic_login);
-                }
-                else if (strcmp (key, "SystemAccount") == 0) {
-                        g_variant_get (value, "b", &props->system_account);
-                }
-                else if (strcmp (key, "LocalAccount") == 0) {
-                        g_variant_get (value, "b", &props->local_account);
-                }
-                else if (strcmp (key, "PasswordMode") == 0) {
-                        g_variant_get (value, "i", &props->password_mode);
-                }
-                else if (strcmp (key, "PasswordHint") == 0) {
-                        g_variant_get (value, "s", &props->password_hint);
-                }
-                else if (strcmp (key, "HomeDirectory") == 0) {
-                        /* ignore */
-                }
-                else if (strcmp (key, "Shell") == 0) {
-                        /* ignore */
-                }
-                else {
-                        g_debug ("unhandled property %s", key);
-                }
-        }
-  
-        g_variant_iter_free (iter);
-        g_variant_unref (result);
-
-        return props;
-}
-
-
-struct _UmUser {
-        GObject         parent;
-
-        GDBusConnection *bus;
-        GDBusProxy      *proxy;
-        gchar           *object_path;
-
-        UserProperties  *props;
-
-        gchar           *display_name;
-};
-
-typedef struct _UmUserClass
-{
-        GObjectClass parent_class;
-} UmUserClass;
-
-enum {
-        CHANGED,
-        LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static void um_user_finalize (GObject *object);
-
-G_DEFINE_TYPE (UmUser, um_user, G_TYPE_OBJECT)
-
-static void
-um_user_class_init (UmUserClass *class)
-{
-        GObjectClass *gobject_class;
-
-        gobject_class = G_OBJECT_CLASS (class);
-
-        gobject_class->finalize = um_user_finalize;
-
-        signals[CHANGED] = g_signal_new ("changed",
-                                         G_TYPE_FROM_CLASS (class),
-                                         G_SIGNAL_RUN_LAST,
-                                         0,
-                                         NULL, NULL,
-                                         g_cclosure_marshal_VOID__VOID,
-                                         G_TYPE_NONE, 0);
-}
-
-
-static void
-um_user_init (UmUser *user)
-{
-}
-
-static void
-um_user_finalize (GObject *object)
-{
-        UmUser *user;
-
-        user = UM_USER (object);
-
-        g_free (user->display_name);
-
-        g_object_unref (user->bus);
-        g_free (user->object_path);
-
-        if (user->proxy != NULL)
-                g_object_unref (user->proxy);
-
-        if (user->props != NULL)
-                user_properties_free (user->props);
-
-        (*G_OBJECT_CLASS (um_user_parent_class)->finalize) (object);
-}
-
-uid_t
-um_user_get_uid (UmUser *user)
-{
-        g_return_val_if_fail (UM_IS_USER (user), -1);
-
-        return user->props->uid;
-}
-
-const gchar *
-um_user_get_real_name (UmUser *user)
-{
-        g_return_val_if_fail (UM_IS_USER (user), NULL);
-
-        return user->props->real_name;
-}
-
-const gchar *
-um_user_get_display_name (UmUser *user)
-{
-        g_return_val_if_fail (UM_IS_USER (user), NULL);
-
-        if (user->display_name)
-                return user->display_name;
-        if (user->props->real_name &&
-            *user->props->real_name != '\0')
-                return user->props->real_name;
-
-        return user->props->user_name;
-}
-
-const gchar *
-um_user_get_user_name (UmUser *user)
-{
-        g_return_val_if_fail (UM_IS_USER (user), NULL);
-
-        return user->props->user_name;
-}
-
-gint
-um_user_get_account_type (UmUser *user)
-{
-        g_return_val_if_fail (UM_IS_USER (user), UM_ACCOUNT_TYPE_STANDARD);
-
-        return user->props->account_type;
-}
-
-gulong
-um_user_get_login_frequency (UmUser *user)
-{
-        g_return_val_if_fail (UM_IS_USER (user), 0);
-
-        return user->props->login_frequency;
-}
-
-gint
-um_user_collate (UmUser *user1,
-                  UmUser *user2)
-{
-        const char *str1;
-        const char *str2;
-        gulong      num1;
-        gulong      num2;
-
-        g_return_val_if_fail (UM_IS_USER (user1), 0);
-        g_return_val_if_fail (UM_IS_USER (user2), 0);
-
-        num1 = user1->props->login_frequency;
-        num2 = user2->props->login_frequency;
-        if (num1 > num2) {
-                return -1;
-        }
-
-        if (num1 < num2) {
-                return 1;
-        }
-
-        /* if login frequency is equal try names */
-        if (user1->props->real_name != NULL) {
-                str1 = user1->props->real_name;
-        } else {
-                str1 = user1->props->user_name;
-        }
-
-        if (user2->props->real_name != NULL) {
-                str2 = user2->props->real_name;
-        } else {
-                str2 = user2->props->user_name;
-        }
-
-        if (str1 == NULL && str2 != NULL) {
-                return -1;
-        }
-
-        if (str1 != NULL && str2 == NULL) {
-                return 1;
-        }
-
-        if (str1 == NULL && str2 == NULL) {
-                return 0;
-        }
-
-        return g_utf8_collate (str1, str2);
-}
-
-static gboolean
-check_user_file (const char *filename,
-                 gssize      max_file_size)
-{
-        struct stat fileinfo;
-
-        if (max_file_size < 0) {
-                max_file_size = G_MAXSIZE;
-        }
-
-        /* Exists/Readable? */
-        if (stat (filename, &fileinfo) < 0) {
-                g_debug ("File does not exist");
-                return FALSE;
-        }
-
-        /* Is a regular file */
-        if (G_UNLIKELY (!S_ISREG (fileinfo.st_mode))) {
-                g_debug ("File is not a regular file");
-                return FALSE;
-        }
-
-        /* Size is kosher? */
-        if (G_UNLIKELY (fileinfo.st_size > max_file_size)) {
-                g_debug ("File is too large");
-                return FALSE;
-        }
-
-        return TRUE;
-}
-
-static GdkPixbuf *
-frame_pixbuf (GdkPixbuf *source)
-{
-        GdkPixbuf       *dest;
-        cairo_t         *cr;
-        cairo_surface_t *surface;
-        guint            w;
-        guint            h;
-        int              frame_width;
-        double           radius;
-
-        frame_width = 2;
-
-        w = gdk_pixbuf_get_width (source) + frame_width * 2;
-        h = gdk_pixbuf_get_height (source) + frame_width * 2;
-        radius = w / 10;
-
-        surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                              w, h);
-        cr = cairo_create (surface);
-        cairo_surface_destroy (surface);
-
-        /* set up image */
-        cairo_rectangle (cr, 0, 0, w, h);
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
-        cairo_fill (cr);
-
-        rounded_rectangle (cr, 1.0, 0.5, 0.5, radius, w - 1, h - 1);
-        cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.3);
-        cairo_fill_preserve (cr);
-
-        gdk_cairo_set_source_pixbuf (cr, source, frame_width, frame_width);
-        cairo_fill (cr);
-
-        dest = gdk_pixbuf_get_from_surface (surface, 0, 0, w, h);
-
-        cairo_destroy (cr);
-
-        return dest;
-}
-
-GdkPixbuf *
-um_user_render_icon (UmUser   *user,
-                     gboolean  with_frame,
-                     gint      icon_size)
-{
-        GdkPixbuf    *pixbuf;
-        GdkPixbuf    *framed;
-        gboolean      res;
-        GError       *error;
-
-        g_return_val_if_fail (UM_IS_USER (user), NULL);
-        g_return_val_if_fail (icon_size > 12, NULL);
-
-        pixbuf = NULL;
-        if (user->props->icon_file) {
-                res = check_user_file (user->props->icon_file,
-                                       MAX_FILE_SIZE);
-                if (res) {
-                        pixbuf = gdk_pixbuf_new_from_file_at_size (user->props->icon_file,
-                                                                   icon_size,
-                                                                   icon_size,
-                                                                   NULL);
-                }
-                else {
-                        pixbuf = NULL;
-                }
-        }
-
-        if (pixbuf != NULL) {
-                goto out;
-        }
-
-        error = NULL;
-        pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-
-                                           "avatar-default",