From d2717333e57bd8b2e8533d8c3de8ceb120830f6a Mon Sep 17 00:00:00 2001 From: Steve Zesch Date: Thu, 10 May 2012 12:50:16 -0400 Subject: Fixed reboot/shutdown issue. --- mate-session/gsm-manager.c | 42 ++++++++++++++++++++++++++++++++ mate-session/gsm-manager.h | 6 +++++ mate-session/org.mate.SessionManager.xml | 16 ++++++++++++ 3 files changed, 64 insertions(+) diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c index eb84b87..8bdc49e 100644 --- a/mate-session/gsm-manager.c +++ b/mate-session/gsm-manager.c @@ -2946,6 +2946,48 @@ gsm_manager_set_phase (GsmManager *manager, return (TRUE); } +gboolean +gsm_manager_request_shutdown (GsmManager *manager, + GError **error) +{ + g_debug ("GsmManager: RequestShutdown called"); + + g_return_val_if_fail(GSM_IS_MANAGER (manager), FALSE); + + if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { + g_set_error (error, + GSM_MANAGER_ERROR, + GSM_MANAGER_ERROR_NOT_IN_RUNNING, + "RequestShutdown interface is only available during the Running phase"); + return FALSE; + } + + request_shutdown (manager); + + return TRUE; +} + +gboolean +gsm_manager_request_reboot (GsmManager *manager, + GError **error) +{ + g_debug ("GsmManager: RequestReboot called"); + + g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); + + if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { + g_set_error (error, + GSM_MANAGER_ERROR, + GSM_MANAGER_ERROR_NOT_IN_RUNNING, + "RequestReboot interface is only available during the running phase"); + return FALSE; + } + + request_reboot (manager); + + return TRUE; +} + gboolean gsm_manager_shutdown (GsmManager *manager, GError **error) diff --git a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h index 635590c..8daca06 100644 --- a/mate-session/gsm-manager.h +++ b/mate-session/gsm-manager.h @@ -151,6 +151,12 @@ gboolean gsm_manager_is_inhibited (GsmManager gboolean *is_inhibited, GError *error); +gboolean gsm_manager_request_shutdown (GsmManager *manager, + GError **error); + +gboolean gsm_manager_request_reboot (GsmManager *manager, + GError **error); + gboolean gsm_manager_shutdown (GsmManager *manager, GError **error); diff --git a/mate-session/org.mate.SessionManager.xml b/mate-session/org.mate.SessionManager.xml index 9d693e6..9577428 100644 --- a/mate-session/org.mate.SessionManager.xml +++ b/mate-session/org.mate.SessionManager.xml @@ -301,6 +301,22 @@ + + + + Request a shutdown with no diaog + + + + + + + + Request a reboot with no dialog + + + + -- cgit v1.2.1 From 973fb6b3aac7b37a741b21f3571be1dafaa0d7f4 Mon Sep 17 00:00:00 2001 From: Steve Zesch Date: Thu, 10 May 2012 12:51:25 -0400 Subject: Preparing for 1.2.1 release. --- ChangeLog | 16 ++++++++++++++++ README | 25 +++++-------------------- configure.ac | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index f39a8e3..cb28d29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +commit 22feb13f2d163436ab2c3af1b30823ddee6e43b5 +Author: Steve Zesch +Date: Thu Feb 23 21:31:13 2012 -0500 + + Preparing for 1.2 release + + ChangeLog | 431 ++++++++++++++++++++++++++++++++++++++++++++++++ + autogen.sh | 4 +- + configure.ac | 2 +- + distro/ubuntu/build | 29 ---- + distro/ubuntu/postinst | 11 -- + distro/ubuntu/postrm | 8 - + distro/ubuntu/preinst | 7 - + distro/ubuntu/prerm | 11 -- + 8 files changed, 434 insertions(+), 69 deletions(-) + commit 838bbdba9b2581489b2e6b9b6265098dde1e312f Author: Perberos Date: Mon Jan 30 12:56:56 2012 -0300 diff --git a/README b/README index b8af5f3..a3c379f 100644 --- a/README +++ b/README @@ -4,21 +4,10 @@ mate-session mate-session contains the MATE session manager, as well as a configuration program to choose applications starting on login. -You may download updates to the package from: - - http://download.gnome.org/sources/mate-session/ - -To discuss mate-session, you may use the desktop-devel-list mailing -list: - - http://mail.gnome.org/mailman/listinfo/desktop-devel-list - - -Design notes -============ - -See http://live.gnome.org/SessionManagement +To discuss mate-session, you may use the development section of +the MATE forums: + http://forums.mate-desktop.org Installation ============ @@ -31,15 +20,11 @@ first need to run './autogen.sh'. How to report bugs ================== -Bugs should be reported to the MATE bug tracking system: +Bugs should be reported to the MATE issue tracking system: - https://bugzilla.gnome.org/ (product mate-session) + https://github.com/mate-desktop/mate-session-manager/issues You will need to create an account for yourself. -Please read the following page on how to prepare a useful bug report: - - https://bugzilla.gnome.org/page.cgi?id=bug-writing.html - Please read the HACKING file for information on where to send changes or bugfixes for this package. diff --git a/configure.ac b/configure.ac index 663e41e..6c91d69 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mate-session], [1.2.0], [http://www.mate-desktop.org/]) +AC_INIT([mate-session], [1.2.1], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR([mate-session]) AC_CONFIG_HEADERS([config.h]) -- cgit v1.2.1 From a20404af7c2ece049d9d423a89be7707a37cefa5 Mon Sep 17 00:00:00 2001 From: Steve Zesch Date: Thu, 10 May 2012 15:02:12 -0400 Subject: Revert "Preparing for 1.2.1 release." This reverts commit 973fb6b3aac7b37a741b21f3571be1dafaa0d7f4. --- ChangeLog | 16 ---------------- README | 25 ++++++++++++++++++++----- configure.ac | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb28d29..f39a8e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,19 +1,3 @@ -commit 22feb13f2d163436ab2c3af1b30823ddee6e43b5 -Author: Steve Zesch -Date: Thu Feb 23 21:31:13 2012 -0500 - - Preparing for 1.2 release - - ChangeLog | 431 ++++++++++++++++++++++++++++++++++++++++++++++++ - autogen.sh | 4 +- - configure.ac | 2 +- - distro/ubuntu/build | 29 ---- - distro/ubuntu/postinst | 11 -- - distro/ubuntu/postrm | 8 - - distro/ubuntu/preinst | 7 - - distro/ubuntu/prerm | 11 -- - 8 files changed, 434 insertions(+), 69 deletions(-) - commit 838bbdba9b2581489b2e6b9b6265098dde1e312f Author: Perberos Date: Mon Jan 30 12:56:56 2012 -0300 diff --git a/README b/README index a3c379f..b8af5f3 100644 --- a/README +++ b/README @@ -4,10 +4,21 @@ mate-session mate-session contains the MATE session manager, as well as a configuration program to choose applications starting on login. -To discuss mate-session, you may use the development section of -the MATE forums: +You may download updates to the package from: + + http://download.gnome.org/sources/mate-session/ + +To discuss mate-session, you may use the desktop-devel-list mailing +list: + + http://mail.gnome.org/mailman/listinfo/desktop-devel-list + + +Design notes +============ + +See http://live.gnome.org/SessionManagement - http://forums.mate-desktop.org Installation ============ @@ -20,11 +31,15 @@ first need to run './autogen.sh'. How to report bugs ================== -Bugs should be reported to the MATE issue tracking system: +Bugs should be reported to the MATE bug tracking system: - https://github.com/mate-desktop/mate-session-manager/issues + https://bugzilla.gnome.org/ (product mate-session) You will need to create an account for yourself. +Please read the following page on how to prepare a useful bug report: + + https://bugzilla.gnome.org/page.cgi?id=bug-writing.html + Please read the HACKING file for information on where to send changes or bugfixes for this package. diff --git a/configure.ac b/configure.ac index 6c91d69..663e41e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mate-session], [1.2.1], [http://www.mate-desktop.org/]) +AC_INIT([mate-session], [1.2.0], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR([mate-session]) AC_CONFIG_HEADERS([config.h]) -- cgit v1.2.1