[gdm] Don't track manager from user object
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] Don't track manager from user object
- Date: Fri, 11 Jun 2010 00:18:04 +0000 (UTC)
commit e6f7e8643aeb45857c152ea71932be87cfcaad80
Author: Ray Strode <rstrode redhat com>
Date: Mon Mar 15 14:05:58 2010 -0400
Don't track manager from user object
We don't need it, and it's a bit backward anyway.
https://bugzilla.gnome.org/show_bug.cgi?id=610179
gui/simple-greeter/gdm-user-manager.c | 2 +-
gui/simple-greeter/gdm-user.c | 21 ---------------------
2 files changed, 1 insertions(+), 22 deletions(-)
---
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
index 2a63db0..5e72873 100644
--- a/gui/simple-greeter/gdm-user-manager.c
+++ b/gui/simple-greeter/gdm-user-manager.c
@@ -591,7 +591,7 @@ create_user (GdmUserManager *manager)
{
GdmUser *user;
- user = g_object_new (GDM_TYPE_USER, "manager", manager, NULL);
+ user = g_object_new (GDM_TYPE_USER, NULL);
g_signal_connect (user,
"sessions-changed",
G_CALLBACK (on_user_sessions_changed),
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
index 814280d..3dcf932 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
@@ -30,7 +30,6 @@
#include <gio/gio.h>
#include <gtk/gtk.h>
-#include "gdm-user-manager.h"
#include "gdm-user-private.h"
#define GDM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_USER, GdmUserClass))
@@ -44,7 +43,6 @@
enum {
PROP_0,
- PROP_MANAGER,
PROP_REAL_NAME,
PROP_USER_NAME,
PROP_UID,
@@ -61,8 +59,6 @@ enum {
struct _GdmUser {
GObject parent;
- GdmUserManager *manager;
-
uid_t uid;
char *user_name;
char *real_name;
@@ -168,10 +164,6 @@ gdm_user_set_property (GObject *object,
user = GDM_USER (object);
switch (param_id) {
- case PROP_MANAGER:
- user->manager = g_value_get_object (value);
- g_assert (user->manager);
- break;
case PROP_LOGIN_FREQUENCY:
_gdm_user_set_login_frequency (user, g_value_get_ulong (value));
break;
@@ -192,9 +184,6 @@ gdm_user_get_property (GObject *object,
user = GDM_USER (object);
switch (param_id) {
- case PROP_MANAGER:
- g_value_set_object (value, user->manager);
- break;
case PROP_USER_NAME:
g_value_set_string (value, user->user_name);
break;
@@ -231,15 +220,6 @@ gdm_user_class_init (GdmUserClass *class)
gobject_class->finalize = gdm_user_finalize;
g_object_class_install_property (gobject_class,
- PROP_MANAGER,
- g_param_spec_object ("manager",
- _("Manager"),
- _("The user manager object this user is controlled by."),
- GDM_TYPE_USER_MANAGER,
- (G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY)));
-
- g_object_class_install_property (gobject_class,
PROP_REAL_NAME,
g_param_spec_string ("real-name",
"Real Name",
@@ -298,7 +278,6 @@ gdm_user_class_init (GdmUserClass *class)
static void
gdm_user_init (GdmUser *user)
{
- user->manager = NULL;
user->user_name = NULL;
user->real_name = NULL;
user->sessions = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]