Commit 57b74638 authored by Laszlo Peter's avatar Laszlo Peter Committed by László PÉTER

s/__FUNCTION__/G_GNUC_FUNCTION/

2001-12-11  Laszlo Peter  <laca@ireland.sun.com>

        * libnautilus-private/nautilus-authn-manager.c:
        s/__FUNCTION__/G_GNUC_FUNCTION/

        * libnautilus-private/nautilus-directory-background.c: get rid of
        _gdk_display_name

        * libnautilus-private/nautilus-volume-monitor.c
        (nautilus_volume_get_device_type): remove "const" to match the
        prototype.
parent 1656a244
2001-12-11 Laszlo Peter <laca@ireland.sun.com>
* libnautilus-private/nautilus-authn-manager.c:
s/__FUNCTION__/G_GNUC_FUNCTION/
* libnautilus-private/nautilus-directory-background.c: get rid of
_gdk_display_name
* libnautilus-private/nautilus-volume-monitor.c
(nautilus_volume_get_device_type): remove "const" to match the
prototype.
2001-12-09 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-file-operations.c:
......
......@@ -122,7 +122,7 @@ authentication_dialog_button_clicked (GtkDialog *dialog,
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 @@ authentication_dialog_button_clicked (GtkDialog *dialog,
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 @@ authentication_dialog_closed (GtkDialog *dialog, CallbackInfo *info)
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 @@ vfs_async_authentication_callback (gconstpointer in, size_t in_size,
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 @@ vfs_async_authentication_callback (gconstpointer in, size_t in_size,
present_authentication_dialog_nonblocking (info);
DEBUG_MSG (("-%s\n", __FUNCTION__));
DEBUG_MSG (("-%s\n", G_GNUC_FUNCTION));
}
static void /* GnomeVFSModuleCallback */
......@@ -243,11 +243,11 @@ vfs_authentication_callback (gconstpointer in, size_t in_size,
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
......
......@@ -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 @@ make_root_pixmap (gint width, gint height)
gdk_flush ();
display = XOpenDisplay (_gdk_display_name);
display = XOpenDisplay (DisplayString (GDK_DISPLAY ()));
XSetCloseDownMode (display, RetainPermanent);
......
......@@ -757,7 +757,7 @@ nautilus_volume_get_mount_path (const NautilusVolume *volume)
return volume->mount_path;
}
const NautilusDeviceType
NautilusDeviceType
nautilus_volume_get_device_type (const NautilusVolume *volume)
{
g_return_val_if_fail (volume != NULL, NAUTILUS_DEVICE_UNKNOWN);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment