Merge with trunk

diff --cc src/mir-session.c
index 50957359d8738f14eaae06936f3e323b42d6abbd,0000000000000000000000000000000000000000..b0b2f279fb0a8ebff750452a1d1c5255d5b85a91
mode 100644,000000..100644
--- 1/src/mir-session.c
--- /dev/null
+++ b/src/mir-session.c
@@@ -1,60 -1,0 +1,49 @@@
- 
- struct MirSessionPrivate
- {
-     /* Mir server information */
-     MirServer *mir_server;
- };
 +/*
 + * 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
 + * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
 + * license.
 + */
 +
 +#include "mir-session.h"
- mir_session_new (MirServer *mir_server)
++#include "mir-server.h"
 +
 +G_DEFINE_TYPE (MirSession, mir_session, SESSION_TYPE);
 +
 +MirSession *
-     session->priv->mir_server = g_object_ref (mir_server);
++mir_session_new (void)
 +{
 +    MirSession *session;
 +
 +    session = g_object_new (MIR_SESSION_TYPE, NULL);
- mir_session_init (MirSession *session)
++    session_set_log_file (SESSION (session), ".session-errors");
 +
 +    return session;
 +}
 +
 +static void
-     session->priv = G_TYPE_INSTANCE_GET_PRIVATE (session, MIR_SESSION_TYPE, MirSessionPrivate);
++mir_session_set_display_server (Session *session, DisplayServer *display_server)
 +{
- mir_session_finalize (GObject *object)
++    MirServer *mir_server;
++
++    mir_server = MIR_SERVER (display_server);
++
++    SESSION_CLASS (mir_session_parent_class)->set_display_server (session, display_server);
 +}
 +
 +static void
-     MirSession *self;
- 
-     self = MIR_SESSION (object);
- 
-     if (self->priv->mir_server)
-         g_object_unref (self->priv->mir_server);
- 
-     G_OBJECT_CLASS (mir_session_parent_class)->finalize (object);
++mir_session_init (MirSession *session)
 +{
-     GObjectClass *object_class = G_OBJECT_CLASS (klass);
- 
-     object_class->finalize = mir_session_finalize;
 +}
 +
 +static void
 +mir_session_class_init (MirSessionClass *klass)
 +{
-     g_type_class_add_private (klass, sizeof (MirSessionPrivate));
++    SessionClass *session_class = SESSION_CLASS (klass);
 +
++    session_class->set_display_server = mir_session_set_display_server;
 +}

diff --cc src/mir-session.h
index bac83c57931cdcf57ebe9829df97b07c8dcf1318,0000000000000000000000000000000000000000..d8b87d3c083e341544b2825f225477925fb38273
mode 100644,000000..100644
--- 1/src/mir-session.h
--- /dev/null
+++ b/src/mir-session.h
@@@ -1,42 -1,0 +1,41 @@@
- #include "mir-server.h"
 +/*
 + * 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
 + * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
 + * license.
 + */
 +
 +#ifndef MIR_SESSION_H_
 +#define MIR_SESSION_H_
 +
 +#include "session.h"
- MirSession *mir_session_new (MirServer *mir_server);
 +
 +G_BEGIN_DECLS
 +
 +#define MIR_SESSION_TYPE (mir_session_get_type())
 +#define MIR_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIR_SESSION_TYPE, MirSession))
 +
 +typedef struct MirSessionPrivate MirSessionPrivate;
 +
 +typedef struct
 +{
 +    Session            parent_instance;
 +    MirSessionPrivate *priv;
 +} MirSession;
 +
 +typedef struct
 +{
 +    SessionClass parent_class;
 +} MirSessionClass;
 +
 +GType mir_session_get_type (void);
 +
++MirSession *mir_session_new (void);
 +
 +G_END_DECLS
 +
 +#endif /* MIR_SESSION_H_ */

diff --cc src/session.h
Simple merge

diff --cc src/xsession.c
index 0c0b99dfd42ecd4539e7ea2d7b903311695bac27,ec4c09c85a10b5401d99cb40cf9cd4f3d73df893..243d12a666322fbd9c5c4f3d95ed0abd29f22e20
--- 1/src/xsession.c
--- 2/src/xsession.c
+++ b/src/xsession.c
@@@ -15,14 -15,8 +15,8 @@@
  #include <sys/stat.h>
  
  #include "xsession.h"
++#include "xserver.h"
  #include "configuration.h"
--#include "privileges.h"
- 
- struct XSessionPrivate
- {
-     /* X server connected to */
-     XServer *xserver;
- };
  
  G_DEFINE_TYPE (XSession, xsession, SESSION_TYPE);
  

diff --cc src/xsession.h
index f6b9530a39f67c1fc7985ffb9e961ff73b7de59d,4e759c60568cd4db81821c9255725aeaa998d339..599fe9059b234628d062317831b691ac9252dcda
--- 1/src/xsession.h
--- 2/src/xsession.h
+++ b/src/xsession.h
@@@ -13,7 -13,7 +13,6 @@@
  #define XSESSION_H_
  
  #include "session.h"
--#include "xserver.h"
  
  G_BEGIN_DECLS
  

diff --cc tests/Makefile.am
Simple merge