[Goodies-commits] r3633 - in ristretto/trunk: . src

[Stephan Arts]

Author: stephan
Date: 2007-11-25 10:32:24 +0000 (Sun, 25 Nov 2007)
New Revision: 3633

Modified:
   ristretto/trunk/configure.in.in
   ristretto/trunk/ristretto.desktop.in
   ristretto/trunk/src/picture_viewer.c
Log:
Remove some obsolete debug stuff (xdg-debug is allready defined) from configure.in.in
Remove some depricated stuff from ristretto.desktop.in
Fix segfault



Modified: ristretto/trunk/configure.in.in
===================================================================
--- ristretto/trunk/configure.in.in	2007-11-25 10:27:05 UTC (rev 3632)
+++ ristretto/trunk/configure.in.in	2007-11-25 10:32:24 UTC (rev 3633)
@@ -47,62 +47,6 @@
 
 AC_HEADER_STDC
 
-dnl ***********************************
-dnl *** Check for debugging support ***
-dnl ***********************************
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=ristretto_debug_default@:>@]),
-  [], [enable_debug=ristretto_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
-  dnl Print the result
-  AC_MSG_RESULT([$enable_debug])
-
-  dnl Make sure we detect possible errors (if supported)
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -Wall -Werror"
-  AC_MSG_CHECKING([whether $CC accepts -Wall -Werror])
-  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-    AC_MSG_RESULT([yes])
-    PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror"
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-  CFLAGS="$save_CFLAGS"
-
-  dnl Paranoia for --enable-debug=full
-  if test x"$enable_debug" = x"full"; then
-    dnl Enable extensive debugging
-    PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
-
-    dnl Use -O0 -g3 if the compiler supports it
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -O0 -g3"
-    AC_MSG_CHECKING([whether $CC accepts -O0 -g3])
-    AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-      AC_MSG_RESULT([yes])
-      PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
-    ], [
-      AC_MSG_RESULT([no])
-    ])
-    CFLAGS="$save_CFLAGS"
-  fi
-else
-  dnl Print the result
-  AC_MSG_RESULT([$enable_debug])
-
-  dnl Disable debugging (release build)
-  PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG"
-
-  dnl Disable object cast checks
-  PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-
-  dnl Disable all checks for --enable-debug=no
-  if test x"$enable_debug" = x"no"; then
-    PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
-  fi
-fi
-
 dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
 

Modified: ristretto/trunk/ristretto.desktop.in
===================================================================
--- ristretto/trunk/ristretto.desktop.in	2007-11-25 10:27:05 UTC (rev 3632)
+++ ristretto/trunk/ristretto.desktop.in	2007-11-25 10:32:24 UTC (rev 3633)
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 _Name=Ristretto Image Viewer
 _Comment=Xfce Image viewer

Modified: ristretto/trunk/src/picture_viewer.c
===================================================================
--- ristretto/trunk/src/picture_viewer.c	2007-11-25 10:27:05 UTC (rev 3632)
+++ ristretto/trunk/src/picture_viewer.c	2007-11-25 10:32:24 UTC (rev 3633)
@@ -858,24 +858,28 @@
         viewer->priv->motion.h_val = viewer->hadjustment->value;
         viewer->priv->motion.v_val = viewer->vadjustment->value;
 
-        if (!(event->state & GDK_MODIFIER_MASK))
+        if (rstto_navigator_get_file(viewer->priv->navigator) != NULL)
         {
-            GtkWidget *widget = GTK_WIDGET(viewer);
-            GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR);
-            gdk_window_set_cursor(widget->window, cursor);
-            gdk_cursor_unref(cursor);
 
-            viewer->priv->motion.state = RSTTO_PICTURE_VIEWER_STATE_MOVE;
-        }
+            if (!(event->state & GDK_MODIFIER_MASK))
+            {
+                GtkWidget *widget = GTK_WIDGET(viewer);
+                GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR);
+                gdk_window_set_cursor(widget->window, cursor);
+                gdk_cursor_unref(cursor);
 
-        if (event->state & GDK_CONTROL_MASK)
-        {
-            GtkWidget *widget = GTK_WIDGET(viewer);
-            GdkCursor *cursor = gdk_cursor_new(GDK_UL_ANGLE);
-            gdk_window_set_cursor(widget->window, cursor);
-            gdk_cursor_unref(cursor);
+                viewer->priv->motion.state = RSTTO_PICTURE_VIEWER_STATE_MOVE;
+            }
 
-            viewer->priv->motion.state = RSTTO_PICTURE_VIEWER_STATE_BOX_ZOOM;
+            if (event->state & GDK_CONTROL_MASK)
+            {
+                GtkWidget *widget = GTK_WIDGET(viewer);
+                GdkCursor *cursor = gdk_cursor_new(GDK_UL_ANGLE);
+                gdk_window_set_cursor(widget->window, cursor);
+                gdk_cursor_unref(cursor);
+
+                viewer->priv->motion.state = RSTTO_PICTURE_VIEWER_STATE_BOX_ZOOM;
+            }
         }