Session Menu

Merge lp:~cjcurran/indicator-session/redundant-max-users-limit into lp:indicator-session/0.1

  1. redundant-max-users-limit
  2. Merge into trunk
Proposed by Conor Curran
Status: Merged
Merged at revision: 227
Proposed branch: lp:~cjcurran/indicator-session/redundant-max-users-limit
Merge into: lp:indicator-session/0.1
Diff against target: 104 lines (+32/-11)
4 files modified
.bzrignore (+28/-0)
src/user-menu-mgr.c (+2/-2)
src/users-service-dbus.c (+2/-8)
src/users-service-dbus.h (+0/-1)
To merge this branch: bzr merge lp:~cjcurran/indicator-session/redundant-max-users-limit
Reviewer Review Type Date Requested Status
Ted Gould Pending
Review via email: mp+80394@code.launchpad.net

Description of the change

fixes bug attached. No need for Max users limit now that the users have their own menu.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-08-24 21:03:53 +0000
3+++ .bzrignore 2011-10-25 21:52:23 +0000
4@@ -213,3 +213,31 @@
5 data/indicator-session-lock-screen.desktop
6 test-ascii-quotes
7 test-space-ellipsis
8+po/af.gmo
9+po/an.gmo
10+po/bo.gmo
11+po/ca@valencia.gmo
12+po/cy.gmo
13+po/dv.gmo
14+po/fur.gmo
15+po/fy.gmo
16+po/gd.gmo
17+po/gv.gmo
18+po/hy.gmo
19+po/ka.gmo
20+po/km.gmo
21+po/ky.gmo
22+po/mg.gmo
23+po/mk.gmo
24+po/ml.gmo
25+po/my.gmo
26+po/ne.gmo
27+po/ny.gmo
28+po/os.gmo
29+po/sc.gmo
30+po/sd.gmo
31+po/ta.gmo
32+po/ta_LK.gmo
33+po/tt.gmo
34+po/ur.gmo
35+po/vec.gmo
36
37=== modified file 'src/user-menu-mgr.c'
38--- src/user-menu-mgr.c 2011-09-07 20:02:44 +0000
39+++ src/user-menu-mgr.c 2011-10-25 21:52:23 +0000
40@@ -191,7 +191,7 @@
41
42
43
44- if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
45+ if (self->user_count > MINIMUM_USERS) {
46 users = g_list_sort (users, (GCompareFunc)compare_users_by_username);
47 }
48
49@@ -206,7 +206,7 @@
50 session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
51 }
52
53- if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
54+ if (self->user_count > MINIMUM_USERS) {
55 mi = dbusmenu_menuitem_new ();
56 dbusmenu_menuitem_property_set (mi,
57 DBUSMENU_MENUITEM_PROP_TYPE,
58
59=== modified file 'src/users-service-dbus.c'
60--- src/users-service-dbus.c 2011-09-21 05:47:17 +0000
61+++ src/users-service-dbus.c 2011-10-25 21:52:23 +0000
62@@ -303,7 +303,6 @@
63
64 priv->count = users->len;
65 g_ptr_array_free (users, TRUE);
66-
67 sync_users (self);
68 }
69
70@@ -719,7 +718,7 @@
71 g_return_if_fail(IS_USERS_SERVICE_DBUS(self));
72 UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
73
74- if (priv->count > MINIMUM_USERS && priv->count < MAXIMUM_USERS)
75+ if (priv->count > MINIMUM_USERS)
76 {
77 GPtrArray *users = NULL;
78 GError *error = NULL;
79@@ -823,12 +822,7 @@
80 UsersServiceDbus *service = (UsersServiceDbus *)user_data;
81 UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (service);
82 priv->count++;
83-
84- if (priv->count < MAXIMUM_USERS)
85- {
86- sync_users (service);
87- }
88-
89+ sync_users (service);
90 g_signal_emit (service,
91 signals[USER_ADDED],
92 0,
93
94=== modified file 'src/users-service-dbus.h'
95--- src/users-service-dbus.h 2011-09-07 20:02:44 +0000
96+++ src/users-service-dbus.h 2011-10-25 21:52:23 +0000
97@@ -58,7 +58,6 @@
98 * got some gdm issues worked out.
99 */
100 #define MINIMUM_USERS 0
101-#define MAXIMUM_USERS 7
102
103 struct _UsersServiceDbus {
104 GObject parent;

Subscribers

People subscribed via source and target branches