diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2002-10-02 05:36:58 +0000 |
|---|---|---|
| committer | Mark McLoughlin <mmclouglin@src.gnome.org> | 2002-10-02 05:36:58 +0000 |
| commit | 3e6bfd6af629583e51a1120ee407ccfbaeec1b27 (patch) | |
| tree | d03148f8d07673a8c97cfa75de1d890213b9e8a7 /src/nautilus-desktop-window.h | |
| parent | 3fa3cfe91a6f995ce99dedbd5f3609dccb6dec72 (diff) | |
| download | nautilus-3e6bfd6af629583e51a1120ee407ccfbaeec1b27.tar.gz | |
Merge the multihead branch into HEAD and :
2002-10-02 Mark McLoughlin <mark@skynet.ie>
* 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.
Diffstat (limited to 'src/nautilus-desktop-window.h')
| -rw-r--r-- | src/nautilus-desktop-window.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 */ |