From b01c41715ddad682c2e0d2a5eac8fa0deb91c5e8 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Fri, 4 Sep 2015 21:01:09 +0100 Subject: Use org.gnome.SessionManager at /org/gnome/SessionManager as the DBUS API. This is necessary for compatibility and it brings support for many apps hardcoding GNOME support but also apps written in GTK (Gtk.Application taps into org.gnome.Session to register applications for a clean shutdown and for inhibition). It doesn't conflict with GNOME or Cinnamon (which both use the same name) since it's on the SessionBus. It makes mate-session aware of programs such as gedit, etc.. which might need to save people's work before logout, it brings support for totem inhibiting the session etc etc.. --- mate-session/Makefile.am | 32 +- mate-session/README | 2 +- mate-session/gsm-app.c | 2 +- mate-session/gsm-client.c | 2 +- mate-session/gsm-dbus-client.c | 4 +- mate-session/gsm-inhibitor.c | 2 +- mate-session/gsm-manager.c | 8 +- mate-session/gsm-presence.c | 2 +- mate-session/main.c | 2 +- mate-session/org.gnome.SessionManager.App.xml | 43 +++ mate-session/org.gnome.SessionManager.Client.xml | 73 ++++ .../org.gnome.SessionManager.ClientPrivate.xml | 123 +++++++ .../org.gnome.SessionManager.Inhibitor.xml | 66 ++++ mate-session/org.gnome.SessionManager.Presence.xml | 95 +++++ mate-session/org.gnome.SessionManager.xml | 407 +++++++++++++++++++++ mate-session/org.mate.SessionManager.App.xml | 43 --- mate-session/org.mate.SessionManager.Client.xml | 73 ---- .../org.mate.SessionManager.ClientPrivate.xml | 123 ------- mate-session/org.mate.SessionManager.Inhibitor.xml | 66 ---- mate-session/org.mate.SessionManager.Presence.xml | 95 ----- mate-session/org.mate.SessionManager.xml | 407 --------------------- mate-session/test-client-dbus.c | 8 +- mate-session/test-inhibit.c | 6 +- 23 files changed, 842 insertions(+), 842 deletions(-) create mode 100644 mate-session/org.gnome.SessionManager.App.xml create mode 100644 mate-session/org.gnome.SessionManager.Client.xml create mode 100644 mate-session/org.gnome.SessionManager.ClientPrivate.xml create mode 100644 mate-session/org.gnome.SessionManager.Inhibitor.xml create mode 100644 mate-session/org.gnome.SessionManager.Presence.xml create mode 100644 mate-session/org.gnome.SessionManager.xml delete mode 100644 mate-session/org.mate.SessionManager.App.xml delete mode 100644 mate-session/org.mate.SessionManager.Client.xml delete mode 100644 mate-session/org.mate.SessionManager.ClientPrivate.xml delete mode 100644 mate-session/org.mate.SessionManager.Inhibitor.xml delete mode 100644 mate-session/org.mate.SessionManager.Presence.xml delete mode 100644 mate-session/org.mate.SessionManager.xml (limited to 'mate-session') diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am index bfbdb1d..c6e8d37 100644 --- a/mate-session/Makefile.am +++ b/mate-session/Makefile.am @@ -104,20 +104,20 @@ gsm-marshal.c: gsm-marshal.list gsm-marshal.h: gsm-marshal.list $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --header > $@ -gsm-manager-glue.h: org.mate.SessionManager.xml Makefile.am - $(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.mate.SessionManager.xml +gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am + $(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml -gsm-client-glue.h: org.mate.SessionManager.Client.xml Makefile.am - $(AM_V_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.mate.SessionManager.Client.xml +gsm-client-glue.h: org.gnome.SessionManager.Client.xml Makefile.am + $(AM_V_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml -gsm-app-glue.h: org.mate.SessionManager.App.xml Makefile.am - $(AM_V_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.mate.SessionManager.App.xml +gsm-app-glue.h: org.gnome.SessionManager.App.xml Makefile.am + $(AM_V_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.gnome.SessionManager.App.xml -gsm-inhibitor-glue.h: org.mate.SessionManager.Inhibitor.xml Makefile.am - $(AM_V_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.mate.SessionManager.Inhibitor.xml +gsm-inhibitor-glue.h: org.gnome.SessionManager.Inhibitor.xml Makefile.am + $(AM_V_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml -gsm-presence-glue.h: org.mate.SessionManager.Presence.xml Makefile.am - $(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.mate.SessionManager.Presence.xml +gsm-presence-glue.h: org.gnome.SessionManager.Presence.xml Makefile.am + $(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml BUILT_SOURCES = \ gsm-marshal.c \ @@ -131,12 +131,12 @@ BUILT_SOURCES = \ EXTRA_DIST = \ README \ gsm-marshal.list \ - org.mate.SessionManager.xml \ - org.mate.SessionManager.App.xml \ - org.mate.SessionManager.Client.xml \ - org.mate.SessionManager.ClientPrivate.xml \ - org.mate.SessionManager.Inhibitor.xml \ - org.mate.SessionManager.Presence.xml + org.gnome.SessionManager.xml \ + org.gnome.SessionManager.App.xml \ + org.gnome.SessionManager.Client.xml \ + org.gnome.SessionManager.ClientPrivate.xml \ + org.gnome.SessionManager.Inhibitor.xml \ + org.gnome.SessionManager.Presence.xml CLEANFILES = \ $(BUILT_SOURCES) diff --git a/mate-session/README b/mate-session/README index 5b4e67b..f030efb 100644 --- a/mate-session/README +++ b/mate-session/README @@ -23,7 +23,7 @@ Startup is divided into 6 phases (GsmSessionPhase): running very early (before any windows are displayed). Apps in this phase can make use of a D-Bus interface - (org.mate.SessionManager.Setenv) to set environment variables + (org.gnome.SessionManager.Setenv) to set environment variables in mate-session's environment. This can be used for things like $GTK_MODULES, $MATE_KEYRING_SOCKET, etc diff --git a/mate-session/gsm-app.c b/mate-session/gsm-app.c index 9b3ea39..55c2911 100644 --- a/mate-session/gsm-app.c +++ b/mate-session/gsm-app.c @@ -121,7 +121,7 @@ gsm_app_constructor (GType type, construct_properties)); g_free (app->priv->id); - app->priv->id = g_strdup_printf ("/org/mate/SessionManager/App%u", get_next_app_serial ()); + app->priv->id = g_strdup_printf ("/org/gnome/SessionManager/App%u", get_next_app_serial ()); res = register_app (app); if (! res) { diff --git a/mate-session/gsm-client.c b/mate-session/gsm-client.c index 801e05c..2909d99 100644 --- a/mate-session/gsm-client.c +++ b/mate-session/gsm-client.c @@ -140,7 +140,7 @@ gsm_client_constructor (GType type, construct_properties)); g_free (client->priv->id); - client->priv->id = g_strdup_printf ("/org/mate/SessionManager/Client%u", get_next_client_serial ()); + client->priv->id = g_strdup_printf ("/org/gnome/SessionManager/Client%u", get_next_client_serial ()); res = register_client (client); if (! res) { diff --git a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c index b156fd1..3b33170 100644 --- a/mate-session/gsm-dbus-client.c +++ b/mate-session/gsm-dbus-client.c @@ -40,8 +40,8 @@ #define GSM_DBUS_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_DBUS_CLIENT, GsmDBusClientPrivate)) -#define SM_DBUS_NAME "org.mate.SessionManager" -#define SM_DBUS_CLIENT_PRIVATE_INTERFACE "org.mate.SessionManager.ClientPrivate" +#define SM_DBUS_NAME "org.gnome.SessionManager" +#define SM_DBUS_CLIENT_PRIVATE_INTERFACE "org.gnome.SessionManager.ClientPrivate" struct GsmDBusClientPrivate { diff --git a/mate-session/gsm-inhibitor.c b/mate-session/gsm-inhibitor.c index 33de12f..6f4e229 100644 --- a/mate-session/gsm-inhibitor.c +++ b/mate-session/gsm-inhibitor.c @@ -142,7 +142,7 @@ gsm_inhibitor_constructor (GType type, construct_properties)); g_free (inhibitor->priv->id); - inhibitor->priv->id = g_strdup_printf ("/org/mate/SessionManager/Inhibitor%u", get_next_inhibitor_serial ()); + inhibitor->priv->id = g_strdup_printf ("/org/gnome/SessionManager/Inhibitor%u", get_next_inhibitor_serial ()); res = register_inhibitor (inhibitor); if (! res) { g_warning ("Unable to register inhibitor with session bus"); diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c index 552307c..c3c7c12 100644 --- a/mate-session/gsm-manager.c +++ b/mate-session/gsm-manager.c @@ -69,8 +69,8 @@ #define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate)) -#define GSM_MANAGER_DBUS_PATH "/org/mate/SessionManager" -#define GSM_MANAGER_DBUS_NAME "org.mate.SessionManager" +#define GSM_MANAGER_DBUS_PATH "/org/gnome/SessionManager" +#define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager" #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */ @@ -3275,8 +3275,8 @@ user_logout (GsmManager *manager, /* dbus-send --session --type=method_call --print-reply - --dest=org.mate.SessionManager - /org/mate/SessionManager + --dest=org.gnome.SessionManager + /org/gnome/SessionManager org.freedesktop.DBus.Introspectable.Introspect */ diff --git a/mate-session/gsm-presence.c b/mate-session/gsm-presence.c index 725e4f3..4e21140 100644 --- a/mate-session/gsm-presence.c +++ b/mate-session/gsm-presence.c @@ -33,7 +33,7 @@ #include "gsm-presence.h" #include "gsm-presence-glue.h" -#define GSM_PRESENCE_DBUS_PATH "/org/mate/SessionManager/Presence" +#define GSM_PRESENCE_DBUS_PATH "/org/gnome/SessionManager/Presence" #define GS_NAME "org.mate.ScreenSaver" #define GS_PATH "/org/mate/ScreenSaver" diff --git a/mate-session/main.c b/mate-session/main.c index c812038..5f6e221 100644 --- a/mate-session/main.c +++ b/mate-session/main.c @@ -77,7 +77,7 @@ #define MATE_INTERFACE_SCHEMA "org.mate.interface" #define GTK_OVERLAY_SCROLL "gtk-overlay-scrolling" -#define GSM_DBUS_NAME "org.mate.SessionManager" +#define GSM_DBUS_NAME "org.gnome.SessionManager" #define KEY_AUTOSAVE "auto-save-session" diff --git a/mate-session/org.gnome.SessionManager.App.xml b/mate-session/org.gnome.SessionManager.App.xml new file mode 100644 index 0000000..9f6e1b3 --- /dev/null +++ b/mate-session/org.gnome.SessionManager.App.xml @@ -0,0 +1,43 @@ + + + + + + + + The identifier for the application + + + + + Return the application ID. + + + + + + + The startup identifier + + + + + Return the startup ID associated with this application. + + + + + + + The application startup phase + + + + + Return the startup phase of this application. + + + + + + diff --git a/mate-session/org.gnome.SessionManager.Client.xml b/mate-session/org.gnome.SessionManager.Client.xml new file mode 100644 index 0000000..a0f5a31 --- /dev/null +++ b/mate-session/org.gnome.SessionManager.Client.xml @@ -0,0 +1,73 @@ + + + + + + + + The identifier for the associated application + + + + + Return the application ID associated with this client. + + + + + + + The startup identifier + + + + + Return the startup ID associated with this client. + + + + + + + The restart style hint + + + + + Return the restart style hint for this client. + + + + + + + The Unix process identifier + + + + + Return the Unix process identifier for this client. + + + + + + + The client status + + + + + Return the status of this client. + + + + + + + Inititate a request to terminate this application via XSMP. + + + + + diff --git a/mate-session/org.gnome.SessionManager.ClientPrivate.xml b/mate-session/org.gnome.SessionManager.ClientPrivate.xml new file mode 100644 index 0000000..a167065 --- /dev/null +++ b/mate-session/org.gnome.SessionManager.ClientPrivate.xml @@ -0,0 +1,123 @@ + + + + + + + + Whether or not it is OK to preceed + + + + + The reason string + + + + + This method should be used by the client in response to + the QueryEndSession + and EndSession signals. + + + + + + + + Stop client + + + The client should stop and remove itself from the session in + response to this signal. + + + + + + + + + Flags + + + + + This signal is used to inform the client that the + session is about to end. The client must respond by + calling + EndSessionResponse + within one second of the signal emission. + + + The flags may include: + + + 1 + Logout is forced. + EndSessionResponse + reason and any inhibit from client will be + ignored. + + + + + If the client responds with an EndSessionResponse is-ok + argument equal to FALSE and a reason then this reason may + be displayed to the user. + + + The client must not attempt to perform any actions or + interact with the user in response to this signal. Any + actions required for a clean shutdown should take place in + response to the + EndSession signal. + + + The client should limit operations until either a + EndSession + CancelEndSession + signal is received. + + + + + + + + + Flags + + + + + This signal is used to inform the client that the + session is about to end. The client must respond by + calling + EndSessionResponse + within ten seconds of the signal emission. + + + The client must not attempt to interact with the user in + response to this signal. The application will be given a + maxium of ten seconds to perform any actions required for + a clean shutdown. + + + + + + + + + + This signal indicates to the client that a previous emission of + QueryEndSession + has been cancelled. The client should resume normal operations. + + + + + + + diff --git a/mate-session/org.gnome.SessionManager.Inhibitor.xml b/mate-session/org.gnome.SessionManager.Inhibitor.xml new file mode 100644 index 0000000..342d2a8 --- /dev/null +++ b/mate-session/org.gnome.SessionManager.Inhibitor.xml @@ -0,0 +1,66 @@ + + + + + + + + The identifier for the associated application + + + + + Return the application ID associated with this inhibit. + + + + + + + The object path of the associated client + + + + + Return the client object path associated with this inhibit. + + + + + + + The reason for the inhibit + + + + + Return the reason for the inhibit + + + + + + + The flags that determine the scope of the inhibit + + + + + Return the flags that determine the scope of the inhibit + + + + + + + X11 toplevel window identifier associated with this inhibit. Zero if not set. + + + + + Return the X11 toplevel window identifier associated with this inhibit. Zero if not set. + + + + + diff --git a/mate-session/org.gnome.SessionManager.Presence.xml b/mate-session/org.gnome.SessionManager.Presence.xml new file mode 100644 index 0000000..0441970 --- /dev/null +++ b/mate-session/org.gnome.SessionManager.Presence.xml @@ -0,0 +1,95 @@ + + + + + + + + + + The status of the session. + + + The status parameter must be one of the following: + + + 0 + Available + + + 1 + Invisible + + + 2 + Busy + + + 3 + Idle + + + + + + + + + + The descriptive status for the session. + + + + + + + + The status value + + + + + Set the status value of the session. + + + + + + + The descriptive status for the session. + + + + + Set the descriptive status text for the session. + + + + + + + + The new status value + + + + + Indicates that the session status value has changed. + + + + + + + The new status text + + + + + Indicates that the descriptive session status text has changed. + + + + + + diff --git a/mate-session/org.gnome.SessionManager.xml b/mate-session/org.gnome.SessionManager.xml new file mode 100644 index 0000000..190f372 --- /dev/null +++ b/mate-session/org.gnome.SessionManager.xml @@ -0,0 +1,407 @@ + + + + + + + + + + + The variable name + + + + + The value + + + + + Adds the variable name to the application launch environment with the specified value. May only be used during the Session Manager initialization phase. + + + + + + + + The error message + + + + + Whether the error should be treated as fatal + + + + + May be used by applications launched during the Session Manager initialization phase to indicate there was a problem. + + + + + + + + + + + The application identifier + + + + + Client startup identifier + + + + + The object path of the newly registered client + + + + + Register the caller as a Session Management client. + + + + + + + + + The object path of the client + + + + + Unregister the specified client from Session Management. + + + + + + + + + The application identifier + + + + + The toplevel X window identifier + + + + + The reason for the inhibit + + + + + Flags that spefify what should be inhibited + + + + + The cookie + + + + + Proactively indicates that the calling application is performing an action that should not be interrupted and sets a reason to be displayed to the user when an interruption is about to take placea. + + + Applications should invoke this method when they begin an operation that + should not be interrupted, such as creating a CD or DVD. The types of actions + that may be blocked are specified by the flags parameter. When the application + completes the operation it should call Uninhibit() + or disconnect from the session bus. + + + Applications should not expect that they will always be able to block the + action. In most cases, users will be given the option to force the action + to take place. + + + Reasons should be short and to the point. + + + The flags parameter must include at least one of the following: + + + 1 + Inhibit logging out + + + 2 + Inhibit user switching + + + 4 + Inhibit suspending the session or computer + + + 8 + Inhibit the session being marked as idle + + + Values for flags may be bitwise or'ed together. + + + The returned cookie is used to uniquely identify this request. It should be used + as an argument to Uninhibit() in + order to remove the request. + + + + + + + + + + The cookie + + + + + Cancel a previous call to Inhibit() identified by the cookie. + + + + + + + + Flags that spefify what should be inhibited + + + + + Returns TRUE if any of the operations in the bitfield flags are inhibited + + + + + Determine if operation(s) specified by the flags + are currently inhibited. Flags are same as those accepted + by the + Inhibit() + method. + + + + + + + + an array of client IDs + + + + + This gets a list of all the Clients + that are currently known to the session manager. + Each Client ID is an D-Bus object path for the object that implements the + Client interface. + + org.gnome.SessionManager.Client + + + + + + + an array of inhibitor IDs + + + + + This gets a list of all the Inhibitors + that are currently known to the session manager. + Each Inhibitor ID is an D-Bus object path for the object that implements the + Inhibitor interface. + + org.gnome.SessionManager.Inhibitor + + + + + + + + The autostart condition string + + + + + True if condition is handled, false otherwise + + + + + Allows the caller to determine whether the session manager is + handling changes to the specified autostart condition. + + + + + + + + Request a shutdown dialog + + + + + + + + True if shutdown is available to the user, false otherwise + + + + + Allows the caller to determine whether or not it's okay to show + a shutdown option in the UI + + + + + + + + The type of logout that is being requested + + + + + Request a logout dialog + + Allowed values for the mode parameter are: + + + 0 + Normal. + + + 1 + No confirmation inferface should be shown. + + + 2 + Forcefully logout. No confirmation will be shown and any inhibitors will be ignored. + + + Values for flags may be bitwise or'ed together. + + + + + + + + + Request a shutdown with no dialog + + + + + + + + Request a reboot with no dialog + + + + + + + + True if the session has entered the Running phase, false otherwise + + + + + Allows the caller to determine whether the session manager + has entered the Running phase, in case the client missed the + SessionRunning signal. + + + + + + + + + The object path for the added client + + + + + Emitted when a client has been added to the session manager. + + + + + + + + The object path for the removed client + + + + + Emitted when a client has been removed from the session manager. + + + + + + + + + The object path for the added inhibitor + + + + + Emitted when an inhibitor has been added to the session manager. + + + + + + + + The object path for the removed inhibitor + + + + + Emitted when an inhibitor has been removed from the session manager. + + + + + + + + + Indicates the session has entered the Running phase. + + + + + + + + Indicates the session is about to end. + + + + + + diff --git a/mate-session/org.mate.SessionManager.App.xml b/mate-session/org.mate.SessionManager.App.xml deleted file mode 100644 index 971eb7e..0000000 --- a/mate-session/org.mate.SessionManager.App.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - The identifier for the application - - - - - Return the application ID. - - - - - - - The startup identifier - - - - - Return the startup ID associated with this application. - - - - - - - The application startup phase - - - - - Return the startup phase of this application. - - - - - - diff --git a/mate-session/org.mate.SessionManager.Client.xml b/mate-session/org.mate.SessionManager.Client.xml deleted file mode 100644 index 0d51986..0000000 --- a/mate-session/org.mate.SessionManager.Client.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - The identifier for the associated application - - - - - Return the application ID associated with this client. - - - - - - - The startup identifier - - - - - Return the startup ID associated with this client. - - - - - - - The restart style hint - - - - - Return the restart style hint for this client. - - - - - - - The Unix process identifier - - - - - Return the Unix process identifier for this client. - - - - - - - The client status - - - - - Return the status of this client. - - - - - - - Inititate a request to terminate this application via XSMP. - - - - - diff --git a/mate-session/org.mate.SessionManager.ClientPrivate.xml b/mate-session/org.mate.SessionManager.ClientPrivate.xml deleted file mode 100644 index 6adedba..0000000 --- a/mate-session/org.mate.SessionManager.ClientPrivate.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - Whether or not it is OK to preceed - - - - - The reason string - - - - - This method should be used by the client in response to - the QueryEndSession - and EndSession signals. - - - - - - - - Stop client - - - The client should stop and remove itself from the session in - response to this signal. - - - - - - - - - Flags - - - - - This signal is used to inform the client that the - session is about to end. The client must respond by - calling - EndSessionResponse - within one second of the signal emission. - - - The flags may include: - - - 1 - Logout is forced. - EndSessionResponse - reason and any inhibit from client will be - ignored. - - - - - If the client responds with an EndSessionResponse is-ok - argument equal to FALSE and a reason then this reason may - be displayed to the user. - - - The client must not attempt to perform any actions or - interact with the user in response to this signal. Any - actions required for a clean shutdown should take place in - response to the - EndSession signal. - - - The client should limit operations until either a - EndSession - CancelEndSession - signal is received. - - - - - - - - - Flags - - - - - This signal is used to inform the client that the - session is about to end. The client must respond by - calling - EndSessionResponse - within ten seconds of the signal emission. - - - The client must not attempt to interact with the user in - response to this signal. The application will be given a - maxium of ten seconds to perform any actions required for - a clean shutdown. - - - - - - - - - - This signal indicates to the client that a previous emission of - QueryEndSession - has been cancelled. The client should resume normal operations. - - - - - - - diff --git a/mate-session/org.mate.SessionManager.Inhibitor.xml b/mate-session/org.mate.SessionManager.Inhibitor.xml deleted file mode 100644 index 4d1f128..0000000 --- a/mate-session/org.mate.SessionManager.Inhibitor.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - The identifier for the associated application - - - - - Return the application ID associated with this inhibit. - - - - - - - The object path of the associated client - - - - - Return the client object path associated with this inhibit. - - - - - - - The reason for the inhibit - - - - - Return the reason for the inhibit - - - - - - - The flags that determine the scope of the inhibit - - - - - Return the flags that determine the scope of the inhibit - - - - - - - X11 toplevel window identifier associated with this inhibit. Zero if not set. - - - - - Return the X11 toplevel window identifier associated with this inhibit. Zero if not set. - - - - - diff --git a/mate-session/org.mate.SessionManager.Presence.xml b/mate-session/org.mate.SessionManager.Presence.xml deleted file mode 100644 index 49f0620..0000000 --- a/mate-session/org.mate.SessionManager.Presence.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - The status of the session. - - - The status parameter must be one of the following: - - - 0 - Available - - - 1 - Invisible - - - 2 - Busy - - - 3 - Idle - - - - - - - - - - The descriptive status for the session. - - - - - - - - The status value - - - - - Set the status value of the session. - - - - - - - The descriptive status for the session. - - - - - Set the descriptive status text for the session. - - - - - - - - The new status value - - - - - Indicates that the session status value has changed. - - - - - - - The new status text - - - - - Indicates that the descriptive session status text has changed. - - - - - - diff --git a/mate-session/org.mate.SessionManager.xml b/mate-session/org.mate.SessionManager.xml deleted file mode 100644 index 9b6f452..0000000 --- a/mate-session/org.mate.SessionManager.xml +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - - - - - The variable name - - - - - The value - - - - - Adds the variable name to the application launch environment with the specified value. May only be used during the Session Manager initialization phase. - - - - - - - - The error message - - - - - Whether the error should be treated as fatal - - - - - May be used by applications launched during the Session Manager initialization phase to indicate there was a problem. - - - - - - - - - - - The application identifier - - - - - Client startup identifier - - - - - The object path of the newly registered client - - - - - Register the caller as a Session Management client. - - - - - - - - - The object path of the client - - - - - Unregister the specified client from Session Management. - - - - - - - - - The application identifier - - - - - The toplevel X window identifier - - - - - The reason for the inhibit - - - - - Flags that spefify what should be inhibited - - - - - The cookie - - - - - Proactively indicates that the calling application is performing an action that should not be interrupted and sets a reason to be displayed to the user when an interruption is about to take placea. - - - Applications should invoke this method when they begin an operation that - should not be interrupted, such as creating a CD or DVD. The types of actions - that may be blocked are specified by the flags parameter. When the application - completes the operation it should call Uninhibit() - or disconnect from the session bus. - - - Applications should not expect that they will always be able to block the - action. In most cases, users will be given the option to force the action - to take place. - - - Reasons should be short and to the point. - - - The flags parameter must include at least one of the following: - - - 1 - Inhibit logging out - - - 2 - Inhibit user switching - - - 4 - Inhibit suspending the session or computer - - - 8 - Inhibit the session being marked as idle - - - Values for flags may be bitwise or'ed together. - - - The returned cookie is used to uniquely identify this request. It should be used - as an argument to Uninhibit() in - order to remove the request. - - - - - - - - - - The cookie - - - - - Cancel a previous call to Inhibit() identified by the cookie. - - - - - - - - Flags that spefify what should be inhibited - - - - - Returns TRUE if any of the operations in the bitfield flags are inhibited - - - - - Determine if operation(s) specified by the flags - are currently inhibited. Flags are same as those accepted - by the - Inhibit() - method. - - - - - - - - an array of client IDs - - - - - This gets a list of all the Clients - that are currently known to the session manager. - Each Client ID is an D-Bus object path for the object that implements the - Client interface. - - org.mate.SessionManager.Client - - - - - - - an array of inhibitor IDs - - - - - This gets a list of all the Inhibitors - that are currently known to the session manager. - Each Inhibitor ID is an D-Bus object path for the object that implements the - Inhibitor interface. - - org.mate.SessionManager.Inhibitor - - - - - - - - The autostart condition string - - - - - True if condition is handled, false otherwise - - - - - Allows the caller to determine whether the session manager is - handling changes to the specified autostart condition. - - - - - - - - Request a shutdown dialog - - - - - - - - True if shutdown is available to the user, false otherwise - - - - - Allows the caller to determine whether or not it's okay to show - a shutdown option in the UI - - - - - - - - The type of logout that is being requested - - - - - Request a logout dialog - - Allowed values for the mode parameter are: - - - 0 - Normal. - - - 1 - No confirmation inferface should be shown. - - - 2 - Forcefully logout. No confirmation will be shown and any inhibitors will be ignored. - - - Values for flags may be bitwise or'ed together. - - - - - - - - - Request a shutdown with no dialog - - - - - - - - Request a reboot with no dialog - - - - - - - - True if the session has entered the Running phase, false otherwise - - - - - Allows the caller to determine whether the session manager - has entered the Running phase, in case the client missed the - SessionRunning signal. - - - - - - - - - The object path for the added client - - - - - Emitted when a client has been added to the session manager. - - - - - - - - The object path for the removed client - - - - - Emitted when a client has been removed from the session manager. - - - - - - - - - The object path for the added inhibitor - - - - - Emitted when an inhibitor has been added to the session manager. - - - - - - - - The object path for the removed inhibitor - - - - - Emitted when an inhibitor has been removed from the session manager. - - - - - - - - - Indicates the session has entered the Running phase. - - - - - - - - Indicates the session is about to end. - - - - - - diff --git a/mate-session/test-client-dbus.c b/mate-session/test-client-dbus.c index a41255a..70f7d3a 100644 --- a/mate-session/test-client-dbus.c +++ b/mate-session/test-client-dbus.c @@ -29,11 +29,11 @@ #include #include -#define SM_DBUS_NAME "org.mate.SessionManager" -#define SM_DBUS_PATH "/org/mate/SessionManager" -#define SM_DBUS_INTERFACE "org.mate.SessionManager" +#define SM_DBUS_NAME "org.gnome.SessionManager" +#define SM_DBUS_PATH "/org/gnome/SessionManager" +#define SM_DBUS_INTERFACE "org.gnome.SessionManager" -#define SM_CLIENT_DBUS_INTERFACE "org.mate.SessionManager.ClientPrivate" +#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate" #ifdef __GNUC__ #define UNUSED_VARIABLE __attribute__ ((unused)) diff --git a/mate-session/test-inhibit.c b/mate-session/test-inhibit.c index 3e05750..fdc0744 100644 --- a/mate-session/test-inhibit.c +++ b/mate-session/test-inhibit.c @@ -30,9 +30,9 @@ #include #include -#define SM_DBUS_NAME "org.mate.SessionManager" -#define SM_DBUS_PATH "/org/mate/SessionManager" -#define SM_DBUS_INTERFACE "org.mate.SessionManager" +#define SM_DBUS_NAME "org.gnome.SessionManager" +#define SM_DBUS_PATH "/org/gnome/SessionManager" +#define SM_DBUS_INTERFACE "org.gnome.SessionManager" #ifdef __GNUC__ #define UNUSED_VARIABLE __attribute__ ((unused)) -- cgit v1.2.1