← Back to branch summary

~ubuntu-branches/ubuntu/raring/consolekit/raring

« back to all changes in this revision

Viewing changes to src/ck-session.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-10-13 12:28:33 UTC
  • mfrom: (0.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20101013122833-i43tbcnvjs3jiynv
Tags: 0.4.2-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - 10-retry_console_open_eio.patch: Retry console opens if they return
    EIO, since this may happen while a tty is closing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ck-session.c
1064
1064
                                                            0,
1065
1065
                                                            G_PARAM_READWRITE));
1066
1066
        g_object_class_install_property (object_class,
1067
 
                                         PROP_ACTIVE,
 
1067
                                         PROP_IDLE_HINT,
1068
1068
                                         g_param_spec_boolean ("idle-hint",
1069
1069
                                                               NULL,
1070
1070
                                                               NULL,
1105
1105
        g_free (session->priv->cookie);
1106
1106
        g_free (session->priv->seat_id);
1107
1107
        g_free (session->priv->session_type);
1108
 
        g_free (session->priv->x11_display);
 
1108
        g_free (session->priv->login_session_id);
1109
1109
        g_free (session->priv->display_device);
1110
1110
        g_free (session->priv->x11_display_device);
 
1111
        g_free (session->priv->x11_display);
1111
1112
        g_free (session->priv->remote_host_name);
1112
1113
 
1113
1114
        G_OBJECT_CLASS (ck_session_parent_class)->finalize (object);