mousetweaks r248 - in trunk: . src

[gerdk svn gnome org]

Author: gerdk
Date: Sat Aug 23 18:20:36 2008
New Revision: 248
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=248&view=rev

Log:
2008-08-23 Gerd Kohlberger <gerdk svn gnome org>

	* src/mt-cursor.c: Don't show a critical warning if a cursor
	has no name.



Modified:
   trunk/ChangeLog
   trunk/src/mt-cursor.c

Modified: trunk/src/mt-cursor.c
==============================================================================
--- trunk/src/mt-cursor.c	(original)
+++ trunk/src/mt-cursor.c	Sat Aug 23 18:20:36 2008
@@ -103,14 +103,17 @@
     MtCursorPrivate *priv;
     guchar *copy;
 
-    g_return_val_if_fail (name != NULL && name[0] != '\0', NULL);
+    g_return_val_if_fail (name != NULL, NULL);
     g_return_val_if_fail (image != NULL, NULL);
     g_return_val_if_fail (width > 0 && height > 0, NULL);
     g_return_val_if_fail (xhot <= width && yhot <= height, NULL);
 
-    copy = mt_cursor_copy_image (image, width, height);
+    if (*name == 0)
+	return NULL;
 
-    g_return_val_if_fail (copy != NULL, NULL);
+    copy = mt_cursor_copy_image (image, width, height);
+    if (!copy)
+	return NULL;
 
     cursor = g_object_new (MT_TYPE_CURSOR, NULL);
     priv = MT_CURSOR_GET_PRIVATE (cursor);