X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fboxfit.c;h=3c811ca00b75b3b11c1b9216a476d1e1e94e0a86;hp=5daa72cb982f64eca9745a1a079a49140117eb93;hb=4ade52359b6eba3621566dac79793a33aa4c915f;hpb=ff35d056d723c9a5ffe728dbba5f1c25e141be04

diff --git a/hacks/boxfit.c b/hacks/boxfit.c
index 5daa72cb..3c811ca0 100644
--- a/hacks/boxfit.c
+++ b/hacks/boxfit.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2005-2012 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2005-2013 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -70,7 +70,7 @@ reset_boxes (state *st)
   st->color_horiz_p = random() & 1;
 
   if (st->done_once && st->colors)
-    free_colors (st->dpy, st->xgwa.colormap, st->colors, st->ncolors);
+    free_colors (st->xgwa.screen, st->xgwa.colormap, st->colors, st->ncolors);
 
   if (!st->done_once)
     {
@@ -121,7 +121,7 @@ reset_boxes (state *st)
     {
       st->ncolors = get_integer_resource (st->dpy, "colors", "Colors");  /* re-get */
       if (st->ncolors < 1) st->ncolors = 1;
-      make_smooth_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
+      make_smooth_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
                             st->colors, &st->ncolors, True, 0, False);
       if (st->ncolors < 1) abort();
       XClearWindow (st->dpy, st->window);
@@ -531,6 +531,9 @@ static const char *boxfit_defaults [] = {
   "*peek:		   False",
   "*grabDesktopImages:     False",   /* HAVE_COCOA */
   "*chooseRandomImages:    True",    /* HAVE_COCOA */
+#ifdef USE_IPHONE
+  "*ignoreRotation:	   True",
+#endif
   0
 };