1
=== modified file 'src/indicator-me.c'
2
--- src/indicator-me.c	2011-04-04 16:47:54 +0000
3
+++ src/indicator-me.c	2011-04-14 15:46:27 +0000
4
@@ -179,7 +179,7 @@
5
179
username_cb (GObject * object, GAsyncResult * res, gpointer user_data)
179
username_cb (GObject * object, GAsyncResult * res, gpointer user_data)
6
180
{
180
{
7
181
	GError * error = NULL;
181
	GError * error = NULL;
9
182
	gchar * username;
182
	gchar * username = NULL;
10
183
	GVariant * result;
183
	GVariant * result;
11
184
184
12
185
	IndicatorMe * self = INDICATOR_ME (user_data);
185
	IndicatorMe * self = INDICATOR_ME (user_data);
13
186
186
14
=== modified file 'src/me-service-dbus.c'
15
--- src/me-service-dbus.c	2011-01-13 20:37:08 +0000
16
+++ src/me-service-dbus.c	2011-04-14 15:46:27 +0000
17
@@ -310,11 +310,11 @@
18
310
                                       INDICATOR_ME_SERVICE_DBUS_OBJECT,
310
                                       INDICATOR_ME_SERVICE_DBUS_OBJECT,
19
311
                                       INDICATOR_ME_SERVICE_DBUS_INTERFACE,
311
                                       INDICATOR_ME_SERVICE_DBUS_INTERFACE,
20
312
                                       "UserChanged",
312
                                       "UserChanged",
22
313
                                       NULL,
313
                                       g_variant_new("(s)", username),
23
314
                                       &error);
314
                                       &error);
24
315
315
25
316
	if (error != NULL) {
316
	if (error != NULL) {
27
317
		g_error("Unable to send UserChanged signal: %s", error->message);
317
		g_warning("Unable to send UserChanged signal: %s", error->message);
28
318
		g_error_free(error);
318
		g_error_free(error);
29
319
		return;
319
		return;
30
320
	}
320
	}
Status:	Merged
Approved by:	Ted Gould on 2011-04-14
Approved revision:	146
Merged at revision:	145
Proposed branch:	lp:~ken-vandine/indicator-me/lp_754524
Merge into:	lp:indicator-me
Diff against target:	30 lines (+3/-3) 2 files modified src/indicator-me.c (+1/-1) src/me-service-dbus.c (+2/-2)
To merge this branch:	bzr merge lp:~ken-vandine/indicator-me/lp_754524
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2011-04-14	Approve on 2011-04-14
Review via email: mp+57713@code.launchpad.net
1	=== modified file 'src/indicator-me.c'
2	--- src/indicator-me.c 2011-04-04 16:47:54 +0000
3	+++ src/indicator-me.c 2011-04-14 15:46:27 +0000
4	@@ -179,7 +179,7 @@
5	179	username_cb (GObject * object, GAsyncResult * res, gpointer user_data)	179	username_cb (GObject * object, GAsyncResult * res, gpointer user_data)
6	180	{	180	{
7	181	GError * error = NULL;	181	GError * error = NULL;
9	182	gchar * username;	182	gchar * username = NULL;
10	183	GVariant * result;	183	GVariant * result;
11	184		184
12	185	IndicatorMe * self = INDICATOR_ME (user_data);	185	IndicatorMe * self = INDICATOR_ME (user_data);
13	186		186
14	=== modified file 'src/me-service-dbus.c'
15	--- src/me-service-dbus.c 2011-01-13 20:37:08 +0000
16	+++ src/me-service-dbus.c 2011-04-14 15:46:27 +0000
17	@@ -310,11 +310,11 @@
18	310	INDICATOR_ME_SERVICE_DBUS_OBJECT,	310	INDICATOR_ME_SERVICE_DBUS_OBJECT,
19	311	INDICATOR_ME_SERVICE_DBUS_INTERFACE,	311	INDICATOR_ME_SERVICE_DBUS_INTERFACE,
20	312	"UserChanged",	312	"UserChanged",
22	313	NULL,	313	g_variant_new("(s)", username),
23	314	&error);	314	&error);
24	315		315
25	316	if (error != NULL) {	316	if (error != NULL) {
27	317	g_error("Unable to send UserChanged signal: %s", error->message);	317	g_warning("Unable to send UserChanged signal: %s", error->message);
28	318	g_error_free(error);	318	g_error_free(error);
29	319	return;	319	return;
30	320	}	320	}