[Galago-commits] r2660 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-02 16:39:45 -0700 (Sun, 02 Apr 2006)
New Revision: 2660

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-core.c
Log:
Free a DBusError that was initted when adding bus matches.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-02 23:37:48 UTC (rev 2659)
+++ trunk/libgalago/ChangeLog	2006-04-02 23:39:45 UTC (rev 2660)
@@ -1,3 +1,8 @@
+Sun Apr 02 16:39:18 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	  - Free a DBusError that was initted when adding bus matches.
+
 Sun Apr 02 16:36:58 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-core.c:

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-02 23:37:48 UTC (rev 2659)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-02 23:39:45 UTC (rev 2660)
@@ -963,7 +963,7 @@
 	{ \
 		g_error("Unable to subscribe to %s signal: %s", \
 				(iface), error.message); \
-		return; \
+		goto exit; \
 	}
 #define REMOVE_SIGNAL_MATCH(iface) \
 	dbus_bus_remove_match(dbus_conn, \
@@ -975,7 +975,7 @@
 	{ \
 		g_error("Unable to unsubscribe from %s signal: %s", \
 				(iface), error.message); \
-		return; \
+		goto exit; \
 	}
 
 void
@@ -1014,6 +1014,9 @@
 		REMOVE_SIGNAL_MATCH(GALAGO_DBUS_IMAGE_INTERFACE);
 		REMOVE_SIGNAL_MATCH(GALAGO_DBUS_PRESENCE_INTERFACE);
 	}
+
+exit:
+	dbus_error_free(&error);
 }
 
 #undef ADD_SIGNAL_MATCH