← Back to branch summary

~robert-ancell/lightdm/private-mir-connection-merge

« back to all changes in this revision

Viewing changes to src/display-server.c

  • Committer: Robert Ancell
  • Date: 2013-07-23 02:24:45 UTC
  • mfrom: (1723 trunk)
  • mto: This revision was merged to the branch mainline in revision 1741.
  • Revision ID: robert.ancell@canonical.com-20130723022445-gpaq8vtkp4hods7r
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/display-server.c
52
52
    return server->priv->name;
53
53
}
54
54
 
 
55
gint
 
56
display_server_get_vt (DisplayServer *server)
 
57
{
 
58
    return DISPLAY_SERVER_GET_CLASS (server)->get_vt (server);
 
59
}
 
60
 
 
61
static gint
 
62
display_server_real_get_vt (DisplayServer *server)
 
63
{
 
64
    return -1;
 
65
}
 
66
 
55
67
void
56
68
display_server_set_start_local_sessions (DisplayServer *server, gboolean start_local_sessions)
57
69
{
93
105
}
94
106
 
95
107
gboolean
96
 
display_server_get_is_stopped (DisplayServer *server)
 
108
display_server_get_is_stopping (DisplayServer *server)
97
109
{
98
 
    g_return_val_if_fail (server != NULL, TRUE);
99
 
    return server->priv->stopped;
 
110
    g_return_val_if_fail (server != NULL, FALSE);
 
111
    return server->priv->stopping;
100
112
}
101
113
 
102
114
static void
103
115
display_server_real_stop (DisplayServer *server)
104
116
{
105
 
    server->priv->stopped = TRUE;
106
117
    g_signal_emit (server, signals[STOPPED], 0);
107
118
}
108
119
 
109
 
static gboolean
110
 
display_server_real_get_is_stopped (DisplayServer *server)
111
 
{
112
 
    return server->priv->stopped;
113
 
}
114
 
 
115
120
static void
116
121
display_server_init (DisplayServer *server)
117
122
{
122
127
static void
123
128
display_server_class_init (DisplayServerClass *klass)
124
129
{
 
130
    klass->get_vt = display_server_real_get_vt;
125
131
    klass->start = display_server_real_start;
126
132
    klass->stop = display_server_real_stop;
127
133
 
133
139
                      G_SIGNAL_RUN_LAST,
134
140
                      G_STRUCT_OFFSET (DisplayServerClass, ready),
135
141
                      NULL, NULL,
136
 
                      g_cclosure_marshal_VOID__VOID,
 
142
                      NULL,
137
143
                      G_TYPE_NONE, 0);
138
144
    signals[STOPPED] =
139
145
        g_signal_new ("stopped",
141
147
                      G_SIGNAL_RUN_LAST,
142
148
                      G_STRUCT_OFFSET (DisplayServerClass, stopped),
143
149
                      NULL, NULL,
144
 
                      g_cclosure_marshal_VOID__VOID,
 
150
                      NULL,
145
151
                      G_TYPE_NONE, 0);
146
152
}