all compiling again

ChangeLog-20000414

 1999-12-17  Havoc Pennington  <hp@redhat.com>
 
+        * src/file-manager/desktop-item.h: New module, for items 
+	on the desktop
+	
 	* src/file-manager/fm-directory-view.c: Change to use
 	get_current_icon_cache() (it wasn't ever freeing the icon cache anyway)
 
@@ -33,7 +36,15 @@
 	* src/ntl-window.c, src/ntl-window.h: Added calls to
 	allow/disallow some of the toolbar operations.
 
->>>>>>> 1.39
+1999-12-17  Havoc Pennington  <hp@redhat.com>
+
+	* src/file-manager/fm-directory-view.c: Change to use
+	get_current_icon_cache() (it wasn't ever freeing the icon cache anyway)
+
+	* src/file-manager/fm-icon-cache.c (fm_get_current_icon_cache):
+	function to get a global icon cache, we will share this throughout 
+	the program.
+
 1999-12-17  Havoc Pennington  <hp@redhat.com>
 
 	* src/ntl-window.c (nautilus_window_realize): set the mini icon.

src/file-manager/Makefile.am

@@ -40,8 +40,6 @@ libntl_file_manager_la_SOURCES=		\
 noinst_PROGRAMS=gnome-desktop
 
 gnome_desktop_SOURCES=			\
-	fm-icon-cache.c			\
-	fm-icon-cache.h			\
 	desktop-canvas.c		\
 	desktop-canvas.h		\
 	desktop-item.c			\

src/file-manager/desktop-item.c

@@ -263,8 +263,8 @@ icon_size_request    (DesktopItem      *item,
         icon = item->user_data;
 
         if (icon->pixbuf) {
-                *width = gdk_pixbuf_width(icon->pixbuf);
-                *height = gdk_pixbuf_height(icon->pixbuf);
+                *width = gdk_pixbuf_get_width(icon->pixbuf);
+                *height = gdk_pixbuf_get_height(icon->pixbuf);
         } else {
                 *width = 1;
                 *height = 1;