diff options
| author | jacob berkman <jacob@ximian.com> | 2002-07-29 15:13:08 +0000 |
|---|---|---|
| committer | Jacob Berkman <jberkman@src.gnome.org> | 2002-07-29 15:13:08 +0000 |
| commit | fc7396ec43dd81b47f0b5df4c059b6b059dff971 (patch) | |
| tree | 52dba039d8db9b116b1f49f023ca5f6f6765383c | |
| parent | 1f18e59fb46bcd9e179ac0d366b1595797a6f45a (diff) | |
| download | gnome-control-center-ximian-smb.tar.gz | |
fixes for building with gdk 2.0XIMIAN_SMB_ANCHORNAUTILUS_2_0_4NAUTILUS_2_0_3ximian-smb
2002-07-29 jacob berkman <jacob@ximian.com>
* applier.c (set_root_pixmap):
(make_root_pixmap): fixes for building with gdk 2.0
| -rw-r--r-- | libbackground/ChangeLog | 5 | ||||
| -rw-r--r-- | libbackground/applier.c | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index 598d46b23..3e4dea086 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,3 +1,8 @@ +2002-07-29 jacob berkman <jacob@ximian.com> + + * applier.c (set_root_pixmap): + (make_root_pixmap): fixes for building with gdk 2.0 + 2002-07-27 Mark McLoughlin <mark@skynet.ie> Add support for rendering the wallpaper on diff --git a/libbackground/applier.c b/libbackground/applier.c index 74a10b5e5..32fb1a49e 100644 --- a/libbackground/applier.c +++ b/libbackground/applier.c @@ -1427,7 +1427,12 @@ make_root_pixmap (GdkScreen *screen, gint width, gint height) gdk_flush (); +#ifdef HAVE_GTK_MULTIHEAD display_name = DisplayString (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); +#else + display_name = DisplayString (GDK_DISPLAY ()); +#endif + display = XOpenDisplay (display_name); if (display == NULL) { @@ -1491,7 +1496,11 @@ set_root_pixmap (GdkPixmap *pixmap, GdkScreen *screen) else pixmap_id = 0; +#ifdef HAVE_GTK_MULTIHEAD display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); +#else + display = GDK_DISPLAY (); +#endif XGrabServer (display); |