[Xfce4-commits] <libxfce4ui:new-sm-client> remove support for SmRestartAnyway and SmRestartNever

Brian J. Tarricone brian at tarricone.org
Thu Sep 17 09:10:01 CEST 2009


Updating branch refs/heads/kelnos/new-sm-client
         to 8a8c77471fd86988d3f1948cb056ecf11b475c65 (commit)
       from e44458a1e205dbec1f42a0433e139929392c2805 (commit)

commit 8a8c77471fd86988d3f1948cb056ecf11b475c65
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Thu Sep 17 00:04:52 2009 -0700

    remove support for SmRestartAnyway and SmRestartNever
    
    RestartAnyway is better supported through XDG autostart.  RestartNever
    is better not supported at all, but can be done with XDG autostart as
    well.

 docs/libxfce4ui-sections.txt     |    4 -
 docs/tmpl/libxfce4ui-unused.sgml |   29 ------
 docs/tmpl/xfce-sm-client.sgml    |   52 +----------
 libxfce4ui/libxfce4ui.symbols    |    4 -
 libxfce4ui/xfce-sm-client.c      |  200 +++++--------------------------------
 libxfce4ui/xfce-sm-client.h      |   43 +++------
 6 files changed, 43 insertions(+), 289 deletions(-)

diff --git a/docs/libxfce4ui-sections.txt b/docs/libxfce4ui-sections.txt
index 27a108c..e5de489 100644
--- a/docs/libxfce4ui-sections.txt
+++ b/docs/libxfce4ui-sections.txt
@@ -97,14 +97,10 @@ xfce_sm_client_get_priority
 xfce_sm_client_set_priority
 xfce_sm_client_get_program
 xfce_sm_client_set_program
-xfce_sm_client_get_resign_command
-xfce_sm_client_set_resign_command
 xfce_sm_client_get_restart_command
 xfce_sm_client_set_restart_command
 xfce_sm_client_get_restart_style
 xfce_sm_client_set_restart_style
-xfce_sm_client_get_shutdown_command
-xfce_sm_client_set_shutdown_command
 <SUBSECTION Standard>
 XFCE_IS_SM_CLIENT
 XFCE_IS_SM_CLIENT_CLASS
diff --git a/docs/tmpl/libxfce4ui-unused.sgml b/docs/tmpl/libxfce4ui-unused.sgml
index 878629b..ab23b1c 100644
--- a/docs/tmpl/libxfce4ui-unused.sgml
+++ b/docs/tmpl/libxfce4ui-unused.sgml
@@ -22,27 +22,6 @@ Common used functions to easily access Pango functions.
 Xfce Pango Extensions
 
 
-<!-- ##### SIGNAL XfceSMClient::state-changed ##### -->
-<para>
-
-</para>
-
- at xfcesmclient: the object which received the signal.
- at arg1: 
- at arg2: 
-
-<!-- ##### ARG XfceSMClient:session-connection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG XfceSMClient:state ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT XfceSMClientClass ##### -->
 <para>
 
@@ -71,11 +50,3 @@ Xfce Pango Extensions
 @underline: 
 @Returns: 
 
-<!-- ##### FUNCTION xfce_sm_client_get_state ##### -->
-<para>
-
-</para>
-
- at sm_client: 
- at Returns: 
-
diff --git a/docs/tmpl/xfce-sm-client.sgml b/docs/tmpl/xfce-sm-client.sgml
index 5c40cd6..313bff2 100644
--- a/docs/tmpl/xfce-sm-client.sgml
+++ b/docs/tmpl/xfce-sm-client.sgml
@@ -100,11 +100,6 @@
 
 </para>
 
-<!-- ##### ARG XfceSMClient:resign-command ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG XfceSMClient:restart-command ##### -->
 <para>
 
@@ -120,11 +115,6 @@
 
 </para>
 
-<!-- ##### ARG XfceSMClient:shutdown-command ##### -->
-<para>
-
-</para>
-
 <!-- ##### ENUM XfceSMClientPriority ##### -->
 <para>
 
@@ -141,10 +131,8 @@
 
 </para>
 
- at XFCE_SM_CLIENT_RESTART_IF_RUNNING: 
- at XFCE_SM_CLIENT_RESTART_ANYWAY: 
+ at XFCE_SM_CLIENT_RESTART_NORMAL: 
 @XFCE_SM_CLIENT_RESTART_IMMEDIATELY: 
- at XFCE_SM_CLIENT_RESTART_NEVER: 
 
 <!-- ##### ENUM XfceSMClientShutdownHint ##### -->
 <para>
@@ -199,8 +187,6 @@
 @restart_command: 
 @clone_command: 
 @discard_command: 
- at resign_command: 
- at shutdown_command: 
 @Returns: 
 
 
@@ -348,24 +334,6 @@
 @program: 
 
 
-<!-- ##### FUNCTION xfce_sm_client_get_resign_command ##### -->
-<para>
-
-</para>
-
- at sm_client: 
- at Returns: 
-
-
-<!-- ##### FUNCTION xfce_sm_client_set_resign_command ##### -->
-<para>
-
-</para>
-
- at sm_client: 
- at resign_command: 
-
-
 <!-- ##### FUNCTION xfce_sm_client_get_restart_command ##### -->
 <para>
 
@@ -402,21 +370,3 @@
 @restart_style: 
 
 
-<!-- ##### FUNCTION xfce_sm_client_get_shutdown_command ##### -->
-<para>
-
-</para>
-
- at sm_client: 
- at Returns: 
-
-
-<!-- ##### FUNCTION xfce_sm_client_set_shutdown_command ##### -->
-<para>
-
-</para>
-
- at sm_client: 
- at shutdown_command: 
-
-
diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols
index a4236b5..4ad0203 100644
--- a/libxfce4ui/libxfce4ui.symbols
+++ b/libxfce4ui/libxfce4ui.symbols
@@ -113,14 +113,10 @@ xfce_sm_client_set_program
 xfce_sm_client_get_program
 xfce_sm_client_set_clone_command
 xfce_sm_client_get_clone_command
-xfce_sm_client_set_resign_command
-xfce_sm_client_get_resign_command
 xfce_sm_client_set_restart_command
 xfce_sm_client_get_restart_command
 xfce_sm_client_set_discard_command
 xfce_sm_client_get_discard_command
-xfce_sm_client_set_shutdown_command
-xfce_sm_client_get_shutdown_command
 #endif
 #endif
 
diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index fa0aeb3..bccbee4 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -1,21 +1,20 @@
-/*  xfce4
+/*
+ *  Copyright (c) 2009 Brian Tarricone <brian at terricone.org>
  *  Copyright (C) 1999 Olivier Fourdan (fourdan at xfce.org)
- *  Copyright (C) 2009 Brian Tarricone <brian at tarricone.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /**
@@ -28,7 +27,7 @@
  * #XfceSMClient is a session management client that speaks the X Session
  * Management Protocol (XSMP).  It's designed to be easy to use and hide some
  * of the more esoteric feaures of XSMP from the API user.
- */
+ **/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -106,15 +105,11 @@ typedef enum
 
 /**
  * XfceSMClientRestartStyle:
- * @XFCE_SM_CLIENT_RESTART_IF_RUNNING: Only restart the application if it is
- *                                     still running at the end of the current
- *                                     session.
- * @XFCE_SM_CLIENT_RESTART_ANYWAY: Always restart the application the next
- *                                 time the session starts.
+ * @XFCE_SM_CLIENT_RESTART_NORMAL: Only restart the application if it is
+ *                                 still running when the session is next
+ *                                 saved.
  * @XFCE_SM_CLIENT_RESTART_IMMEDIATELY: Immediately restart the application
  *                                      if it ever quits.
- * @XFCE_SM_CLIENT_RESTART_NEVER: Don't restart the application; after it
- *                                runs once, remove it from the session.
  *
  * An enumeration describing how the session manager should restart
  * the application.
@@ -154,10 +149,8 @@ struct _XfceSMClient
     gchar *current_directory;
     gchar *program;
     gchar **clone_command;
-    gchar **resign_command;
     gchar **restart_command;
     gchar **discard_command;
-    gchar **shutdown_command;
 
     guint32 resumed:1,
             needs_save_state:1,
@@ -213,10 +206,8 @@ enum
     PROP_CURRENT_DIRECTORY,
     PROP_PROGRAM,
     PROP_CLONE_COMMAND,
-    PROP_RESIGN_COMMAND,
     PROP_RESTART_COMMAND,
     PROP_DISCARD_COMMAND,
-    PROP_SHUTDOWN_COMMAND,
     PROP_ARGC,
     PROP_ARGV,
 };
@@ -377,7 +368,7 @@ xfce_sm_client_class_init(XfceSMClientClass *klass)
                                                       "Restart style",
                                                       "Specifies how the client should be restarted by the session manager",
                                                       XFCE_TYPE_SM_CLIENT_RESTART_STYLE,
-                                                      XFCE_SM_CLIENT_RESTART_IF_RUNNING,
+                                                      XFCE_SM_CLIENT_RESTART_NORMAL,
                                                       G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
     g_object_class_install_property(gobject_class, PROP_PRIORITY,
                                     g_param_spec_char("priority",
@@ -409,12 +400,6 @@ xfce_sm_client_class_init(XfceSMClientClass *klass)
                                                        "A command used to launch a fresh instance of the application",
                                                        G_TYPE_STRV,
                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-    g_object_class_install_property(gobject_class, PROP_RESIGN_COMMAND,
-                                    g_param_spec_boxed("resign-command",
-                                                       "Resign command",
-                                                       "A command used to remove any saved state for the 'anyway' restart style",
-                                                       G_TYPE_STRV,
-                                                       G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
     g_object_class_install_property(gobject_class, PROP_RESTART_COMMAND,
                                     g_param_spec_boxed("restart-command",
                                                        "Restart command",
@@ -427,12 +412,6 @@ xfce_sm_client_class_init(XfceSMClientClass *klass)
                                                        "A command used to discard any information about the current saved state",
                                                        G_TYPE_STRV,
                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-    g_object_class_install_property(gobject_class, PROP_SHUTDOWN_COMMAND,
-                                    g_param_spec_boxed("shutdown-command",
-                                                       "Shutdown command",
-                                                       "A command used at session end to clean up after an application started with the 'anyway' restart style",
-                                                       G_TYPE_STRV,
-                                                       G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
 
     /* these are "private" properties */
     g_object_class_install_property(gobject_class, PROP_ARGC,
@@ -493,10 +472,6 @@ xfce_sm_client_get_property(GObject *obj,
             g_value_set_boxed(value, sm_client->clone_command);
             break;
 
-        case PROP_RESIGN_COMMAND:
-            g_value_set_boxed(value, sm_client->resign_command);
-            break;
-
         case PROP_RESTART_COMMAND:
             g_value_set_boxed(value, sm_client->restart_command);
             break;
@@ -505,10 +480,6 @@ xfce_sm_client_get_property(GObject *obj,
             g_value_set_boxed(value, sm_client->discard_command);
             break;
 
-        case PROP_SHUTDOWN_COMMAND:
-            g_value_set_boxed(value, sm_client->shutdown_command);
-            break;
-
         case PROP_ARGC:
         case PROP_ARGV:
         default:
@@ -552,11 +523,6 @@ xfce_sm_client_set_property(GObject *obj,
                                              g_value_get_boxed(value));
             break;
 
-        case PROP_RESIGN_COMMAND:
-            xfce_sm_client_set_resign_command(sm_client,
-                                              g_value_get_boxed(value));
-            break;
-
         case PROP_RESTART_COMMAND:
             xfce_sm_client_set_restart_command(sm_client,
                                                g_value_get_boxed(value));
@@ -567,11 +533,6 @@ xfce_sm_client_set_property(GObject *obj,
                                                g_value_get_boxed(value));
             break;
 
-        case PROP_SHUTDOWN_COMMAND:
-            xfce_sm_client_set_shutdown_command(sm_client,
-                                                g_value_get_boxed(value));
-            break;
-
         case PROP_ARGC:
             if(sm_client->argc)
                 g_critical("XfceSMClient: Received argc twice");
@@ -634,10 +595,8 @@ xfce_sm_client_finalize(GObject *obj)
     g_free(sm_client->current_directory);
     g_free(sm_client->program);
     g_strfreev(sm_client->clone_command);
-    g_strfreev(sm_client->resign_command);
     g_strfreev(sm_client->restart_command);
     g_strfreev(sm_client->discard_command);
-    g_strfreev(sm_client->shutdown_command);
 
     g_strfreev(sm_client->argv);
 
@@ -773,13 +732,9 @@ static inline char
 xsmp_restart_style_from_enum(XfceSMClientRestartStyle style)
 {
     switch(style) {
-        case XFCE_SM_CLIENT_RESTART_ANYWAY:
-            return SmRestartAnyway;
         case XFCE_SM_CLIENT_RESTART_IMMEDIATELY:
             return SmRestartImmediately;
-        case XFCE_SM_CLIENT_RESTART_NEVER:
-            return SmRestartNever;
-        case XFCE_SM_CLIENT_RESTART_IF_RUNNING:
+        case XFCE_SM_CLIENT_RESTART_NORMAL:
         default:
             return SmRestartIfRunning;
     }
@@ -1356,20 +1311,10 @@ xfce_sm_client_set_clone_restart_commands(XfceSMClient *sm_client)
                                               : sm_client->restart_command),
                                              SM_ARG_REMOVE);
 
-    /* Resign */
-    xfce_sm_client_set_property_from_command(sm_client, SmResignCommand,
-                                             sm_client->resign_command,
-                                             FALSE);
-
     /* Discard */
     xfce_sm_client_set_property_from_command(sm_client, SmDiscardCommand,
                                              sm_client->discard_command,
                                              FALSE);
-
-    /* Shutdown */
-    xfce_sm_client_set_property_from_command(sm_client, SmShutdownCommand,
-                                             sm_client->shutdown_command,
-                                             FALSE);
 }
 
 #endif
@@ -1504,10 +1449,6 @@ xfce_sm_client_get_with_argv(guint argc,
  *                 application
  * @discard_command: A command that cleans up the application's
  *                   state when removed from the session
- * @resign_command: A command that cleans up the application's
- *                  state when removed from restart-always state
- * @shutdown_command: A command run on shutdown for applications
- *                    with the restart-always style
  *
  * Creates a new SM client instance, allowing the application
  * fine-grained control over the initial properties set.
@@ -1530,9 +1471,7 @@ xfce_sm_client_new_full(XfceSMClientRestartStyle restart_style,
                         const gchar *current_directory,
                         const gchar **restart_command,
                         const gchar **clone_command,
-                        const gchar **discard_command,
-                        const gchar **resign_command,
-                        const gchar **shutdown_command)
+                        const gchar **discard_command)
 {
     return g_object_new(XFCE_TYPE_SM_CLIENT,
                         "restart-style", restart_style,
@@ -1542,8 +1481,7 @@ xfce_sm_client_new_full(XfceSMClientRestartStyle restart_style,
                         "current-directory", current_directory,
                         "restart-command", restart_command,
                         "clone-command", clone_command,
-                        "resign-command", resign_command,
-                        "shutdown-command", shutdown_command,
+                        "discard-command", discard_command,
                         NULL);
 }
 
@@ -1727,7 +1665,7 @@ xfce_sm_client_disconnect(XfceSMClient *sm_client)
     }
 
     if(sm_client->restart_style == XFCE_SM_CLIENT_RESTART_IMMEDIATELY)
-        xfce_sm_client_set_restart_style(sm_client, XFCE_SM_CLIENT_RESTART_IF_RUNNING);
+        xfce_sm_client_set_restart_style(sm_client, XFCE_SM_CLIENT_RESTART_NORMAL);
 
     SmcCloseConnection(sm_client->session_connection, 0, NULL);
     sm_client->session_connection = NULL;
@@ -2001,32 +1939,6 @@ xfce_sm_client_set_clone_command(XfceSMClient *sm_client,
 }
 
 /**
- * xfce_sm_client_set_resign_command:
- * @sm_client: An #XfceSMClient
- * @resign_command: An argument vector
- *
- * Sets the application's "resign" command, which is used to clean
- * up saved state when an appliction with restart style "always"
- * is removed from the session.
- *
- * If unset, defaults to %NULL.
- **/
-void
-xfce_sm_client_set_resign_command(XfceSMClient *sm_client,
-                                  gchar **resign_command)
-{
-    g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
-    sm_client->resign_command = copy_command(sm_client->resign_command,
-                                                   resign_command);
-#ifdef HAVE_LIBSM
-    xfce_sm_client_set_property_from_command(sm_client, SmResignCommand,
-                                             sm_client->resign_command,
-                                             FALSE);
-#endif
-    g_object_notify(G_OBJECT(sm_client), "resign-command");
-}
-
-/**
  * xfce_sm_client_set_restart_command:
  * @sm_client: An #XfceSMClient
  * @restart_command: An argument vector
@@ -2083,31 +1995,6 @@ xfce_sm_client_set_discard_command(XfceSMClient *sm_client,
 }
 
 /**
- * xfce_sm_client_set_shutdown_command:
- * @sm_client: An #XfceSMClient
- * @shutdown_command: An argument vector
- *
- * Sets the application's "shutdown" command, which is executed for
- * 'restart-always' style applications when the session ends.
- *
- * If unset, defaults to %NULL.
- **/
-void
-xfce_sm_client_set_shutdown_command(XfceSMClient *sm_client,
-                                    gchar **shutdown_command)
-{
-    g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
-    sm_client->shutdown_command = copy_command(sm_client->shutdown_command,
-                                                     shutdown_command);
-#ifdef HAVE_LIBSM
-    xfce_sm_client_set_property_from_command(sm_client, SmShutdownCommand,
-                                             sm_client->shutdown_command,
-                                             FALSE);
-#endif
-    g_object_notify(G_OBJECT(sm_client), "shutdown-command");
-}
-
-/**
  * xfce_sm_client_get_restart_style:
  * @sm_client: An #XfceSMClient
  *
@@ -2120,7 +2007,7 @@ XfceSMClientRestartStyle
 xfce_sm_client_get_restart_style(XfceSMClient *sm_client)
 {
     g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client),
-                         XFCE_SM_CLIENT_RESTART_IF_RUNNING);
+                         XFCE_SM_CLIENT_RESTART_NORMAL);
     return sm_client->restart_style;
 }
 
@@ -2181,8 +2068,7 @@ xfce_sm_client_get_client_id(XfceSMClient *sm_client)
  * the state can be restored from the file.
  * 
  * This function will use a standard location and naming scheme
- * as handle state cleanup (setting of the discard command or
- * resign command) for you.
+ * as handle state cleanup (setting of the discard command) for you.
  *
  * Before calling this function, the application must have a
  * valid program identifier set (see xfce_sm_client_set_program())
@@ -2288,22 +2174,6 @@ xfce_sm_client_get_clone_command(XfceSMClient *sm_client)
 }
 
 /**
- * xfce_sm_client_get_resign_command:
- * @sm_client: An #XfceSMClient
- *
- * Retrieves the session client's resign command.  See
- * xfce_sm_client_set_resign_command() for more information.
- *
- * Returns: an object-owned string vector
- **/
-gchar **
-xfce_sm_client_get_resign_command(XfceSMClient *sm_client)
-{
-    g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL);
-    return sm_client->resign_command;
-}
-
-/**
  * xfce_sm_client_get_restart_command:
  * @sm_client: An #XfceSMClient
  *
@@ -2334,19 +2204,3 @@ xfce_sm_client_get_discard_command(XfceSMClient *sm_client)
     g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL);
     return sm_client->discard_command;
 }
-
-/**
- * xfce_sm_client_get_shutdown_command:
- * @sm_client: An #XfceSMClient
- *
- * Retrieves the session client's shutdown command.  See
- * xfce_sm_client_set_shutdown_command() for more information.
- *
- * Returns: an object-owned string vector
- **/
-gchar **
-xfce_sm_client_get_shutdown_command(XfceSMClient *sm_client)
-{
-    g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL);
-    return sm_client->shutdown_command;
-}
diff --git a/libxfce4ui/xfce-sm-client.h b/libxfce4ui/xfce-sm-client.h
index 06b6a84..b7d6200 100644
--- a/libxfce4ui/xfce-sm-client.h
+++ b/libxfce4ui/xfce-sm-client.h
@@ -1,21 +1,20 @@
-/*  xfce4
- *  Copyright (C) 1999 Olivier Fourdan (fourdan at xfce.org)
+/*
  *  Copyright (c) 2009 Brian Tarricone <brian at terricone.org>
+ *  Copyright (C) 1999 Olivier Fourdan (fourdan at xfce.org)
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __XFCE_SM_CLIENT_H__
@@ -38,10 +37,8 @@ G_BEGIN_DECLS
 
 typedef enum
 {
-    XFCE_SM_CLIENT_RESTART_IF_RUNNING = 0,
-    XFCE_SM_CLIENT_RESTART_ANYWAY,
+    XFCE_SM_CLIENT_RESTART_NORMAL = 0,
     XFCE_SM_CLIENT_RESTART_IMMEDIATELY,
-    XFCE_SM_CLIENT_RESTART_NEVER,
 } XfceSMClientRestartStyle;
 
 typedef enum
@@ -82,9 +79,7 @@ XfceSMClient *xfce_sm_client_get_full(XfceSMClientRestartStyle restart_style,
                                       const gchar *current_directory,
                                       const gchar **restart_command,
                                       const gchar **clone_command,
-                                      const gchar **discard_command,
-                                      const gchar **resign_command,
-                                      const gchar **shutdown_command);
+                                      const gchar **discard_command);
 
 gboolean xfce_sm_client_connect(XfceSMClient *sm_client,
                                 GError **error);
@@ -119,10 +114,6 @@ void xfce_sm_client_set_clone_command(XfceSMClient *sm_client,
                                       gchar **clone_command);
 gchar **xfce_sm_client_get_clone_command(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_resign_command(XfceSMClient *sm_client,
-                                       gchar **resign_command);
-gchar **xfce_sm_client_get_resign_command(XfceSMClient *sm_client);
-
 void xfce_sm_client_set_restart_command(XfceSMClient *sm_client,
                                         gchar **restart_command);
 gchar **xfce_sm_client_get_restart_command(XfceSMClient *sm_client);
@@ -131,10 +122,6 @@ void xfce_sm_client_set_discard_command(XfceSMClient *sm_client,
                                         gchar **discard_command);
 gchar **xfce_sm_client_get_discard_command(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_shutdown_command(XfceSMClient *sm_client,
-                                         gchar **shutdown_command);
-gchar **xfce_sm_client_get_shutdown_command(XfceSMClient *sm_client);
-
 G_END_DECLS
 
 #endif  /* __XFCE_SM_CLIENT_H__ */



More information about the Xfce4-commits mailing list