Commit 8b2ac7e7 authored by Ray Strode's avatar Ray Strode

display: add back manage vfunc

This function will be overridden by GdmLocalDisplay to
start the X server.

https://bugzilla.gnome.org/show_bug.cgi?id=744764
parent 08eee2ae
......@@ -626,6 +626,12 @@ on_slave_started (GdmSlave *slave,
_gdm_display_set_status (self, GDM_DISPLAY_MANAGED);
}
static void
gdm_display_real_manage (GdmDisplay *self)
{
gdm_slave_start (self->priv->slave);
}
static gboolean
gdm_display_real_prepare (GdmDisplay *self)
{
......@@ -674,7 +680,9 @@ on_list_cached_users_complete (GObject *proxy,
g_variant_unref (call_result);
}
gdm_slave_start (self->priv->slave);
if (GDM_DISPLAY_GET_CLASS (self)->manage != NULL) {
GDM_DISPLAY_GET_CLASS (self)->manage (self);
}
}
static void
......@@ -1390,6 +1398,7 @@ gdm_display_class_init (GdmDisplayClass *klass)
object_class->finalize = gdm_display_finalize;
klass->prepare = gdm_display_real_prepare;
klass->manage = gdm_display_real_manage;
g_object_class_install_property (object_class,
PROP_ID,
......
......@@ -56,7 +56,8 @@ typedef struct
GObjectClass parent_class;
/* methods */
gboolean (*prepare) (GdmDisplay *display);
gboolean (*prepare) (GdmDisplay *display);
void (*manage) (GdmDisplay *self);
} GdmDisplayClass;
typedef enum
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment