gthumb r2447 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Thu Nov 13 13:46:09 2008
New Revision: 2447
URL: http://svn.gnome.org/viewvc/gthumb?rev=2447&view=rev

Log:
2008-11-13  Michael J. Chudobiak  <mjc svn gnome org>

        * NEWS:
        * configure.in:
        * libgthumb/eel-canvas-rect.c:
        * libgthumb/gth-image-list.c:
        * src/gth-application.c: (show_grabbing_focus):
        * src/gth-fullscreen.c: (gth_fullscreen_finalize),
        (gth_fullscreen_init), (gth_fullscreen_show),
        (gth_fullscreen_pause_slideshow):
        * src/totem-scrsaver.c:
        * src/totem-scrsaver.h:
        Modified the build files to better support gtk on MAC OS / Quartz.
        Bug #551225. Based on a patch by W. Michael Petullo <mike flyn org>.



Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/libgthumb/eel-canvas-rect.c
   trunk/libgthumb/gth-image-list.c
   trunk/src/gth-application.c
   trunk/src/gth-fullscreen.c
   trunk/src/totem-scrsaver.c
   trunk/src/totem-scrsaver.h

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Nov 13 13:46:09 2008
@@ -73,6 +73,8 @@
 	* Added a new gthumb-import.desktop.in file to handle gvfs-mounted
           cameras more elegantly. The camera is first unmounted, and the
           libgphoto import routines are then run. Bug #560352.
+	* Modified the build files to better support gtk on MAC OS / Quartz.
+	  Bug #551225.
 
 version 2.10.10
 ---------------

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Nov 13 13:46:09 2008
@@ -123,25 +123,6 @@
 
 
 #
-# Checks for Xft/XRender
-#
-AC_ARG_ENABLE([render],
-	      [AC_HELP_STRING([--disable-render],[disable support for Xrender])],,
-	      [enable_render=yes])
-
-HAVE_RENDER=no
-if test x$enable_render = xyes ; then
-   AC_MSG_CHECKING(Xrender Support)
-   AC_MSG_RESULT()
-   AC_CHECK_LIB(Xrender, XRenderFindFormat,
-		AC_DEFINE(HAVE_RENDER, 1, [Define to 1 if Xft/XRender support is included])
-		RENDER_LIBS='-lXrender -lXext'
-		HAVE_RENDER=yes
-		,,[-lXext $GTHUMB_LIBS])
-   AC_SUBST(RENDER_LIBS)
-fi
-
-#
 # Checks for Xtest
 #
 have_xtest=false
@@ -184,6 +165,13 @@
 		     [HAVE_LIBOPENRAW=no])
 fi
 
+#
+# Checks for GDK X11 support; may not be present on MAC OS / Quartz systems
+#
+HAVE_GDKX=no
+PKG_CHECK_MODULES(GDKX, gdk-x11-2.0,
+		  [HAVE_GDKX=yes],
+		  [AC_MSG_WARN(Disabling GDK/X11-dependent features and Xrender.)])
 
 #
 # check for exiv2 xmp functionality
@@ -208,6 +196,26 @@
 fi
 
 
+#
+# Checks for Xft/XRender
+#
+AC_ARG_ENABLE([render],
+	      [AC_HELP_STRING([--disable-render],[disable support for Xrender])],,
+	      [enable_render=yes])
+
+HAVE_RENDER=no
+if (test x$enable_render = xyes) && (test $HAVE_GDKX = yes); then
+   AC_MSG_CHECKING(Xrender Support)
+   AC_MSG_RESULT()
+   AC_CHECK_LIB(Xrender, XRenderFindFormat,
+                AC_DEFINE(HAVE_RENDER, 1, [Define to 1 if Xft/XRender support is included])
+                RENDER_LIBS='-lXrender -lXext'
+                HAVE_RENDER=yes
+                ,,[-lXext $GTHUMB_LIBS])
+   AC_SUBST(RENDER_LIBS)
+fi
+
+
 dnl ###############################################
 
 IDL_MODULES="bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0"
@@ -324,6 +332,7 @@
 
 	Source code location:     ${srcdir}
 	Compiler:                 ${CC}
+	Have gdk-x11:		  ${HAVE_GDKX}
 	Have XRender:             ${HAVE_RENDER}
 	Have XTest:               ${have_xtest}
 	Have libtiff:             ${HAVE_TIFF}

Modified: trunk/libgthumb/eel-canvas-rect.c
==============================================================================
--- trunk/libgthumb/eel-canvas-rect.c	(original)
+++ trunk/libgthumb/eel-canvas-rect.c	Thu Nov 13 13:46:09 2008
@@ -29,11 +29,11 @@
 #include <glib/gstring.h>
 #include <libgnome/gnome-macros.h>
 #include <libgnomecanvas/gnome-canvas-util.h>
-#include <gdk/gdkx.h>
 
 #include "eel-canvas-rect.h"
 
 #ifdef HAVE_RENDER
+#include <gdk/gdkx.h>
 #include <X11/extensions/Xrender.h>
 #endif
 

Modified: trunk/libgthumb/gth-image-list.c
==============================================================================
--- trunk/libgthumb/gth-image-list.c	(original)
+++ trunk/libgthumb/gth-image-list.c	Thu Nov 13 13:46:09 2008
@@ -29,9 +29,9 @@
 #include <gtk/gtkbindings.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkstock.h>
-#include <gdk/gdkx.h>
 
 #ifdef HAVE_RENDER
+#include <gdk/gdkx.h>
 #include <X11/extensions/Xrender.h>
 #endif
 

Modified: trunk/src/gth-application.c
==============================================================================
--- trunk/src/gth-application.c	(original)
+++ trunk/src/gth-application.c	Thu Nov 13 13:46:09 2008
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <gdk/gdkx.h>
 #include <bonobo/bonobo-generic-factory.h>
 
 #include "gth-application.h"
@@ -93,9 +92,11 @@
 		g_free (startup_id_str);
 	}
 
+#ifdef HAVE_GDKX
 	if (timestamp == 0)
 		timestamp = gdk_x11_get_server_time (new_window->window);
 	gdk_x11_window_set_user_time (new_window->window, timestamp);
+#endif
 
 	gtk_window_present (GTK_WINDOW (new_window));
 }

Modified: trunk/src/gth-fullscreen.c
==============================================================================
--- trunk/src/gth-fullscreen.c	(original)
+++ trunk/src/gth-fullscreen.c	Thu Nov 13 13:46:09 2008
@@ -86,7 +86,9 @@
 	GtkWidget       *viewer;
 	GtkWidget       *toolbar_window;
 
+#ifdef HAVE_GDKX
 	TotemScrsaver   *screensaver;
+#endif
 
 	/* comment */
 
@@ -130,7 +132,9 @@
 			priv->image = NULL;
 		}
 
+#ifdef HAVE_GDKX
 		g_object_unref (priv->screensaver);
+#endif
 
 		file_data_unref (priv->file);
 		file_data_list_free (priv->file_list);
@@ -253,8 +257,9 @@
 			  G_CALLBACK (preloader_requested_error_cb),
 			  fullscreen);
 
+#ifdef HAVE_GDKX
 	priv->screensaver = totem_scrsaver_new ();
-
+#endif
 }
 
 
@@ -1774,10 +1779,12 @@
 
 	image_viewer_hide_cursor (IMAGE_VIEWER (priv->viewer));
 
+#ifdef HAVE_GDKX
 	if (fullscreen->priv->slideshow)
 		totem_scrsaver_disable (fullscreen->priv->screensaver);
 	else
 		totem_scrsaver_enable (fullscreen->priv->screensaver);
+#endif
 
 	load_first_or_last_image (fullscreen, TRUE, TRUE);
 }
@@ -1996,12 +2003,15 @@
 {
 	fullscreen->priv->slideshow_paused = value;
 
+#ifdef HAVE_GDKX
 	if (fullscreen->priv->slideshow_paused)
 		totem_scrsaver_enable (fullscreen->priv->screensaver);
-	else {
+	else
 		totem_scrsaver_disable (fullscreen->priv->screensaver);
-		continue_slideshow (fullscreen);
-	}
+#endif
+
+	if (!fullscreen->priv->slideshow_paused)
+                continue_slideshow (fullscreen);
 }
 
 

Modified: trunk/src/totem-scrsaver.c
==============================================================================
--- trunk/src/totem-scrsaver.c	(original)
+++ trunk/src/totem-scrsaver.c	Thu Nov 13 13:46:09 2008
@@ -19,6 +19,7 @@
    Author: Bastien Nocera <hadess hadess net>
  */
 
+#ifdef HAVE_GDKX
 
 #include "config.h"
 #include "totem-scrsaver.h"
@@ -203,3 +204,4 @@
 	}
 }
 
+#endif /* HAVE_GDKX */

Modified: trunk/src/totem-scrsaver.h
==============================================================================
--- trunk/src/totem-scrsaver.h	(original)
+++ trunk/src/totem-scrsaver.h	Thu Nov 13 13:46:09 2008
@@ -19,6 +19,8 @@
    Author: Bastien Nocera <hadess hadess net>
  */
 
+#ifdef HAVE_GDKX
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -47,3 +49,4 @@
 void totem_scrsaver_enable		(TotemScrsaver *scr);
 void totem_scrsaver_disable		(TotemScrsaver *scr);
 
+#endif /* HAVE_GDKX */