gthumb r2371 - in trunk: . data

[mjc svn gnome org]

Author: mjc
Date: Fri Aug  1 12:07:39 2008
New Revision: 2371
URL: http://svn.gnome.org/viewvc/gthumb?rev=2371&view=rev

Log:
2008-08-01  Michael J. Chudobiak  <mjc svn gnome org>

        * configure.in:
        Remove checks for XF86Gamma headers and libs.

        * data/gthumb.schemas.in:
        Remove old fading preference from schema.

        Patch by Geoffrey Antos <dynamotwain aim com>. Bug #501512.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/gthumb.schemas.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Aug  1 12:07:39 2008
@@ -156,43 +156,6 @@
 
 
 #
-# Checks for XF86VMODE
-#
-have_xf86gamma=no
-XF86GAMMA_LIBS=""
-AC_CHECK_HEADER(X11/extensions/xf86vmode.h,
-		[have_xf86gamma=yes],,
-		[#include <X11/Xlib.h>])
-
-# if that succeeded, then check for the -lXxf86vm
-if test "$have_xf86gamma" = yes; then
-  have_xf86gamma=no
-  AC_CHECK_LIB(Xxf86vm, XF86VidModeSetGamma,
-	       [have_xf86gamma=yes],
-	       [true], -lXext -lX11)
-fi
-
-# check for the Ramp versions of the functions too.
-if test "$have_xf86gamma" = yes; then
-  have_xf86gamma_ramp=no
-  AC_CHECK_LIB(Xxf86vm, XF86VidModeSetGammaRamp,
-	       [have_xf86gamma_ramp=yes],
-	       [true], -lXext -lX11)
-fi
-
-# if those tests succeeded, then we've really got the functions.
-if test "$have_xf86gamma" = yes; then
-  XF86GAMMA_LIBS="-lX11 -lXext -lXxf86vm"
-  AC_DEFINE(HAVE_XF86VMODE_GAMMA, 1, [Define if XF86VMODE Gamma is available])
-fi
-
-if test "$have_xf86gamma_ramp" = yes; then
-  AC_DEFINE(HAVE_XF86VMODE_GAMMA_RAMP, 1, [Define if XF86VMODE Gamma Ramp is available])
-fi
-
-AC_SUBST(XF86GAMMA_LIBS)
-
-#
 # Checks for libgphoto2
 #
 AC_ARG_ENABLE([gphoto2],
@@ -363,7 +326,6 @@
 	Compiler:                 ${CC}
 	Have XRender:             ${HAVE_RENDER}
 	Have XTest:               ${have_xtest}
-	Have XF86VidModeSetGamma: ${have_xf86gamma}
 	Have libtiff:             ${HAVE_TIFF}
 	Have libgphoto:           ${HAVE_GPHOTO2}
 	Have libopenraw:          ${HAVE_LIBOPENRAW}

Modified: trunk/data/gthumb.schemas.in
==============================================================================
--- trunk/data/gthumb.schemas.in	(original)
+++ trunk/data/gthumb.schemas.in	Fri Aug  1 12:07:39 2008
@@ -468,19 +468,6 @@
       </schema>
 
       <schema>
-	<key>/schemas/apps/gthumb/slideshow/fading</key>
-	<applyto>/apps/gthumb/slideshow/fading</applyto>
-	<owner>gthumb</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short></short>
-	  <long>
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
 	<key>/schemas/apps/gthumb/hotkeys/hotkey0</key>
 	<applyto>/apps/gthumb/hotkeys/hotkey0</applyto>
 	<owner>gthumb</owner>