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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-02 16:29:18 -0700 (Sun, 02 Apr 2006)
New Revision: 2657

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-context.c
   trunk/libgalago/libgalago/galago-core.c
   trunk/libgalago/libgalago/galago-object.c
   trunk/libgalago/libgalago/galago-service.c
Log:
- Fix a newly introduced problem where we were unreffing a NULL DBusMessage.
- Be a little more strict in some of our checks.
- Condense more code, for great justice.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-02 23:27:53 UTC (rev 2656)
+++ trunk/libgalago/ChangeLog	2006-04-02 23:29:18 UTC (rev 2657)
@@ -1,3 +1,14 @@
+Sun Apr 02 16:28:17 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-context.c:
+	* libgalago/galago-core.c:
+	* libgalago/galago-object.c:
+	* libgalago/galago-service.c:
+	  - Fix a newly introduced problem where we were unreffing a NULL
+	    DBusMessage.
+	  - Be a little more strict in some of our checks.
+	  - Condense more code, for great justice.
+
 Sun Apr 02 16:27:31 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* tests/check-libgalago.c:

Modified: trunk/libgalago/libgalago/galago-context.c
===================================================================
--- trunk/libgalago/libgalago/galago-context.c	2006-04-02 23:27:53 UTC (rev 2656)
+++ trunk/libgalago/libgalago/galago-context.c	2006-04-02 23:29:18 UTC (rev 2657)
@@ -691,6 +691,7 @@
 	g_return_if_fail(galago_is_initted());
 
 	context = galago_context_get();
+	g_return_if_fail(context != NULL);
 
 	g_hash_table_insert(context->priv->obj_tree,
 						g_strdup(galago_object_get_dbus_path(obj)), obj);
@@ -707,6 +708,7 @@
 	g_return_if_fail(galago_is_initted());
 
 	context = galago_context_get();
+	g_return_if_fail(context != NULL);
 
 	g_hash_table_remove(context->priv->obj_tree,
 						galago_object_get_dbus_path(obj));
@@ -721,6 +723,7 @@
 	g_return_if_fail(GALAGO_ORIGIN_IS_VALID(origin));
 
 	context = galago_context_get();
+	g_return_if_fail(context != NULL);
 
 	switch (origin)
 	{
@@ -758,6 +761,7 @@
 	g_return_val_if_fail(galago_is_initted(), NULL);
 
 	context = galago_context_get();
+	g_return_val_if_fail(context != NULL, NULL);
 
-	return (GalagoObject *)g_hash_table_lookup(context->priv->obj_tree, path);
+	return GALAGO_OBJECT(g_hash_table_lookup(context->priv->obj_tree, path));
 }

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-02 23:27:53 UTC (rev 2656)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-02 23:29:18 UTC (rev 2657)
@@ -254,8 +254,7 @@
 	galago_context_pop();
 	g_object_unref(context);
 
-	if (_core->app_name != NULL)
-		g_free(_core->app_name);
+	g_free(_core->app_name);
 
 	G_LOCK(_core_lock);
 	_core = NULL;

Modified: trunk/libgalago/libgalago/galago-object.c
===================================================================
--- trunk/libgalago/libgalago/galago-object.c	2006-04-02 23:27:53 UTC (rev 2656)
+++ trunk/libgalago/libgalago/galago-object.c	2006-04-02 23:29:18 UTC (rev 2657)
@@ -793,7 +793,9 @@
 
 exit:
 	dbus_error_free(&error);
-	dbus_message_unref(reply);
 
+	if (reply != NULL)
+		dbus_message_unref(reply);
+
 	return value;
 }

Modified: trunk/libgalago/libgalago/galago-service.c
===================================================================
--- trunk/libgalago/libgalago/galago-service.c	2006-04-02 23:27:53 UTC (rev 2656)
+++ trunk/libgalago/libgalago/galago-service.c	2006-04-02 23:29:18 UTC (rev 2657)
@@ -604,7 +604,6 @@
 galago_service_normalize(const GalagoService *service, const char *username)
 {
 	GString *str;
-	char *buffer;
 	const char *c;
 	GalagoServiceFlags flags;
 
@@ -631,9 +630,7 @@
 	if (!(flags & GALAGO_PRESERVE_CASE))
 		g_string_ascii_down(str);
 
-	buffer = g_string_free(str, FALSE);
-
-	return buffer;
+	return g_string_free(str, FALSE);
 }