[Xfce4-commits] <ristretto:master> Fix compile issues with --enable-debug=full

[Stephan Arts]

Updating branch refs/heads/master
         to a4e0acfa5c396a3106f8a8e7353fde2b12ee51bb (commit)
       from 309003c92becf11e108ada1b0bb8df0ee70afb64 (commit)

commit a4e0acfa5c396a3106f8a8e7353fde2b12ee51bb
Author: Stephan Arts <stephan at xfce.org>
Date:   Mon Oct 24 00:23:17 2011 +0200

    Fix compile issues with --enable-debug=full

 TODO               |    2 --
 src/file.c         |    2 --
 src/image_viewer.c |    6 +++---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index 0640d14..3a7bc34 100644
--- a/TODO
+++ b/TODO
@@ -6,8 +6,6 @@
    of the files, using that dialog makes ristretto lose track of an
    opened file at runtime.
 
- - Port image-viewer widget to cairo
-
  - Try the possibilities of replacing the thumbnail-bar with an iconview
    widget.
 
diff --git a/src/file.c b/src/file.c
index e2b3aee..4acc89f 100644
--- a/src/file.c
+++ b/src/file.c
@@ -343,8 +343,6 @@ rstto_file_get_modified_time ( RsttoFile *file )
 ExifEntry *
 rstto_file_get_exif ( RsttoFile *file, ExifTag id )
 {
-    ExifEntry *exif_entry = NULL;
-
     /* If there is no exif-data object, try to create it */
     if ( NULL == file->priv->exif_data )
     {
diff --git a/src/image_viewer.c b/src/image_viewer.c
index 0f9e5cb..c3ffaaf 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -265,7 +265,6 @@ static void
 rstto_image_viewer_init ( GObject *object )
 {
     RsttoImageViewer *viewer = RSTTO_IMAGE_VIEWER (object);
-    GtkWidget        *widget = GTK_WIDGET (object);
 
     if (default_screen == NULL)
     {
@@ -823,6 +822,7 @@ correct_adjustments ( RsttoImageViewer *viewer )
     {
         case RSTTO_IMAGE_ORIENT_NONE:
         case RSTTO_IMAGE_ORIENT_180:
+        default:
             gtk_adjustment_set_upper (
                     viewer->hadjustment,
                     floor(image_width * scale));
@@ -1824,8 +1824,6 @@ rstto_scroll_event (
     gboolean revert_zoom_direction = viewer->priv->revert_zoom_direction;
     gdouble x_offset = viewer->priv->rendering.x_offset;
     gdouble y_offset = viewer->priv->rendering.y_offset;
-    gdouble image_width = viewer->priv->rendering.width;
-    gdouble image_height = viewer->priv->rendering.height;
     gdouble tmp_x = 0.0;
     gdouble tmp_y = 0.0;
     gdouble scale = viewer->priv->scale;
@@ -2289,6 +2287,8 @@ rstto_button_release_event (
                 gtk_adjustment_changed(viewer->vadjustment);
             }
             break;
+        default:
+            break;
     }
     rstto_image_viewer_set_motion_state (viewer, RSTTO_IMAGE_VIEWER_MOTION_STATE_NORMAL);
     gdk_window_invalidate_rect (