← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/src/x-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:
tests/src/x-server.c
91
91
                      G_SIGNAL_RUN_LAST,
92
92
                      G_STRUCT_OFFSET (XClientClass, disconnected),
93
93
                      NULL, NULL,
94
 
                      g_cclosure_marshal_VOID__VOID,
 
94
                      NULL,
95
95
                      G_TYPE_NONE, 0);
96
96
}
97
97
 
196
196
                      G_SIGNAL_RUN_LAST,
197
197
                      G_STRUCT_OFFSET (XServerClass, client_connected),
198
198
                      NULL, NULL,
199
 
                      g_cclosure_marshal_VOID__OBJECT,
 
199
                      NULL,
200
200
                      G_TYPE_NONE, 1, x_client_get_type ());
201
201
    x_server_signals[X_SERVER_CLIENT_DISCONNECTED] =
202
202
        g_signal_new ("client-disconnected",
204
204
                      G_SIGNAL_RUN_LAST,
205
205
                      G_STRUCT_OFFSET (XServerClass, client_disconnected),
206
206
                      NULL, NULL,
207
 
                      g_cclosure_marshal_VOID__OBJECT,
 
207
                      NULL,
208
208
                      G_TYPE_NONE, 1, x_client_get_type ());
209
209
}