gnome-desktop r5254 - in trunk/libgnome-desktop: . libgnomeui

[ssp svn gnome org]

Author: ssp
Date: Thu Oct  9 01:58:30 2008
New Revision: 5254
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5254&view=rev

Log:
Wed Oct  8 21:56:58 2008  S%GÃÂÂ% ren Sandmann  <sandmann redhat com>

	* libgnomeui/gnome-desktop-thumbnail.h
	(GNOME_DESKTOP_THUMBNAIL_FACTORY_CLASS): Put the macros into the
	GNOME_DESKTOP namespace so they don't clash if you also include
	libgnomeui.h



Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-desktop-thumbnail.c
   trunk/libgnome-desktop/libgnomeui/gnome-desktop-thumbnail.h

Modified: trunk/libgnome-desktop/gnome-desktop-thumbnail.c
==============================================================================
--- trunk/libgnome-desktop/gnome-desktop-thumbnail.c	(original)
+++ trunk/libgnome-desktop/gnome-desktop-thumbnail.c	Thu Oct  9 01:58:30 2008
@@ -454,7 +454,7 @@
 {
   GnomeDesktopThumbnailFactory *factory;
   
-  factory = g_object_new (GNOME_TYPE_THUMBNAIL_FACTORY, NULL);
+  factory = g_object_new (GNOME_DESKTOP_TYPE_THUMBNAIL_FACTORY, NULL);
   
   factory->priv->size = size;
   

Modified: trunk/libgnome-desktop/libgnomeui/gnome-desktop-thumbnail.h
==============================================================================
--- trunk/libgnome-desktop/libgnomeui/gnome-desktop-thumbnail.h	(original)
+++ trunk/libgnome-desktop/libgnomeui/gnome-desktop-thumbnail.h	Thu Oct  9 01:58:30 2008
@@ -42,11 +42,11 @@
   GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE
 } GnomeDesktopThumbnailSize;
 
-#define GNOME_TYPE_THUMBNAIL_FACTORY		(gnome_desktop_thumbnail_factory_get_type ())
-#define GNOME_DESKTOP_THUMBNAIL_FACTORY(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_THUMBNAIL_FACTORY, GnomeDesktopThumbnailFactory))
-#define GNOME_DESKTOP_THUMBNAIL_FACTORY_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_THUMBNAIL_FACTORY, GnomeDesktopThumbnailFactoryClass))
-#define GNOME_IS_THUMBNAIL_FACTORY(obj)		(G_TYPE_INSTANCE_CHECK_TYPE ((obj), GNOME_TYPE_THUMBNAIL_FACTORY))
-#define GNOME_IS_THUMBNAIL_FACTORY_CLASS(klass)	(G_TYPE_CLASS_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_THUMBNAIL_FACTORY))
+#define GNOME_DESKTOP_TYPE_THUMBNAIL_FACTORY		(gnome_desktop_thumbnail_factory_get_type ())
+#define GNOME_DESKTOP_THUMBNAIL_FACTORY(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_DESKTOP_TYPE_THUMBNAIL_FACTORY, GnomeDesktopThumbnailFactory))
+#define GNOME_DESKTOP_THUMBNAIL_FACTORY_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_DESKTOP_TYPE_THUMBNAIL_FACTORY, GnomeDesktopThumbnailFactoryClass))
+#define GNOME_DESKTOP_IS_THUMBNAIL_FACTORY(obj)		(G_TYPE_INSTANCE_CHECK_TYPE ((obj), GNOME_DESKTOP_TYPE_THUMBNAIL_FACTORY))
+#define GNOME_DESKTOP_IS_THUMBNAIL_FACTORY_CLASS(klass)	(G_TYPE_CLASS_CHECK_CLASS_TYPE ((klass), GNOME_DESKTOP_TYPE_THUMBNAIL_FACTORY))
 
 typedef struct _GnomeDesktopThumbnailFactory        GnomeDesktopThumbnailFactory;
 typedef struct _GnomeDesktopThumbnailFactoryClass   GnomeDesktopThumbnailFactoryClass;