/*
* Copyright (C) 2010-2011 Robert Ancell.
* Author: Robert Ancell <robert.ancell@canonical.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 3 of the License, or (at your option) any later
struct DisplayServerPrivate
{
- /* Unique name for this display server */
- gchar *name;
+ /* TRUE when started */
+ gboolean is_ready;
/* TRUE when being stopped */
gboolean stopping;
static void display_server_logger_iface_init (LoggerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (DisplayServer, display_server, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (
- LOGGER_TYPE, display_server_logger_iface_init));
+ G_IMPLEMENT_INTERFACE (LOGGER_TYPE, display_server_logger_iface_init));
-void
-display_server_set_name (DisplayServer *server, const gchar *name)
+const gchar *
+display_server_get_session_type (DisplayServer *server)
{
- g_return_if_fail (server != NULL);
- g_free (server->priv->name);
- server->priv->name = g_strdup (name);
+ return DISPLAY_SERVER_GET_CLASS (server)->get_session_type (server);
}
-const gchar *
-display_server_get_name (DisplayServer *server)
+DisplayServer *
+display_server_get_parent (DisplayServer *server)
{
g_return_val_if_fail (server != NULL, NULL);
- return server->priv->name;
+ return DISPLAY_SERVER_GET_CLASS (server)->get_parent (server);
}
-const gchar *
-display_server_get_session_type (DisplayServer *server)
+static DisplayServer *
+display_server_real_get_parent (DisplayServer *server)
{
- return DISPLAY_SERVER_GET_CLASS (server)->get_session_type (server);
+ return NULL;
}
gboolean
display_server_get_can_share (DisplayServer *server)
{
+ g_return_val_if_fail (server != NULL, FALSE);
return DISPLAY_SERVER_GET_CLASS (server)->get_can_share (server);
}
return DISPLAY_SERVER_GET_CLASS (server)->start (server);
}
+gboolean
+display_server_get_is_ready (DisplayServer *server)
+{
+ g_return_val_if_fail (server != NULL, FALSE);
+ return server->priv->is_ready;
+}
+
static gboolean
display_server_real_start (DisplayServer *server)
{
+ server->priv->is_ready = TRUE;
g_signal_emit (server, signals[READY], 0);
return TRUE;
}
static void
display_server_class_init (DisplayServerClass *klass)
{
+ klass->get_parent = display_server_real_get_parent;
klass->get_can_share = display_server_real_get_can_share;
klass->get_vt = display_server_real_get_vt;
klass->start = display_server_real_start;
g_type_class_add_private (klass, sizeof (DisplayServerPrivate));
signals[READY] =
- g_signal_new ("ready",
+ g_signal_new (DISPLAY_SERVER_SIGNAL_READY,
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (DisplayServerClass, ready),
NULL,
G_TYPE_NONE, 0);
signals[STOPPED] =
- g_signal_new ("stopped",
+ g_signal_new (DISPLAY_SERVER_SIGNAL_STOPPED,
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (DisplayServerClass, stopped),
static gint
display_server_real_logprefix (Logger *self, gchar *buf, gulong buflen)
{
- DisplayServer *server = DISPLAY_SERVER (self);
- const gchar *name = display_server_get_name (server);
- if (name)
- return g_snprintf (buf, buflen, "DisplayServer %s: ", name);
- else
- return g_snprintf (buf, buflen, "DisplayServer: ");
+ return g_snprintf (buf, buflen, "DisplayServer: ");
}
static void