|
18355
|
1 |
--- gdm-2.30.4/gui/simple-greeter/gdm-user-manager.c.ori 2010-07-20 03:31:59.111785942 +0100
|
|
|
2 |
+++ gdm-2.30.4/gui/simple-greeter/gdm-user-manager.c 2010-07-20 03:32:13.747579170 +0100
|
|
|
3 |
@@ -93,7 +93,7 @@
|
|
|
4 |
union {
|
|
|
5 |
DBusGProxyCall *get_current_session_call;
|
|
|
6 |
DBusGProxyCall *get_seat_id_call;
|
|
|
7 |
- };
|
|
|
8 |
+ } proxy_call;
|
|
|
9 |
|
|
|
10 |
DBusGProxy *proxy;
|
|
|
11 |
} GdmUserManagerSeat;
|
|
|
12 |
@@ -116,7 +116,7 @@
|
|
|
13 |
union {
|
|
|
14 |
DBusGProxyCall *get_unix_user_call;
|
|
|
15 |
DBusGProxyCall *get_x11_display_call;
|
|
|
16 |
- };
|
|
|
17 |
+ } proxy_call;
|
|
|
18 |
|
|
|
19 |
DBusGProxy *proxy;
|
|
|
20 |
|
|
|
21 |
@@ -542,7 +542,7 @@
|
|
|
22 |
char *seat_id;
|
|
|
23 |
gboolean res;
|
|
|
24 |
|
|
|
25 |
- g_assert (manager->priv->seat.get_seat_id_call == call);
|
|
|
26 |
+ g_assert (manager->priv->seat.proxy_call.get_seat_id_call == call);
|
|
|
27 |
|
|
|
28 |
error = NULL;
|
|
|
29 |
seat_id = NULL;
|
|
|
30 |
@@ -552,7 +552,7 @@
|
|
|
31 |
DBUS_TYPE_G_OBJECT_PATH,
|
|
|
32 |
&seat_id,
|
|
|
33 |
G_TYPE_INVALID);
|
|
|
34 |
- manager->priv->seat.get_seat_id_call = NULL;
|
|
|
35 |
+ manager->priv->seat.proxy_call.get_seat_id_call = NULL;
|
|
|
36 |
g_object_unref (proxy);
|
|
|
37 |
|
|
|
38 |
if (! res) {
|
|
|
39 |
@@ -604,7 +604,7 @@
|
|
|
40 |
goto failed;
|
|
|
41 |
}
|
|
|
42 |
|
|
|
43 |
- manager->priv->seat.get_seat_id_call = call;
|
|
|
44 |
+ manager->priv->seat.proxy_call.get_seat_id_call = call;
|
|
|
45 |
|
|
|
46 |
return;
|
|
|
47 |
|
|
|
48 |
@@ -742,7 +742,7 @@
|
|
|
49 |
char *session_id;
|
|
|
50 |
gboolean res;
|
|
|
51 |
|
|
|
52 |
- g_assert (manager->priv->seat.get_current_session_call == call);
|
|
|
53 |
+ g_assert (manager->priv->seat.proxy_call.get_current_session_call == call);
|
|
|
54 |
g_assert (manager->priv->seat.state == GDM_USER_MANAGER_SEAT_STATE_GET_SESSION_ID);
|
|
|
55 |
|
|
|
56 |
error = NULL;
|
|
|
57 |
@@ -753,7 +753,7 @@
|
|
|
58 |
DBUS_TYPE_G_OBJECT_PATH,
|
|
|
59 |
&session_id,
|
|
|
60 |
G_TYPE_INVALID);
|
|
|
61 |
- manager->priv->seat.get_current_session_call = NULL;
|
|
|
62 |
+ manager->priv->seat.proxy_call.get_current_session_call = NULL;
|
|
|
63 |
g_object_unref (proxy);
|
|
|
64 |
|
|
|
65 |
if (! res) {
|
|
|
66 |
@@ -801,7 +801,7 @@
|
|
|
67 |
goto failed;
|
|
|
68 |
}
|
|
|
69 |
|
|
|
70 |
- manager->priv->seat.get_current_session_call = call;
|
|
|
71 |
+ manager->priv->seat.proxy_call.get_current_session_call = call;
|
|
|
72 |
|
|
|
73 |
return;
|
|
|
74 |
|
|
|
75 |
@@ -870,7 +870,7 @@
|
|
|
76 |
|
|
|
77 |
manager = new_session->manager;
|
|
|
78 |
|
|
|
79 |
- g_assert (new_session->get_unix_user_call == call);
|
|
|
80 |
+ g_assert (new_session->proxy_call.get_unix_user_call == call);
|
|
|
81 |
|
|
|
82 |
error = NULL;
|
|
|
83 |
uid = (guint) -1;
|
|
|
84 |
@@ -879,7 +879,7 @@
|
|
|
85 |
&error,
|
|
|
86 |
G_TYPE_UINT, &uid,
|
|
|
87 |
G_TYPE_INVALID);
|
|
|
88 |
- new_session->get_unix_user_call = NULL;
|
|
|
89 |
+ new_session->proxy_call.get_unix_user_call = NULL;
|
|
|
90 |
|
|
|
91 |
if (! res) {
|
|
|
92 |
if (error != NULL) {
|
|
|
93 |
@@ -922,7 +922,7 @@
|
|
|
94 |
goto failed;
|
|
|
95 |
}
|
|
|
96 |
|
|
|
97 |
- new_session->get_unix_user_call = call;
|
|
|
98 |
+ new_session->proxy_call.get_unix_user_call = call;
|
|
|
99 |
return;
|
|
|
100 |
|
|
|
101 |
failed:
|
|
|
102 |
@@ -938,7 +938,7 @@
|
|
|
103 |
char *x11_display;
|
|
|
104 |
gboolean res;
|
|
|
105 |
|
|
|
106 |
- g_assert (new_session->get_x11_display_call == call);
|
|
|
107 |
+ g_assert (new_session->proxy_call.get_x11_display_call == call);
|
|
|
108 |
|
|
|
109 |
error = NULL;
|
|
|
110 |
x11_display = NULL;
|
|
|
111 |
@@ -948,7 +948,7 @@
|
|
|
112 |
G_TYPE_STRING,
|
|
|
113 |
&x11_display,
|
|
|
114 |
G_TYPE_INVALID);
|
|
|
115 |
- new_session->get_x11_display_call = NULL;
|
|
|
116 |
+ new_session->proxy_call.get_x11_display_call = NULL;
|
|
|
117 |
|
|
|
118 |
if (! res) {
|
|
|
119 |
if (error != NULL) {
|
|
|
120 |
@@ -991,7 +991,7 @@
|
|
|
121 |
goto failed;
|
|
|
122 |
}
|
|
|
123 |
|
|
|
124 |
- new_session->get_x11_display_call = call;
|
|
|
125 |
+ new_session->proxy_call.get_x11_display_call = call;
|
|
|
126 |
return;
|
|
|
127 |
|
|
|
128 |
failed:
|