display: don't export so much stuff over system bus

When the slave was in a different process we needed to
interact with the display in the manager process remotely.

Now it's all one process and we don't, so clean up what
gets exported over the bus.

2 files changed, 0 insertions, 145 deletions

diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 7bd75239..39630450 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -1059,62 +1059,6 @@ handle_get_seat_id (GdmDBusDisplay        *skeleton,
 }
 
 static gboolean
-handle_get_timed_login_details (GdmDBusDisplay        *skeleton,
-                                GDBusMethodInvocation *invocation,
-                                GdmDisplay            *self)
-{
-        gboolean enabled;
-        char *username;
-        int delay;
-
-        gdm_display_get_timed_login_details (self, &enabled, &username, &delay);
-
-        gdm_dbus_display_complete_get_timed_login_details (skeleton,
-                                                           invocation,
-                                                           enabled,
-                                                           username ? username : "",
-                                                           delay);
-
-        g_free (username);
-        return TRUE;
-}
-
-static gboolean
-handle_get_x11_authority_file (GdmDBusDisplay        *skeleton,
-                               GDBusMethodInvocation *invocation,
-                               GdmDisplay            *self)
-{
-        char *file;
-
-        gdm_display_get_x11_authority_file (self, &file, NULL);
-
-        gdm_dbus_display_complete_get_x11_authority_file (skeleton, invocation, file);
-
-        g_free (file);
-        return TRUE;
-}
-
-static gboolean
-handle_get_x11_cookie (GdmDBusDisplay        *skeleton,
-                       GDBusMethodInvocation *invocation,
-                       GdmDisplay            *self)
-{
-        const char *x11_cookie;
-        gsize x11_cookie_size;
-        GVariant *variant;
-
-        gdm_display_get_x11_cookie (self, &x11_cookie, &x11_cookie_size, NULL);
-
-        variant = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
-                                             x11_cookie,
-                                             x11_cookie_size,
-                                             sizeof (char));
-        gdm_dbus_display_complete_get_x11_cookie (skeleton, invocation, variant);
-
-        return TRUE;
-}
-
-static gboolean
 handle_get_x11_display_name (GdmDBusDisplay        *skeleton,
                              GDBusMethodInvocation *invocation,
                              GdmDisplay            *self)
@@ -1130,20 +1074,6 @@ handle_get_x11_display_name (GdmDBusDisplay        *skeleton,
 }
 
 static gboolean
-handle_get_x11_display_number (GdmDBusDisplay        *skeleton,
-                               GDBusMethodInvocation *invocation,
-                               GdmDisplay            *self)
-{
-        int name;
-
-        gdm_display_get_x11_display_number (self, &name, NULL);
-
-        gdm_dbus_display_complete_get_x11_display_number (skeleton, invocation, name);
-
-        return TRUE;
-}
-
-static gboolean
 handle_is_local (GdmDBusDisplay        *skeleton,
                  GDBusMethodInvocation *invocation,
                  GdmDisplay            *self)
@@ -1172,46 +1102,6 @@ handle_is_initial (GdmDBusDisplay        *skeleton,
 }
 
 static gboolean
-handle_add_user_authorization (GdmDBusDisplay        *skeleton,
-                               GDBusMethodInvocation *invocation,
-                               const char            *username,
-                               GdmDisplay            *self)
-{
-        char *filename;
-        GError *error = NULL;
-
-        if (gdm_display_add_user_authorization (self, username, &filename, &error)) {
-                gdm_dbus_display_complete_add_user_authorization (skeleton,
-                                                                  invocation,
-                                                                  filename);
-                g_free (filename);
-        } else {
-                g_dbus_method_invocation_return_gerror (invocation, error);
-                g_error_free (error);
-        }
-
-        return TRUE;
-}
-
-static gboolean
-handle_remove_user_authorization (GdmDBusDisplay        *skeleton,
-                                  GDBusMethodInvocation *invocation,
-                                  const char            *username,
-                                  GdmDisplay            *self)
-{
-        GError *error = NULL;
-
-        if (gdm_display_remove_user_authorization (self, username, &error)) {
-                gdm_dbus_display_complete_remove_user_authorization (skeleton, invocation);
-        } else {
-                g_dbus_method_invocation_return_gerror (invocation, error);
-                g_error_free (error);
-        }
-
-        return TRUE;
-}
-
-static gboolean
 register_display (GdmDisplay *self)
 {
         GError *error = NULL;
@@ -1233,24 +1123,12 @@ register_display (GdmDisplay *self)
                           G_CALLBACK (handle_get_remote_hostname), self);
         g_signal_connect (self->priv->display_skeleton, "handle-get-seat-id",
                           G_CALLBACK (handle_get_seat_id), self);
-        g_signal_connect (self->priv->display_skeleton, "handle-get-timed-login-details",
-                          G_CALLBACK (handle_get_timed_login_details), self);
-        g_signal_connect (self->priv->display_skeleton, "handle-get-x11-authority-file",
-                          G_CALLBACK (handle_get_x11_authority_file), self);
-        g_signal_connect (self->priv->display_skeleton, "handle-get-x11-cookie",
-                          G_CALLBACK (handle_get_x11_cookie), self);
         g_signal_connect (self->priv->display_skeleton, "handle-get-x11-display-name",
                           G_CALLBACK (handle_get_x11_display_name), self);
-        g_signal_connect (self->priv->display_skeleton, "handle-get-x11-display-number",
-                          G_CALLBACK (handle_get_x11_display_number), self);
         g_signal_connect (self->priv->display_skeleton, "handle-is-local",
                           G_CALLBACK (handle_is_local), self);
         g_signal_connect (self->priv->display_skeleton, "handle-is-initial",
                           G_CALLBACK (handle_is_initial), self);
-        g_signal_connect (self->priv->display_skeleton, "handle-add-user-authorization",
-                          G_CALLBACK (handle_add_user_authorization), self);
-        g_signal_connect (self->priv->display_skeleton, "handle-remove-user-authorization",
-                          G_CALLBACK (handle_remove_user_authorization), self);
 
         g_dbus_object_skeleton_add_interface (self->priv->object_skeleton,
                                               G_DBUS_INTERFACE_SKELETON (self->priv->display_skeleton));
diff --git a/daemon/gdm-display.xml b/daemon/gdm-display.xml
index bc279958..3e9b5d86 100644
--- a/daemon/gdm-display.xml
+++ b/daemon/gdm-display.xml
@@ -7,17 +7,6 @@
     <method name="GetX11DisplayName">
       <arg name="name" direction="out" type="s"/>
     </method>
-    <method name="GetX11DisplayNumber">
-      <arg name="name" direction="out" type="i"/>
-    </method>
-    <method name="GetX11Cookie">
-      <arg name="x11_cookie" direction="out" type="ay">
-        <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
-      </arg>
-    </method>
-    <method name="GetX11AuthorityFile">
-      <arg name="filename" direction="out" type="s"/>
-    </method>
     <method name="GetSeatId">
       <arg name="filename" direction="out" type="s"/>
     </method>
@@ -30,17 +19,5 @@
     <method name="IsLocal">
       <arg name="local" direction="out" type="b"/>
     </method>
-    <method name="AddUserAuthorization">
-      <arg name="username" direction="in" type="s"/>
-      <arg name="filename" direction="out" type="s"/>
-    </method>
-    <method name="RemoveUserAuthorization">
-      <arg name="username" direction="in" type="s"/>
-    </method>
-    <method name="GetTimedLoginDetails">
-      <arg name="enabled" direction="out" type="b"/>
-      <arg name="username" direction="out" type="s"/>
-      <arg name="delay" direction="out" type="i"/>
-    </method>
   </interface>
 </node>