From 3e6bfd6af629583e51a1120ee407ccfbaeec1b27 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 2 Oct 2002 05:36:58 +0000 Subject: Merge the multihead branch into HEAD and : 2002-10-02 Mark McLoughlin * acconfig.h: define HAVE_GTK_MULTIHEAD for egg-screen-exec methods. * configure.in: require gtk 2.1.0 and don't define HAVE_GTK_MULTIHEAD. * libnautilus-private/nautilus-multihead-hacks.h: kill. * libnautilus-private/nautilus-directory-background: (make_root_pixmap), (set_root_pixmap): use gdk_screen_get_display instead of assuming the default display. * src/nautilus-shell.c: (restore_one_window_callback): add backwards compat support for sessions without a screen number. --- src/nautilus-desktop-window.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/nautilus-desktop-window.h') diff --git a/src/nautilus-desktop-window.h b/src/nautilus-desktop-window.h index 4244dc47e..82c961215 100644 --- a/src/nautilus-desktop-window.h +++ b/src/nautilus-desktop-window.h @@ -50,7 +50,8 @@ typedef struct { } NautilusDesktopWindowClass; GtkType nautilus_desktop_window_get_type (void); -NautilusDesktopWindow *nautilus_desktop_window_new (NautilusApplication *application); +NautilusDesktopWindow *nautilus_desktop_window_new (NautilusApplication *application, + GdkScreen *screen); void nautilus_desktop_window_update_directory (NautilusDesktopWindow *window); #endif /* NAUTILUS_DESKTOP_WINDOW_H */ -- cgit v1.2.1