From ade647861a671eca584d25432722ac2661854748 Mon Sep 17 00:00:00 2001

From: Josselin Mouette <joss@malsain.org>

Date: Mon, 21 Jun 2010 15:22:23 -0400

Subject: [PATCH 08/19] Add "Remember Currently Running Applications" button

This adds back session saving that's not at logout.

---

 capplet/gsm-properties-dialog.c            |  63 ++++++++-

 capplet/meson.build                        |   3 +-

 data/session-properties.ui                 |  12 ++

 gnome-session/gsm-client.c                 |  10 ++

 gnome-session/gsm-client.h                 |   6 +

 gnome-session/gsm-dbus-client.c            |  14 ++

 gnome-session/gsm-manager.c                | 150 ++++++++++++++++++++-

 gnome-session/gsm-manager.h                |   3 +

 gnome-session/gsm-xsmp-client.c            |  37 +++++

 gnome-session/gsm-xsmp-client.h            |   3 +-

 gnome-session/org.gnome.SessionManager.xml |   8 ++

 meson.build                                |   1 +

 12 files changed, 305 insertions(+), 5 deletions(-)

diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c

index 33812b8b..d2be778b 100644

--- a/capplet/gsm-properties-dialog.c

+++ b/capplet/gsm-properties-dialog.c

@@ -5,70 +5,77 @@

  * Copyright (C) 2008 Lucas Rocha.

  * Copyright (C) 2008 William Jon McCann <jmccann@redhat.com>

  *

  * 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.

  *

  */

 #include "config.h"

 #include <glib.h>

 #include <glib/gi18n.h>

 #include <gtk/gtk.h>

 #include "gsm-properties-dialog.h"

 #include "gsm-app-dialog.h"

 #include "gsm-util.h"

 #include "gsp-app.h"

 #include "gsp-app-manager.h"

+#include <dbus/dbus-glib.h>

+#include <dbus/dbus-glib-lowlevel.h>

+

+#define GSM_SERVICE_DBUS   "org.gnome.SessionManager"

+#define GSM_PATH_DBUS      "/org/gnome/SessionManager"

+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"

 #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))

 #define GTKBUILDER_FILE "session-properties.ui"

 #define CAPPLET_TREEVIEW_WIDGET_NAME      "session_properties_treeview"

 #define CAPPLET_ADD_WIDGET_NAME           "session_properties_add_button"

 #define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"

 #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"

 #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"

+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"

 #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"

 #define STARTUP_APP_ICON     "system-run"

 #define SPC_SETTINGS_SCHEMA          "org.gnome.SessionManager"

 #define SPC_SETTINGS_AUTOSAVE_KEY    "auto-save-session"

 struct GsmPropertiesDialogPrivate

 {

         GtkBuilder        *xml;

         GtkListStore      *list_store;

         GtkTreeModel      *tree_filter;

         GtkTreeView       *treeview;

         GtkWidget         *add_button;

         GtkWidget         *delete_button;

         GtkWidget         *edit_button;

         GSettings         *settings;

         GspAppManager     *manager;

 };

 enum {

         STORE_COL_VISIBLE = 0,

         STORE_COL_ENABLED,

         STORE_COL_GICON,

         STORE_COL_DESCRIPTION,

         STORE_COL_APP,

         STORE_COL_SEARCH,

@@ -430,65 +437,119 @@ on_edit_app_clicked (GtkWidget           *widget,

                 char       *exec;

                 char       *comment;

                 edit_dialog = gsm_app_dialog_new (gsp_app_get_name (app),

                                                   gsp_app_get_exec (app),

                                                   gsp_app_get_comment (app));

                 gtk_window_set_transient_for (GTK_WINDOW (edit_dialog),

                                               GTK_WINDOW (dialog));

                 if (gsm_app_dialog_run (GSM_APP_DIALOG (edit_dialog),

                                         &name, &exec, &comment)) {

                         gsp_app_update (app, name, comment, exec);

                         g_free (name);

                         g_free (exec);

                         g_free (comment);

                 }

                 g_object_unref (app);

         }

 }

 static void

 on_row_activated (GtkTreeView         *tree_view,

                   GtkTreePath         *path,

                   GtkTreeViewColumn   *column,

                   GsmPropertiesDialog *dialog)

 {

         on_edit_app_clicked (NULL, dialog);

 }

+static void

+session_saved_message (GsmPropertiesDialog *dialog,

+                       const char *msg,

+                       gboolean is_error)

+{

+        GtkLabel *label;

+        gchar *markup;

+        label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));

+        if (is_error)

+                markup = g_markup_printf_escaped ("%s", msg);

+        else

+                markup = g_markup_escape_text (msg, -1);

+        gtk_label_set_markup (label, markup);

+        g_free (markup);

+}

+

+static void

+session_saved_cb (DBusGProxy *proxy,

+                  DBusGProxyCall *call_id,

+                  void *user_data)

+{

+        gboolean res;

+        GsmPropertiesDialog *dialog = user_data;

+

+        res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);

+        if (res)

+                session_saved_message (dialog, _("Your session has been saved."), FALSE);

+        else

+                session_saved_message (dialog, _("Failed to save session"), TRUE);

+

+        g_object_unref (proxy);

+}

+

 static void

 on_save_session_clicked (GtkWidget           *widget,

                          GsmPropertiesDialog *dialog)

 {

-        g_debug ("Session saving is not implemented yet!");

+        DBusGConnection *conn;

+        DBusGProxy *proxy;

+        DBusGProxyCall *call;

+

+        conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);

+        if (conn == NULL) {

+                session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);

+                return;

+        }

+

+        proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);

+        if (proxy == NULL) {

+                session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);

+                return;

+        }

+

+        call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);

+        if (call == NULL) {

+                session_saved_message (dialog, _("Failed to save session"), TRUE);

+                g_object_unref (proxy);

+                return;

+        }

 }

 static void

 setup_dialog (GsmPropertiesDialog *dialog)

 {

         GtkTreeView       *treeview;

         GtkWidget         *button;

         GtkTreeModel      *tree_filter;

         GtkTreeViewColumn *column;

         GtkCellRenderer   *renderer;

         GtkTreeSelection  *selection;

         GtkTargetList     *targetlist;

         gtk_dialog_add_buttons (GTK_DIALOG (dialog),

                                 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,

                                 NULL);

         dialog->priv->list_store = gtk_list_store_new (NUMBER_OF_COLUMNS,

                                                        G_TYPE_BOOLEAN,

                                                        G_TYPE_BOOLEAN,

                                                        G_TYPE_ICON,

                                                        G_TYPE_STRING,

                                                        G_TYPE_OBJECT,

                                                        G_TYPE_STRING);

         tree_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->priv->list_store),

                                                  NULL);

         g_object_unref (dialog->priv->list_store);

         dialog->priv->tree_filter = tree_filter;

         gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (tree_filter),

diff --git a/capplet/meson.build b/capplet/meson.build

index 8dad9c80..ae6cb6b9 100644

--- a/capplet/meson.build

+++ b/capplet/meson.build

@@ -1,36 +1,37 @@

 install_data(

   install_dir: session_bindir

 )

 deps = session_deps + [

   glib_dep,

   gtk_dep,

   x11_dep,

   sm_dep,

-  ice_dep

+  ice_dep,

+  dbus_glib_dep

 ]

 cflags = [

   '-DLOCALE_DIR="@0@"'.format(session_localedir),

   '-DGTKBUILDER_DIR="@0@"'.format(session_pkgdatadir)

 ]

 sources = files(

   '../gnome-session/gsm-util.c',

   'gsm-app-dialog.c',

   'gsm-properties-dialog.c',

   'gsp-app.c',

   'gsp-app-manager.c',

   'gsp-keyfile.c',

   'main.c'

 )

 executable(

   'gnome-session-properties',

   sources,

   include_directories: [ top_inc, include_directories('../gnome-session') ],

   dependencies: deps,

   c_args: cflags,

   install: true,

   install_dir: session_bindir

 )

diff --git a/data/session-properties.ui b/data/session-properties.ui

index 47a30f78..b43759ff 100644

--- a/data/session-properties.ui

+++ b/data/session-properties.ui

@@ -133,108 +133,120 @@

       </packing>

     </child>

     <child>

       <object class="GtkVBox" id="vbox3">

         <property name="visible">True</property>

         <property name="can_focus">False</property>

         <property name="border_width">12</property>

         <property name="spacing">6</property>

         <child>

           <object class="GtkCheckButton" id="session_properties_remember_toggle">

             <property name="label" translatable="yes">_Automatically remember running applications when logging out</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.5</property>

             <property name="draw_indicator">True</property>

           </object>

           <packing>

             <property name="expand">False</property>

             <property name="fill">False</property>

             <property name="position">0</property>

           </packing>

         </child>

         <child>

           <object class="GtkHButtonBox" id="hbuttonbox1">

             <property name="visible">True</property>

             <property name="can_focus">False</property>

             <child>

               <object class="GtkButton" id="session_properties_save_button">

+                <property name="visible">True</property>

                 <property name="can_focus">True</property>

                 <property name="receives_default">True</property>

                 <child>

                   <object class="GtkHBox" id="hbox2">

                     <property name="visible">True</property>

                     <property name="can_focus">False</property>

                     <property name="spacing">4</property>

                     <child>

                       <object class="GtkImage" id="image1">

                         <property name="visible">True</property>

                         <property name="can_focus">False</property>

                         <property name="stock">gtk-save</property>

                       </object>

                       <packing>

                         <property name="expand">False</property>

                         <property name="fill">False</property>

                         <property name="position">0</property>

                       </packing>

                     </child>

                     <child>

                       <object class="GtkLabel" id="label7">

                         <property name="visible">True</property>

                         <property name="can_focus">False</property>

                         <property name="label" translatable="yes">_Remember Currently Running Applications</property>

                         <property name="use_underline">True</property>

                       </object>

                       <packing>

                         <property name="expand">True</property>

                         <property name="fill">True</property>

                         <property name="position">1</property>

                       </packing>

                     </child>

                   </object>

                 </child>

               </object>

               <packing>

                 <property name="expand">False</property>

                 <property name="fill">False</property>

                 <property name="position">0</property>

               </packing>

             </child>

           </object>

           <packing>

             <property name="expand">False</property>

             <property name="fill">False</property>

             <property name="position">1</property>

           </packing>

         </child>

+        <child>

+          <object class="GtkLabel" id="session_properties_session_saved_label">

+            <property name="visible">True</property>

+            <property name="wrap">True</property>

+          </object>

+          <packing>

+            <property name="expand">False</property>

+            <property name="fill">False</property>

+            <property name="position">2</property>

+          </packing>

+        </child>

       </object>

       <packing>

         <property name="position">1</property>

       </packing>

     </child>

     <child type="tab">

       <object class="GtkLabel" id="label5">

         <property name="visible">True</property>

         <property name="can_focus">False</property>

         <property name="label" translatable="yes">Options</property>

       </object>

       <packing>

         <property name="position">1</property>

         <property name="tab_fill">False</property>

       </packing>

     </child>

   </object>

   <object class="GtkTable" id="main-table">

     <property name="visible">True</property>

     <property name="can_focus">False</property>

     <property name="border_width">6</property>

     <property name="n_rows">3</property>

     <property name="n_columns">2</property>

     <property name="column_spacing">12</property>

     <property name="row_spacing">6</property>

     <child>

       <object class="GtkHBox" id="hbox3">

         <property name="visible">True</property>

         <property name="can_focus">False</property>

         <property name="spacing">12</property>

diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c

index 6828ad44..3f216b22 100644

--- a/gnome-session/gsm-client.c

+++ b/gnome-session/gsm-client.c

@@ -514,50 +514,60 @@ gsm_client_query_end_session (GsmClient                *client,

         g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);

         return GSM_CLIENT_GET_CLASS (client)->impl_query_end_session (client, flags, error);

 }

 gboolean

 gsm_client_end_session (GsmClient                *client,

                         GsmClientEndSessionFlag   flags,

                         GError                  **error)

 {

         g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);

         return GSM_CLIENT_GET_CLASS (client)->impl_end_session (client, flags, error);

 }

 gboolean

 gsm_client_stop (GsmClient *client,

                  GError   **error)

 {

         g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);

         return GSM_CLIENT_GET_CLASS (client)->impl_stop (client, error);

 }

 void

 gsm_client_disconnected (GsmClient *client)

 {

         g_signal_emit (client, signals[DISCONNECTED], 0);

 }

+gboolean

+gsm_client_request_save (GsmClient *client,

+                         guint      flags,

+                         GError   **error)

+{

+        g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);

+

+        return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);

+}

+

 GKeyFile *

 gsm_client_save (GsmClient *client,

                  GsmApp    *app,

                  GError   **error)

 {

         g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);

         return GSM_CLIENT_GET_CLASS (client)->impl_save (client, app, error);

 }

 void

 gsm_client_end_session_response (GsmClient  *client,

                                  gboolean    is_ok,

                                  gboolean    do_last,

                                  gboolean    cancel,

                                  const char *reason)

 {

         g_signal_emit (client, signals[END_SESSION_RESPONSE], 0,

                        is_ok, do_last, cancel, reason);

 }

diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h

index 78cb15d8..19c9cd8d 100644

--- a/gnome-session/gsm-client.h

+++ b/gnome-session/gsm-client.h

@@ -64,91 +64,97 @@ struct _GsmClient

         GObject           parent;

         GsmClientPrivate *priv;

 };

 struct _GsmClientClass

 {

         GObjectClass parent_class;

         /* signals */

         void         (*disconnected)               (GsmClient  *client);

         void         (*end_session_response)       (GsmClient  *client,

                                                     gboolean    ok,

                                                     gboolean    do_last,

                                                     gboolean    cancel,

                                                     const char *reason);

         /* virtual methods */

         char *                (*impl_get_app_name)           (GsmClient *client);

         GsmClientRestartStyle (*impl_get_restart_style_hint) (GsmClient *client);

         guint                 (*impl_get_unix_process_id)    (GsmClient *client);

         gboolean              (*impl_query_end_session)      (GsmClient *client,

                                                               GsmClientEndSessionFlag flags,

                                                               GError   **error);

         gboolean              (*impl_end_session)            (GsmClient *client,

                                                               GsmClientEndSessionFlag flags,

                                                               GError   **error);

         gboolean              (*impl_cancel_end_session)     (GsmClient *client,

                                                               GError   **error);

         gboolean              (*impl_stop)                   (GsmClient *client,

                                                               GError   **error);

+        gboolean              (*impl_request_save)           (GsmClient *client,

+                                                              guint      flags,

+                                                              GError   **error);

         GKeyFile *            (*impl_save)                   (GsmClient *client,

                                                               GsmApp    *app,

                                                               GError   **error);

 };

 typedef enum

 {

         GSM_CLIENT_ERROR_GENERAL = 0,

         GSM_CLIENT_ERROR_NOT_REGISTERED,

         GSM_CLIENT_NUM_ERRORS

 } GsmClientError;

 #define GSM_CLIENT_ERROR gsm_client_error_quark ()

 GQuark                gsm_client_error_quark                (void);

 GType                 gsm_client_get_type                   (void) G_GNUC_CONST;

 const char           *gsm_client_peek_id                    (GsmClient  *client);

 const char *          gsm_client_peek_startup_id            (GsmClient  *client);

 const char *          gsm_client_peek_app_id                (GsmClient  *client);

 guint                 gsm_client_peek_restart_style_hint    (GsmClient  *client);

 guint                 gsm_client_peek_status                (GsmClient  *client);

 char                 *gsm_client_get_app_name               (GsmClient  *client);

 void                  gsm_client_set_app_id                 (GsmClient  *client,

                                                              const char *app_id);

 void                  gsm_client_set_status                 (GsmClient  *client,

                                                              guint       status);

 gboolean              gsm_client_end_session                (GsmClient  *client,

                                                              guint       flags,

                                                              GError    **error);

 gboolean              gsm_client_query_end_session          (GsmClient  *client,

                                                              guint       flags,

                                                              GError    **error);

 gboolean              gsm_client_cancel_end_session         (GsmClient  *client,

                                                              GError    **error);

 void                  gsm_client_disconnected               (GsmClient  *client);

+gboolean              gsm_client_request_save               (GsmClient  *client,

+                                                             guint       flags,

+                                                             GError    **error);

 GKeyFile             *gsm_client_save                       (GsmClient  *client,

                                                              GsmApp     *app,

                                                              GError    **error);

 gboolean              gsm_client_stop                       (GsmClient  *client,

                                                              GError    **error);

 /* private */

 void                  gsm_client_end_session_response       (GsmClient  *client,

                                                              gboolean    is_ok,

                                                              gboolean    do_last,

                                                              gboolean    cancel,

                                                              const char *reason);

 G_END_DECLS

 #endif /* __GSM_CLIENT_H__ */

diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c

index 6e9b002b..5793f830 100644

--- a/gnome-session/gsm-dbus-client.c

+++ b/gnome-session/gsm-dbus-client.c

@@ -300,60 +300,73 @@ gsm_dbus_client_get_property (GObject    *object,

         case PROP_BUS_NAME:

                 g_value_set_string (value, self->priv->bus_name);

                 break;

         default:

                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

                 break;

         }

 }

 static void

 gsm_dbus_client_finalize (GObject *object)

 {

         GsmDBusClient *client = (GsmDBusClient *) object;

         g_free (client->priv->bus_name);

         if (client->priv->skeleton != NULL) {

                 g_dbus_interface_skeleton_unexport_from_connection (G_DBUS_INTERFACE_SKELETON (client->priv->skeleton),

                                                                     client->priv->connection);

                 g_clear_object (&client->priv->skeleton);

         }

         g_clear_object (&client->priv->connection);

         if (client->priv->watch_id != 0)

                 g_bus_unwatch_name (client->priv->watch_id);

         G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);

 }

+static gboolean

+dbus_client_request_save (GsmClient *client,

+                          guint      flags,

+                          GError   **error)

+{

+        g_debug ("GsmDBusClient: sending save request to client with id %s",

+                 gsm_client_peek_id (client));

+

+        /* FIXME: The protocol does not support this */

+

+        return FALSE;

+}

+

 static GKeyFile *

 dbus_client_save (GsmClient *client,

                   GsmApp    *app,

                   GError   **error)

 {

         g_debug ("GsmDBusClient: saving client with id %s",

                  gsm_client_peek_id (client));

         /* FIXME: We still don't support client saving for D-Bus

          * session clients */

         return NULL;

 }

 static gboolean

 dbus_client_stop (GsmClient *client,

                   GError   **error)

 {

         GsmDBusClient  *dbus_client = (GsmDBusClient *) client;

         gsm_exported_client_private_emit_stop (dbus_client->priv->skeleton);

         return TRUE;

 }

 static char *

 dbus_client_get_app_name (GsmClient *client)

 {

         /* Always use app-id instead */

         return NULL;

 }

@@ -394,60 +407,61 @@ static gboolean

 dbus_client_end_session (GsmClient                *client,

                          GsmClientEndSessionFlag   flags,

                          GError                  **error)

 {

         GsmDBusClient  *dbus_client = (GsmDBusClient *) client;

         gsm_exported_client_private_emit_end_session (dbus_client->priv->skeleton, flags);

         return TRUE;

 }

 static gboolean

 dbus_client_cancel_end_session (GsmClient *client,

                                 GError   **error)

 {

         GsmDBusClient  *dbus_client = (GsmDBusClient *) client;

         gsm_exported_client_private_emit_cancel_end_session (dbus_client->priv->skeleton);

         return TRUE;

 }

 static void

 gsm_dbus_client_class_init (GsmDBusClientClass *klass)

 {

         GObjectClass   *object_class = G_OBJECT_CLASS (klass);

         GsmClientClass *client_class = GSM_CLIENT_CLASS (klass);

         object_class->finalize             = gsm_dbus_client_finalize;

         object_class->constructor          = gsm_dbus_client_constructor;

         object_class->get_property         = gsm_dbus_client_get_property;

         object_class->set_property         = gsm_dbus_client_set_property;

+        client_class->impl_request_save           = dbus_client_request_save;

         client_class->impl_save                   = dbus_client_save;

         client_class->impl_stop                   = dbus_client_stop;

         client_class->impl_query_end_session      = dbus_client_query_end_session;

         client_class->impl_end_session            = dbus_client_end_session;

         client_class->impl_cancel_end_session     = dbus_client_cancel_end_session;

         client_class->impl_get_app_name           = dbus_client_get_app_name;

         client_class->impl_get_restart_style_hint = dbus_client_get_restart_style_hint;

         client_class->impl_get_unix_process_id    = dbus_client_get_unix_process_id;

         g_object_class_install_property (object_class,

                                          PROP_BUS_NAME,

                                          g_param_spec_string ("bus-name",

                                                               "bus-name",

                                                               "bus-name",

                                                               NULL,

                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));

         g_type_class_add_private (klass, sizeof (GsmDBusClientPrivate));

 }

 GsmClient *

 gsm_dbus_client_new (const char *startup_id,

                      const char *bus_name)

 {

         GsmDBusClient *client;

         client = g_object_new (GSM_TYPE_DBUS_CLIENT,

                                "startup-id", startup_id,

                                "bus-name", bus_name,

                                NULL);

diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c

index 4bb81e04..ede4186a 100644

--- a/gnome-session/gsm-manager.c

+++ b/gnome-session/gsm-manager.c

@@ -54,60 +54,61 @@

 #include "gsm-dbus-client.h"

 #include "gsm-autostart-app.h"

 #include "gsm-util.h"

 #include "gsm-icon-names.h"

 #include "gsm-system.h"

 #include "gsm-session-save.h"

 #include "gsm-shell-extensions.h"

 #include "gsm-fail-whale.h"

 #define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate))

 /* UUIDs for log messages */

 #define GSM_MANAGER_STARTUP_SUCCEEDED_MSGID     "0ce153587afa4095832d233c17a88001"