ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 121
committer: Ken VanDine <ken.vandine@xxxxxxxxxxxxx>
branch nick: indicator-me-gdbus
timestamp: Fri 2011-01-14 11:23:23 -0600
message:
  * check status_proxy_cancel for NULL to prevents dupes
  * cast user_data after checking for error from the dbus proxy
modified:
  src/indicator-me.c


--
lp:indicator-me
https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-me.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk/+edit-subscription

=== modified file 'src/indicator-me.c'
--- src/indicator-me.c	2011-01-13 20:37:08 +0000
+++ src/indicator-me.c	2011-01-14 17:23:23 +0000
@@ -313,8 +313,9 @@
 {
 	if (connected) {
 		if (status_proxy == NULL) {
-			status_proxy_cancel = g_cancellable_new();
-
+			if (status_proxy_cancel == NULL) {
+				status_proxy_cancel = g_cancellable_new();
+			}
 			g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
 						G_DBUS_PROXY_FLAGS_NONE,
 						NULL,
@@ -363,8 +364,6 @@
 
 	g_return_if_fail(object != NULL);
 
-	IndicatorMe * self = INDICATOR_ME (user_data);
-
 	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
 
 	if (status_proxy_cancel != NULL) {
@@ -378,6 +377,8 @@
 		return;
 	}
 
+	IndicatorMe * self = INDICATOR_ME (user_data);
+
 	/* Okay, we're good to grab the proxy at this point, we're
 	sure that it's ours. */
 	status_proxy = proxy;