daemon: drop display-id arg to GdmSessionDirect

It's not used anywhere, and so there's no reason to pass it along.

1 files changed, 89 insertions, 108 deletions

diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h
index 479d8e3f..1961be09 100644
--- a/daemon/gdm-session.h
+++ b/daemon/gdm-session.h
@@ -1,11 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+ * Copyright (C) 2006 Ray Strode <rstrode@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.
+ * the Free Software Foundation; either version 2, 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
@@ -14,11 +14,10 @@
  *
  * 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.
- *
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
  */
 
-
 #ifndef __GDM_SESSION_H
 #define __GDM_SESSION_H
 
@@ -26,69 +25,29 @@
 
 G_BEGIN_DECLS
 
-#define GDM_TYPE_SESSION         (gdm_session_get_type ())
-#define GDM_SESSION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_SESSION, GdmSession))
-#define GDM_SESSION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_SESSION, GdmSessionClass))
-#define GDM_IS_SESSION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_SESSION))
-#define GDM_SESSION_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GDM_TYPE_SESSION, GdmSessionIface))
+#define GDM_TYPE_SESSION (gdm_session_get_type ())
+#define GDM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDM_TYPE_SESSION, GdmSession))
+#define GDM_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_SESSION, GdmSessionClass))
+#define GDM_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDM_TYPE_SESSION))
+#define GDM_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_SESSION))
+#define GDM_SESSION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GDM_TYPE_SESSION, GdmSessionClass))
 
-typedef struct _GdmSession      GdmSession; /* Dummy typedef */
-typedef struct _GdmSessionIface GdmSessionIface;
+typedef struct _GdmSessionPrivate GdmSessionPrivate;
 
 enum {
         GDM_SESSION_CRED_ESTABLISH = 0,
         GDM_SESSION_CRED_REFRESH,
 };
 
-struct _GdmSessionIface
+typedef struct
 {
-        GTypeInterface base_iface;
+        GObject            parent;
+        GdmSessionPrivate *priv;
+} GdmSession;
 
-        /* Methods */
-        void (* start_conversation)          (GdmSession   *session,
-                                              const char   *service_name);
-        void (* stop_conversation)           (GdmSession   *session,
-                                              const char   *service_name);
-        void (* service_unavailable)         (GdmSession   *session,
-                                              const char   *service_name);
-        void (* setup)                       (GdmSession   *session,
-                                              const char   *service_name);
-        void (* setup_for_user)              (GdmSession   *session,
-                                              const char   *service_name,
-                                              const char   *username);
-        void (* setup_for_program)           (GdmSession   *session,
-                                              const char   *service_name,
-                                              const char   *log_file);
-        void (* set_environment_variable)    (GdmSession   *session,
-                                              const char   *key,
-                                              const char   *value);
-        void (* reset)                       (GdmSession   *session);
-        void (* authenticate)                (GdmSession   *session,
-                                              const char   *service_name);
-        void (* authorize)                   (GdmSession   *session,
-                                              const char   *service_name);
-        void (* accredit)                    (GdmSession   *session,
-                                              const char   *service_name,
-                                              int           cred_flag);
-        void (* open_session)                (GdmSession   *session,
-                                              const char   *service_name);
-        void (* answer_query)                (GdmSession   *session,
-                                              const char   *service_name,
-                                              const char   *text);
-        void (* select_language)             (GdmSession   *session,
-                                              const char   *text);
-        void (* select_program)              (GdmSession   *session,
-                                              const char   *text);
-        void (* select_session_type)         (GdmSession   *session,
-                                              const char   *session_type);
-        void (* select_session)              (GdmSession   *session,
-                                              const char   *text);
-        void (* select_user)                 (GdmSession   *session,
-                                              const char   *text);
-        void (* start_session)               (GdmSession   *session,
-                                              const char   *service_name);
-        void (* close)                       (GdmSession   *session);
-        void (* cancel)                      (GdmSession   *session);
+typedef struct
+{
+        GObjectClass parent_class;
 
         /* Signals */
         void (* setup_complete)              (GdmSession   *session,
@@ -146,6 +105,8 @@ struct _GdmSessionIface
                                               const char   *service_name);
         void (* conversation_stopped)        (GdmSession   *session,
                                               const char   *service_name);
+        void (* service_unavailable)         (GdmSession   *session,
+                                              const char   *service_name);
         void (* selected_user_changed)       (GdmSession   *session,
                                               const char   *text);
 
@@ -153,54 +114,74 @@ struct _GdmSessionIface
                                                    const char   *text);
         void (* default_session_name_changed)     (GdmSession   *session,
                                                    const char   *text);
-};
-
-GType    gdm_session_get_type                    (void) G_GNUC_CONST;
-
-void     gdm_session_start_conversation          (GdmSession *session,
-                                                  const char *service_name);
-void     gdm_session_stop_conversation           (GdmSession *session,
-                                                  const char *service_name);
-void     gdm_session_setup                       (GdmSession *session,
-                                                  const char *service_name);
-void     gdm_session_setup_for_user              (GdmSession *session,
-                                                  const char *service_name,
-                                                  const char *username);
-void     gdm_session_setup_for_program           (GdmSession *session,
-                                                  const char *service_name,
-                                                  const char *log_file);
-void     gdm_session_set_environment_variable    (GdmSession *session,
-                                                  const char *key,
-                                                  const char *value);
-void     gdm_session_reset                       (GdmSession *session);
-void     gdm_session_authenticate                (GdmSession *session,
-                                                  const char *service_name);
-void     gdm_session_authorize                   (GdmSession *session,
-                                                  const char *service_name);
-void     gdm_session_accredit                    (GdmSession *session,
-                                                  const char *service_name,
-                                                  int         cred_flag);
-void     gdm_session_open_session                (GdmSession *session,
-                                                  const char *service_name);
-void     gdm_session_start_session               (GdmSession *session,
-                                                  const char *service_name);
-void     gdm_session_close                       (GdmSession *session);
-
-void     gdm_session_answer_query                (GdmSession *session,
-                                                  const char *service_name,
-                                                  const char *text);
-void     gdm_session_select_program              (GdmSession *session,
-                                                  const char *command_line);
-void     gdm_session_select_session_type         (GdmSession *session,
-                                                  const char *session_type);
-void     gdm_session_select_session              (GdmSession *session,
-                                                  const char *session_name);
-void     gdm_session_select_language             (GdmSession *session,
-                                                  const char *language);
-void     gdm_session_select_user                 (GdmSession *session,
-                                                  const char *username);
-void     gdm_session_cancel                      (GdmSession *session);
+} GdmSessionClass;
+
+GType            gdm_session_get_type                 (void);
+
+GdmSession      *gdm_session_new                      (const char *display_name,
+                                                       const char *display_hostname,
+                                                       const char *display_device,
+                                                       const char *display_seat_id,
+                                                       const char *display_x11_authority_file,
+                                                       gboolean    display_is_local);
+
+char             *gdm_session_get_username                (GdmSession     *session);
+char             *gdm_session_get_display_device          (GdmSession     *session);
+char             *gdm_session_get_display_seat_id         (GdmSession     *session);
+gboolean          gdm_session_bypasses_xsession           (GdmSession     *session);
+
+void              gdm_session_start_conversation          (GdmSession *session,
+                                                           const char *service_name);
+void              gdm_session_stop_conversation           (GdmSession *session,
+                                                           const char *service_name);
+void              gdm_session_setup                       (GdmSession *session,
+                                                           const char *service_name);
+void              gdm_session_setup_for_user              (GdmSession *session,
+                                                           const char *service_name,
+                                                           const char *username);
+void              gdm_session_setup_for_program           (GdmSession *session,
+                                                           const char *service_name,
+                                                           const char *log_file);
+void              gdm_session_set_environment_variable    (GdmSession *session,
+                                                           const char *key,
+                                                           const char *value);
+void              gdm_session_reset                       (GdmSession *session);
+void              gdm_session_authenticate                (GdmSession *session,
+                                                           const char *service_name);
+void              gdm_session_authorize                   (GdmSession *session,
+                                                           const char *service_name);
+void              gdm_session_accredit                    (GdmSession *session,
+                                                           const char *service_name,
+                                                           int         cred_flag);
+void              gdm_session_open_session                (GdmSession *session,
+                                                           const char *service_name);
+void              gdm_session_start_session               (GdmSession *session,
+                                                           const char *service_name);
+void              gdm_session_close                       (GdmSession *session);
+
+void              gdm_session_answer_query                (GdmSession *session,
+                                                           const char *service_name,
+                                                           const char *text);
+void              gdm_session_select_program              (GdmSession *session,
+                                                           const char *command_line);
+void              gdm_session_select_session_type         (GdmSession *session,
+                                                           const char *session_type);
+void              gdm_session_select_session              (GdmSession *session,
+                                                           const char *session_name);
+void              gdm_session_select_language             (GdmSession *session,
+                                                           const char *language);
+void              gdm_session_select_user                 (GdmSession *session,
+                                                           const char *username);
+void              gdm_session_cancel                      (GdmSession *session);
+
+/* Exported methods */
+gboolean          gdm_session_restart                  (GdmSession   *session,
+                                                        GError      **error);
+gboolean          gdm_session_stop                     (GdmSession   *session,
+                                                        GError      **error);
+gboolean          gdm_session_detach                   (GdmSession   *session,
+                                                        GError      **error);
 
 G_END_DECLS
 
-#endif /* __GDM_SESSION_H */
+#endif /* GDM_SESSION_H */