nautilus r14849 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Tue Jan 13 11:52:37 2009
New Revision: 14849
URL: http://svn.gnome.org/viewvc/nautilus?rev=14849&view=rev

Log:
2009-01-13  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-directory-private.h:
	Fixed type (& not &&).
	Also add some paranthesises to args for macro safety.




Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-directory-private.h

Modified: trunk/libnautilus-private/nautilus-directory-private.h
==============================================================================
--- trunk/libnautilus-private/nautilus-directory-private.h	(original)
+++ trunk/libnautilus-private/nautilus-directory-private.h	Tue Jan 13 11:52:37 2009
@@ -67,8 +67,8 @@
 typedef guint32 Request;
 typedef guint32 RequestCounter[REQUEST_TYPE_LAST];
 
-#define REQUEST_WANTS_TYPE(request, type) (request && (1<<type))
-#define REQUEST_SET_TYPE(request, type) request |= (1<<type)
+#define REQUEST_WANTS_TYPE(request, type) ((request) & (1<<(type)))
+#define REQUEST_SET_TYPE(request, type) (request) |= (1<<(type))
 
 struct NautilusDirectoryDetails
 {