[Nautilus-list] some build fixes

[Laszlo PETER <Laszlo Peter ireland sun com>]

Hi,

Some fixes I needed for building on Solaris.

Laca

Index: libnautilus-private/nautilus-authn-manager.c
===================================================================
RCS file: /sgnome/cvsroots/GNOME/nautilus/libnautilus-private/nautilus-authn-manager.c,v
retrieving revision 1.8
diff -u -r1.8 nautilus-authn-manager.c
--- libnautilus-private/nautilus-authn-manager.c	9 Nov 2001 02:05:37 -0000	1.8
+++ libnautilus-private/nautilus-authn-manager.c	7 Dec 2001 19:06:25 -0000
@@ -122,7 +122,7 @@
 				      gint button_number, 
 				      CallbackInfo *info)
 {
-	DEBUG_MSG (("+%s button: %d\n", __FUNCTION__, button_number));
+	DEBUG_MSG (("+%s button: %d\n", G_GNUC_FUNCTION, button_number));
 
 	if (button_number == GNOME_OK) {
 		info->out_args->username 
@@ -139,7 +139,7 @@
 static void
 authentication_dialog_closed (GtkDialog *dialog, CallbackInfo *info)
 {
-	DEBUG_MSG (("+%s\n", __FUNCTION__));
+	DEBUG_MSG (("+%s\n", G_GNUC_FUNCTION));
 
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
@@ -147,7 +147,7 @@
 static void
 authentication_dialog_destroyed (GtkDialog *dialog, CallbackInfo *info)
 {
-	DEBUG_MSG (("+%s\n", __FUNCTION__));
+	DEBUG_MSG (("+%s\n", G_GNUC_FUNCTION));
 
 	mark_callback_completed (info);	
 }
@@ -208,7 +208,7 @@
 
 	is_proxy_authentication = (user_data == GINT_TO_POINTER (1));
 
-	DEBUG_MSG (("+%s uri:'%s' is_proxy_auth: %u\n", __FUNCTION__, in_real->uri, (unsigned) is_proxy_authentication));
+	DEBUG_MSG (("+%s uri:'%s' is_proxy_auth: %u\n", G_GNUC_FUNCTION, in_real->uri, (unsigned) is_proxy_authentication));
 
 	info = g_new (CallbackInfo, 1);
 
@@ -220,7 +220,7 @@
 
 	present_authentication_dialog_nonblocking (info);
 
-	DEBUG_MSG (("-%s\n", __FUNCTION__));
+	DEBUG_MSG (("-%s\n", G_GNUC_FUNCTION));
 }
 
 static void /* GnomeVFSModuleCallback */
@@ -243,11 +243,11 @@
 
 	is_proxy_authentication = (user_data == GINT_TO_POINTER (1));
 
-	DEBUG_MSG (("+%s uri:'%s' is_proxy_auth: %u\n", __FUNCTION__, in_real->uri, (unsigned) is_proxy_authentication));
+	DEBUG_MSG (("+%s uri:'%s' is_proxy_auth: %u\n", G_GNUC_FUNCTION, in_real->uri, (unsigned) is_proxy_authentication));
 
 	present_authentication_dialog_blocking (is_proxy_authentication, in_real, out_real);
 
-	DEBUG_MSG (("-%s\n", __FUNCTION__));
+	DEBUG_MSG (("-%s\n", G_GNUC_FUNCTION));
 }
 
 void
Index: libnautilus-private/nautilus-directory-background.c
===================================================================
RCS file: /sgnome/cvsroots/GNOME/nautilus/libnautilus-private/nautilus-directory-background.c,v
retrieving revision 1.66
diff -u -r1.66 nautilus-directory-background.c
--- libnautilus-private/nautilus-directory-background.c	1 Dec 2001 01:05:33 -0000	1.66
+++ libnautilus-private/nautilus-directory-background.c	7 Dec 2001 19:06:25 -0000
@@ -42,9 +42,6 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-/* FIXME: Is there a better way to do this? */
-extern char *_gdk_display_name;
-
 static void background_changed_callback     (EelBackground *background, 
                                              NautilusFile       *file);
 static void background_reset_callback       (EelBackground *background, 
@@ -560,7 +557,7 @@
 
 	gdk_flush ();
 
-	display = XOpenDisplay (_gdk_display_name);
+	display = XOpenDisplay (DisplayString (GDK_DISPLAY ()));
 
 	XSetCloseDownMode (display, RetainPermanent);
 
Index: libnautilus-private/nautilus-volume-monitor.h
===================================================================
RCS file: /sgnome/cvsroots/GNOME/nautilus/libnautilus-private/nautilus-volume-monitor.h,v
retrieving revision 1.35
diff -u -r1.35 nautilus-volume-monitor.h
--- libnautilus-private/nautilus-volume-monitor.h	11 Sep 2001 01:20:42 -0000	1.35
+++ libnautilus-private/nautilus-volume-monitor.h	7 Dec 2001 19:06:26 -0000
@@ -92,7 +92,7 @@
 
 /* Volume operations. */
 char *                   nautilus_volume_get_name                           (const NautilusVolume       *volume);
-NautilusDeviceType       nautilus_volume_get_device_type                    (const NautilusVolume       *volume);
+const NautilusDeviceType nautilus_volume_get_device_type                    (const NautilusVolume       *volume);
 gboolean                 nautilus_volume_is_removable                       (const NautilusVolume       *volume);
 gboolean                 nautilus_volume_is_read_only                       (const NautilusVolume       *volume);
 gboolean                 nautilus_volume_should_integrate_trash             (const NautilusVolume       *volume);