Light Display Manager

Merge lp:~cimi/lightdm/uid-bindings into lp:lightdm

  1. uid-bindings
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 1982
Proposed branch: lp:~cimi/lightdm/uid-bindings
Merge into: lp:lightdm
Diff against target: 178 lines (+41/-6)
5 files modified
debian/liblightdm-gobject-1-0.symbols (+1/-0)
liblightdm-gobject/lightdm/user.h (+2/-0)
liblightdm-gobject/user.c (+28/-2)
liblightdm-qt/QLightDM/usersmodel.h (+2/-1)
liblightdm-qt/usersmodel.cpp (+8/-3)
To merge this branch: bzr merge lp:~cimi/lightdm/uid-bindings
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+218958@code.launchpad.net

Commit message

Add bindings for uid

Description of the change

Add bindings for uid

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1981
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/lightdm/uid-bindings/+merge/218958/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/lightdm-ci/289/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/289/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Need to rename function...

31 +/**
32 + * lightdm_user_get_uid:
33 + * @user: A #LightDMUser
34 + *
35 + * Get the uid of a user.
36 + *
37 + * Return value: The uid of the given user
38 + **/
39 +uid_t
40 +lightdm_user_get_display_name (LightDMUser *user)

review: Needs Fixing
lp:~cimi/lightdm/uid-bindings updated
1982. By Andrea Cimitan

Rename function

Revision history for this message
Andrea Cimitan (cimi) wrote :

> Need to rename function...
>
> 31 +/**
> 32 + * lightdm_user_get_uid:
> 33 + * @user: A #LightDMUser
> 34 + *
> 35 + * Get the uid of a user.
> 36 + *
> 37 + * Return value: The uid of the given user
> 38 + **/
> 39 +uid_t
> 40 +lightdm_user_get_display_name (LightDMUser *user)

ooops :) done

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1982
http://jenkins.qa.ubuntu.com/job/lightdm-ci/290/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/290/rebuild

review: Needs Fixing (continuous-integration)
lp:~cimi/lightdm/uid-bindings updated
1983. By Andrea Cimitan

Merged trunk and added symbols

1984. By Andrea Cimitan

Right version

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1984
http://jenkins.qa.ubuntu.com/job/lightdm-ci/291/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/291/rebuild

review: Needs Fixing (continuous-integration)
lp:~cimi/lightdm/uid-bindings updated
1985. By Andrea Cimitan

Remove unwanted mod

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1985
http://jenkins.qa.ubuntu.com/job/lightdm-ci/292/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/292/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1984
http://jenkins.qa.ubuntu.com/job/lightdm-ci/293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/293/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/liblightdm-gobject-1-0.symbols'
2--- debian/liblightdm-gobject-1-0.symbols 2014-05-06 04:06:32 +0000
3+++ debian/liblightdm-gobject-1-0.symbols 2014-05-12 11:33:08 +0000
4@@ -78,6 +78,7 @@
5 lightdm_user_get_real_name@Base 0.9.2
6 lightdm_user_get_session@Base 0.9.2
7 lightdm_user_get_type@Base 0.9.2
8+ lightdm_user_get_uid@Base 1.11.1
9 lightdm_user_list_get_instance@Base 0.9.2
10 lightdm_user_list_get_length@Base 0.9.2
11 lightdm_user_list_get_type@Base 0.9.2
12
13=== modified file 'liblightdm-gobject/lightdm/user.h'
14--- liblightdm-gobject/lightdm/user.h 2013-07-02 03:35:20 +0000
15+++ liblightdm-gobject/lightdm/user.h 2014-05-12 11:33:08 +0000
16@@ -106,6 +106,8 @@
17
18 gboolean lightdm_user_get_has_messages (LightDMUser *user);
19
20+uid_t lightdm_user_get_uid (LightDMUser *user);
21+
22 G_END_DECLS
23
24 #endif /* LIGHTDM_USER_H_ */
25
26=== modified file 'liblightdm-gobject/user.c'
27--- liblightdm-gobject/user.c 2014-02-04 22:55:32 +0000
28+++ liblightdm-gobject/user.c 2014-05-12 11:33:08 +0000
29@@ -38,7 +38,8 @@
30 USER_PROP_LAYOUTS,
31 USER_PROP_SESSION,
32 USER_PROP_LOGGED_IN,
33- USER_PROP_HAS_MESSAGES
34+ USER_PROP_HAS_MESSAGES,
35+ USER_PROP_UID,
36 };
37
38 enum
39@@ -526,6 +527,21 @@
40 return common_user_get_has_messages (GET_USER_PRIVATE (user)->common_user);
41 }
42
43+/**
44+ * lightdm_user_get_uid:
45+ * @user: A #LightDMUser
46+ *
47+ * Get the uid of a user.
48+ *
49+ * Return value: The uid of the given user
50+ **/
51+uid_t
52+lightdm_user_get_uid (LightDMUser *user)
53+{
54+ g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
55+ return common_user_get_uid (GET_USER_PRIVATE (user)->common_user);
56+}
57+
58 static void
59 lightdm_user_init (LightDMUser *user)
60 {
61@@ -599,6 +615,9 @@
62 case USER_PROP_HAS_MESSAGES:
63 g_value_set_boolean (value, lightdm_user_get_has_messages (self));
64 break;
65+ case USER_PROP_UID:
66+ g_value_set_uint64 (value, lightdm_user_get_uid (self));
67+ break;
68 default:
69 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
70 break;
71@@ -620,7 +639,7 @@
72 lightdm_user_class_init (LightDMUserClass *klass)
73 {
74 GObjectClass *object_class = G_OBJECT_CLASS (klass);
75-
76+
77 g_type_class_add_private (klass, sizeof (LightDMUserPrivate));
78
79 object_class->set_property = lightdm_user_set_property;
80@@ -718,6 +737,13 @@
81 "TRUE if the user is has waiting messages",
82 FALSE,
83 G_PARAM_READWRITE));
84+ g_object_class_install_property (object_class,
85+ USER_PROP_UID,
86+ g_param_spec_string ("uid",
87+ "uid",
88+ "User UID",
89+ NULL,
90+ G_PARAM_READABLE));
91
92 /**
93 * LightDMUser::changed:
94
95=== modified file 'liblightdm-qt/QLightDM/usersmodel.h'
96--- liblightdm-qt/QLightDM/usersmodel.h 2013-04-16 16:37:08 +0000
97+++ liblightdm-qt/QLightDM/usersmodel.h 2014-05-12 11:33:08 +0000
98@@ -37,7 +37,8 @@
99 SessionRole,
100 HasMessagesRole,
101 ImagePathRole,
102- BackgroundPathRole
103+ BackgroundPathRole,
104+ UidRole
105 };
106
107 int rowCount(const QModelIndex &parent) const;
108
109=== modified file 'liblightdm-qt/usersmodel.cpp'
110--- liblightdm-qt/usersmodel.cpp 2013-03-08 21:49:47 +0000
111+++ liblightdm-qt/usersmodel.cpp 2014-05-12 11:33:08 +0000
112@@ -29,6 +29,7 @@
113 QString session;
114 bool isLoggedIn;
115 bool hasMessages;
116+ quint64 uid;
117 QString displayName() const;
118 };
119
120@@ -66,7 +67,7 @@
121 {
122 #if !defined(GLIB_VERSION_2_36)
123 g_type_init();
124-#endif
125+#endif
126 }
127
128 UsersModelPrivate::~UsersModelPrivate()
129@@ -99,6 +100,7 @@
130 user.session = QString::fromUtf8(lightdm_user_get_session(ldmUser));
131 user.isLoggedIn = lightdm_user_get_logged_in(ldmUser);
132 user.hasMessages = lightdm_user_get_has_messages(ldmUser);
133+ user.uid = (quint64)lightdm_user_get_uid(ldmUser);
134 users.append(user);
135 }
136
137@@ -109,8 +111,6 @@
138 g_signal_connect(lightdm_user_list_get_instance(), "user-removed", G_CALLBACK (cb_userRemoved), this);
139 }
140
141-
142-
143 void UsersModelPrivate::cb_userAdded(LightDMUserList *user_list, LightDMUser *ldmUser, gpointer data)
144 {
145 Q_UNUSED(user_list)
146@@ -126,6 +126,7 @@
147 user.background = QString::fromUtf8(lightdm_user_get_background(ldmUser));
148 user.isLoggedIn = lightdm_user_get_logged_in(ldmUser);
149 user.hasMessages = lightdm_user_get_has_messages(ldmUser);
150+ user.uid = (quint64)lightdm_user_get_uid(ldmUser);
151 that->users.append(user);
152
153 that->q_func()->endInsertRows();
154@@ -148,6 +149,7 @@
155 that->users[i].background = QString::fromUtf8(lightdm_user_get_background(ldmUser));
156 that->users[i].isLoggedIn = lightdm_user_get_logged_in(ldmUser);
157 that->users[i].hasMessages = lightdm_user_get_has_messages(ldmUser);
158+ that->users[i].uid = (quint64)lightdm_user_get_uid(ldmUser);
159
160 QModelIndex index = that->q_ptr->createIndex(i, 0);
161 that->q_ptr->dataChanged(index, index);
162@@ -189,6 +191,7 @@
163 roles[SessionRole] = "session";
164 roles[HasMessagesRole] = "hasMessages";
165 roles[ImagePathRole] = "imagePath";
166+ roles[UidRole] = "uid";
167 setRoleNames(roles);
168 d->loadUsers();
169
170@@ -240,6 +243,8 @@
171 return d->users[row].hasMessages;
172 case UsersModel::ImagePathRole:
173 return d->users[row].image;
174+ case UsersModel::UidRole:
175+ return d->users[row].uid;
176 }
177
178 return QVariant();

Subscribers

People subscribed via source and target branches