aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog48
-rw-r--r--Makefile.in4
-rw-r--r--NEWS22
-rw-r--r--aclocal.m46
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.in2
-rw-r--r--data/extra-sessions/Makefile.in2
-rw-r--r--data/icons/16x16/Makefile.in2
-rw-r--r--data/icons/16x16/actions/Makefile.in2
-rw-r--r--data/icons/16x16/status/Makefile.in2
-rw-r--r--data/icons/22x22/Makefile.in2
-rw-r--r--data/icons/22x22/actions/Makefile.in2
-rw-r--r--data/icons/22x22/status/Makefile.in2
-rw-r--r--data/icons/24x24/Makefile.in2
-rw-r--r--data/icons/24x24/actions/Makefile.in2
-rw-r--r--data/icons/24x24/status/Makefile.in2
-rw-r--r--data/icons/32x32/Makefile.in2
-rw-r--r--data/icons/32x32/actions/Makefile.in2
-rw-r--r--data/icons/32x32/status/Makefile.in2
-rw-r--r--data/icons/Makefile.in2
-rw-r--r--data/icons/scalable/Makefile.in2
-rw-r--r--data/icons/scalable/actions/Makefile.in2
-rw-r--r--data/icons/scalable/status/Makefile.in2
-rw-r--r--src/Makefile.in2
-rw-r--r--src/dbus-accounts.c2
-rw-r--r--src/dbus-accounts.h2
-rw-r--r--src/dbus-consolekit-manager.c2
-rw-r--r--src/dbus-consolekit-manager.h2
-rw-r--r--src/dbus-consolekit-seat.c2
-rw-r--r--src/dbus-consolekit-seat.h2
-rw-r--r--src/dbus-consolekit-session.c2
-rw-r--r--src/dbus-consolekit-session.h2
-rw-r--r--src/dbus-display-manager.c2
-rw-r--r--src/dbus-display-manager.h2
-rw-r--r--src/dbus-upower.c2
-rw-r--r--src/dbus-upower.h2
-rw-r--r--src/dbus-user.c2
-rw-r--r--src/dbus-user.h2
-rw-r--r--src/indicator-session.c66
-rw-r--r--src/session-menu-mgr.c13
-rw-r--r--src/shared-names.h4
-rw-r--r--tests/Makefile.in2
43 files changed, 109 insertions, 126 deletions
diff --git a/ChangeLog b/ChangeLog
index 59cdff4..4f5e0c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,53 @@
# Generated by Makefile. Do not edit.
+2012-10-03 Charles Kerr <charles.kerr@canonical.com>
+
+ 12.10.4
+
+2012-10-01 Ted Gould <ted@gould.cx>
+
+ Remove the custom menu type for the restart entry. Fixes: https://bugs.launchpad.net/bugs/1058148. Approved by Charles Kerr, Lars Uebernickel.
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Drop the defines
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Make the restart item a normal one
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Removing handling for the restart item type
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Attaching bug
+
+2012-10-01 Ted Gould <ted@gould.cx>
+
+ Move UPower settings init until after the items are created. Approved by Charles Kerr, Lars Uebernickel.
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Move the upower init to after the items are created
+
+2012-10-01 Ted Gould <ted@gould.cx>
+
+ Add more files to be ignored. Approved by Charles Kerr, Lars Uebernickel.
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Tarballs now have multiple numbers in the revision
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Ignoring the test service
+
+2012-09-28 Ted Gould <ted@gould.cx>
+
+ Ignoring the generated dbus source files
+
2012-09-19 Charles Kerr <charles.kerr@canonical.com>
12.10.3
diff --git a/Makefile.in b/Makefile.in
index b04b06b..b9f5078 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -658,7 +658,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff --git a/NEWS b/NEWS
index 6e34589..de1eae9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,18 +1,22 @@
+12.10.4
+ - The Restart menuitem wasn't accessible via the HUD. (LP: #1058148)
+ - Fix g_critical() warnings on startup caused by updating menuitems too soon
+
12.10.3
- - By default, use 'Shut Down' instead of 'Switch Off' (lp: #1029036)
- - 12.10.0 showed "Guest user" even when disabled in lightdm (lp: #1049902)
- - Provide a fallback if theme's missing the session menu icon (lp: #1029036)
+ - By default, use 'Shut Down' instead of 'Switch Off' (LP: #1029036)
+ - 12.10.0 showed "Guest user" even when disabled in lightdm (LP: #1049902)
+ - Provide a fallback if theme's missing the session menu icon (LP: #1029036)
- Fix some strings that hadn't been marked for translation
12.10.2
- - Add an 'Online Accounts' menuitem (lp: #1044464)
- - Add disposition highlighting to the indicator icon (lp: #1044015)
- - Fix build issue in the unit tests directory (lp: #1040678)
- - Remove the Restart button from the shutdown dialog (lp: #1027952)
+ - Add an 'Online Accounts' menuitem (LP: #1044464)
+ - Add disposition highlighting to the indicator icon (LP: #1044015)
+ - Fix build issue in the unit tests directory (LP: #1040678)
+ - Remove the Restart button from the shutdown dialog (LP: #1027952)
12.10.1
- - Fix user menuitems' icon sizes (lp: #1024395)
- - Make explicit in configure.ac that we need a newer glib (lp: #1023533)
+ - Fix user menuitems' icon sizes (LP: #1024395)
+ - Make explicit in configure.ac that we need a newer glib (LP: #1023533)
- Separate testing-strings into a separate Makefile.am for reuse
12.10.0
diff --git a/aclocal.m4 b/aclocal.m4
index a55ad0f..8909958 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -2716,7 +2716,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.5], [],
+m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -2732,7 +2732,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.5])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/configure b/configure
index d0b6a64..04cb9ba 100755
--- a/configure
+++ b/configure
@@ -3109,7 +3109,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-session
- VERSION=12.10.3
+ VERSION=12.10.4
cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index c948b17..3de4063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 12.10.3)
+AM_INIT_AUTOMAKE(indicator-session, 12.10.4)
AM_MAINTAINER_MODE
diff --git a/data/Makefile.in b/data/Makefile.in
index b0613dd..8610191 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/extra-sessions/Makefile.in b/data/extra-sessions/Makefile.in
index 1efccde..74fdb05 100644
--- a/data/extra-sessions/Makefile.in
+++ b/data/extra-sessions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
index d6443fe..c5e7b0c 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/16x16/actions/Makefile.in b/data/icons/16x16/actions/Makefile.in
index 260a70d..705c311 100644
--- a/data/icons/16x16/actions/Makefile.in
+++ b/data/icons/16x16/actions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/16x16/status/Makefile.in b/data/icons/16x16/status/Makefile.in
index 7c2af6e..1330a96 100644
--- a/data/icons/16x16/status/Makefile.in
+++ b/data/icons/16x16/status/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
index 4368c25..7bc8ac8 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/22x22/actions/Makefile.in b/data/icons/22x22/actions/Makefile.in
index e5a4bad..f48551f 100644
--- a/data/icons/22x22/actions/Makefile.in
+++ b/data/icons/22x22/actions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/22x22/status/Makefile.in b/data/icons/22x22/status/Makefile.in
index fec4ac4..e7f68aa 100644
--- a/data/icons/22x22/status/Makefile.in
+++ b/data/icons/22x22/status/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in
index 91f2365..59b771c 100644
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/24x24/actions/Makefile.in b/data/icons/24x24/actions/Makefile.in
index e7f0fd6..8f3ed80 100644
--- a/data/icons/24x24/actions/Makefile.in
+++ b/data/icons/24x24/actions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/24x24/status/Makefile.in b/data/icons/24x24/status/Makefile.in
index 61d5076..c08ab97 100644
--- a/data/icons/24x24/status/Makefile.in
+++ b/data/icons/24x24/status/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in
index c7a1ac2..afe7fab 100644
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/32x32/actions/Makefile.in b/data/icons/32x32/actions/Makefile.in
index c83a229..7d23ccd 100644
--- a/data/icons/32x32/actions/Makefile.in
+++ b/data/icons/32x32/actions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/32x32/status/Makefile.in b/data/icons/32x32/status/Makefile.in
index 8af90ca..9c18826 100644
--- a/data/icons/32x32/status/Makefile.in
+++ b/data/icons/32x32/status/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index a64f7bc..1dd1c43 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/scalable/Makefile.in b/data/icons/scalable/Makefile.in
index 9632cb3..175b35d 100644
--- a/data/icons/scalable/Makefile.in
+++ b/data/icons/scalable/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/scalable/actions/Makefile.in b/data/icons/scalable/actions/Makefile.in
index 205bcd8..7c4e608 100644
--- a/data/icons/scalable/actions/Makefile.in
+++ b/data/icons/scalable/actions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/scalable/status/Makefile.in b/data/icons/scalable/status/Makefile.in
index 625e9ea..1c7b655 100644
--- a/data/icons/scalable/status/Makefile.in
+++ b/data/icons/scalable/status/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/Makefile.in b/src/Makefile.in
index e920d93..7d61f64 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/dbus-accounts.c b/src/dbus-accounts.c
index 17b28cd..37fd93c 100644
--- a/src/dbus-accounts.c
+++ b/src/dbus-accounts.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-accounts.h b/src/dbus-accounts.h
index 0c9dd2f..23404c0 100644
--- a/src/dbus-accounts.h
+++ b/src/dbus-accounts.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-consolekit-manager.c b/src/dbus-consolekit-manager.c
index d934d2e..0f57648 100644
--- a/src/dbus-consolekit-manager.c
+++ b/src/dbus-consolekit-manager.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-consolekit-manager.h b/src/dbus-consolekit-manager.h
index 9cac7b3..59d3e61 100644
--- a/src/dbus-consolekit-manager.h
+++ b/src/dbus-consolekit-manager.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-consolekit-seat.c b/src/dbus-consolekit-seat.c
index 8bb8d0e..651eb06 100644
--- a/src/dbus-consolekit-seat.c
+++ b/src/dbus-consolekit-seat.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-consolekit-seat.h b/src/dbus-consolekit-seat.h
index 787d0ce..2f153ed 100644
--- a/src/dbus-consolekit-seat.h
+++ b/src/dbus-consolekit-seat.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-consolekit-session.c b/src/dbus-consolekit-session.c
index 85ed255..c3c6642 100644
--- a/src/dbus-consolekit-session.c
+++ b/src/dbus-consolekit-session.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-consolekit-session.h b/src/dbus-consolekit-session.h
index 68cb565..0c1cb93 100644
--- a/src/dbus-consolekit-session.h
+++ b/src/dbus-consolekit-session.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-display-manager.c b/src/dbus-display-manager.c
index ed08688..b810349 100644
--- a/src/dbus-display-manager.c
+++ b/src/dbus-display-manager.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-display-manager.h b/src/dbus-display-manager.h
index 8a8177b..2528e7b 100644
--- a/src/dbus-display-manager.h
+++ b/src/dbus-display-manager.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-upower.c b/src/dbus-upower.c
index af91304..32f8fa0 100644
--- a/src/dbus-upower.c
+++ b/src/dbus-upower.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-upower.h b/src/dbus-upower.h
index 7360447..8da838b 100644
--- a/src/dbus-upower.h
+++ b/src/dbus-upower.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-user.c b/src/dbus-user.c
index 785abcc..38de6e7 100644
--- a/src/dbus-user.c
+++ b/src/dbus-user.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/dbus-user.h b/src/dbus-user.h
index 48fa3a5..e7cc313 100644
--- a/src/dbus-user.h
+++ b/src/dbus-user.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.33.12. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.34.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/src/indicator-session.c b/src/indicator-session.c
index 06a5a7b..c100d78 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -80,10 +80,6 @@ static gboolean new_user_item (DbusmenuMenuitem * newitem,
DbusmenuMenuitem * parent,
DbusmenuClient * client,
gpointer user_data);
-static gboolean build_restart_item (DbusmenuMenuitem * newitem,
- DbusmenuMenuitem * parent,
- DbusmenuClient * client,
- gpointer user_data);
static void on_menu_layout_updated (DbusmenuClient * client, IndicatorSession * session);
static void indicator_session_update_icon_callback (GtkWidget * widget, gpointer callback_data);
static void indicator_session_update_icon_and_a11y (IndicatorSession * self);
@@ -168,9 +164,6 @@ indicator_session_init (IndicatorSession *self)
dbusmenu_client_add_type_handler (self->menu_client,
USER_ITEM_TYPE,
new_user_item);
- dbusmenu_client_add_type_handler (self->menu_client,
- RESTART_ITEM_TYPE,
- build_restart_item);
dbusmenu_gtkclient_set_accel_group (DBUSMENU_GTKCLIENT(self->menu_client),
gtk_accel_group_new());
}
@@ -316,7 +309,6 @@ new_user_item (DbusmenuMenuitem * newitem,
return TRUE;
}
-
static void
user_real_name_get_cb (GObject * obj, GAsyncResult * res, gpointer user_data)
{
@@ -357,64 +349,6 @@ receive_signal (GDBusProxy * proxy,
}
}
-
-
-
-static void
-restart_property_change (DbusmenuMenuitem * item,
- const gchar * property,
- GVariant * variant,
- gpointer user_data)
-{
- DbusmenuGtkClient * client = DBUSMENU_GTKCLIENT(user_data);
- GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(client, item);
-
- if (g_strcmp0(property, RESTART_ITEM_LABEL) == 0) {
- gtk_menu_item_set_label(gmi, g_variant_get_string(variant, NULL));
- } else if (g_strcmp0(property, RESTART_ITEM_ICON) == 0) {
- GtkWidget * image = gtk_image_menu_item_get_image(GTK_IMAGE_MENU_ITEM(gmi));
-
- GIcon * gicon = g_themed_icon_new_with_default_fallbacks(g_variant_get_string(variant, NULL));
- if (image == NULL) {
- image = gtk_image_new_from_gicon(gicon, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), image);
- } else {
- gtk_image_set_from_gicon(GTK_IMAGE(image), gicon, GTK_ICON_SIZE_MENU);
- }
- g_object_unref(G_OBJECT(gicon));
- }
- return;
-}
-
-static gboolean
-build_restart_item (DbusmenuMenuitem * newitem,
- DbusmenuMenuitem * parent,
- DbusmenuClient * client,
- gpointer user_data)
-{
- GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
- if (gmi == NULL) {
- return FALSE;
- }
-
- dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
-
- g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(restart_property_change), client);
-
- GVariant * variant;
- variant = dbusmenu_menuitem_property_get_variant(newitem, RESTART_ITEM_LABEL);
- if (variant != NULL) {
- restart_property_change(newitem, RESTART_ITEM_LABEL, variant, client);
- }
-
- variant = dbusmenu_menuitem_property_get_variant(newitem, RESTART_ITEM_ICON);
- if (variant != NULL) {
- restart_property_change(newitem, RESTART_ITEM_ICON, variant, client);
- }
-
- return TRUE;
-}
-
static void
indicator_session_update_users_label (IndicatorSession * self,
const gchar * name)
diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c
index f6cd038..f5b5bcf 100644
--- a/src/session-menu-mgr.c
+++ b/src/session-menu-mgr.c
@@ -318,7 +318,6 @@ init_upower_proxy (SessionMenuMgr * mgr)
g_clear_error (&error);
}
- on_upower_properties_changed (mgr);
g_signal_connect_swapped (mgr->upower_proxy, "changed",
G_CALLBACK(on_upower_properties_changed), mgr);
}
@@ -491,8 +490,7 @@ update_confirmation_labels (SessionMenuMgr * mgr)
mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Shut Down\342\200\246")
: _("Shut Down"));
- dbusmenu_menuitem_property_set (mgr->restart_mi, RESTART_ITEM_LABEL,
- confirm_needed ? _("Restart\342\200\246")
+ mi_set_label (mgr->restart_mi, confirm_needed ? _("Restart\342\200\246")
: _("Restart"));
}
@@ -516,9 +514,7 @@ build_session_menuitems (SessionMenuMgr* mgr)
g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK(action_func_hibernate), mgr);
- mi = mgr->restart_mi = dbusmenu_menuitem_new ();
- mi_set_type (mi, RESTART_ITEM_TYPE);
- dbusmenu_menuitem_property_set (mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
+ mi = mgr->restart_mi = mi_new (_("Restart\342\200\246"));
dbusmenu_menuitem_child_append (mgr->top_mi, mi);
g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK(action_func_spawn_async), CMD_RESTART);
@@ -1193,6 +1189,11 @@ session_menu_mgr_new (SessionDbus * session_dbus,
mgr->user_menuitem_index = n;
update_user_menuitems (mgr);
build_session_menuitems (mgr);
+
+ /* After we have the session menu items built we can look to
+ align them with UPower */
+ on_upower_properties_changed (mgr);
+
return mgr;
}
diff --git a/src/shared-names.h b/src/shared-names.h
index e82aef8..900fbbe 100644
--- a/src/shared-names.h
+++ b/src/shared-names.h
@@ -36,10 +36,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#define USER_ITEM_PROP_ICON "user-item-icon-path"
#define USER_ITEM_ICON_DEFAULT "avatar-default"
-#define RESTART_ITEM_TYPE "x-canonical-restart-item"
-#define RESTART_ITEM_LABEL "restart-label"
-#define RESTART_ITEM_ICON "restart-icon"
-
#define ICON_DEFAULT "system-devices-panel"
#define ICON_INFO "system-devices-panel-information"
#define ICON_ALERT "system-devices-panel-alert"
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 290e5ed..82e2357 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,