[Goodies-commits] r3065 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-08-24 11:51:28 +0000 (Fri, 24 Aug 2007)
New Revision: 3065

Modified:
   ristretto/trunk/src/Makefile.am
   ristretto/trunk/src/main.c
   ristretto/trunk/src/thumbnail_viewer.c
Log:
fix vertical orientation of thumbnailer

Modified: ristretto/trunk/src/Makefile.am
===================================================================
--- ristretto/trunk/src/Makefile.am	2007-08-24 10:56:17 UTC (rev 3064)
+++ ristretto/trunk/src/Makefile.am	2007-08-24 11:51:28 UTC (rev 3065)
@@ -9,7 +9,7 @@
 ristretto_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(XFCE4UTIL_CFLAGS) \
+	$(LIBXFCE4UTIL_CFLAGS) \
 	$(THUNAR_VFS_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
@@ -18,7 +18,7 @@
 ristretto_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(XFCE4UTIL_LIBS) \
+	$(LIBXFCE4UTIL_LIBS) \
 	$(THUNAR_VFS_LIBS)
 
 INCLUDES = \

Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-08-24 10:56:17 UTC (rev 3064)
+++ ristretto/trunk/src/main.c	2007-08-24 11:51:28 UTC (rev 3065)
@@ -502,19 +502,21 @@
     gtk_about_dialog_set_name((GtkAboutDialog *)about_dialog, PACKAGE_NAME);
     gtk_about_dialog_set_version((GtkAboutDialog *)about_dialog, PACKAGE_VERSION);
 
-    gtk_about_dialog_set_comments((GtkAboutDialog *)about_dialog, _("Ristretto is a fast and lightweight picture-viewer for the Xfce desktop environment."));
-    gtk_about_dialog_set_website((GtkAboutDialog *)about_dialog, "http://goodies.xfce.org/projects/applications/ristretto");
+    gtk_about_dialog_set_comments((GtkAboutDialog *)about_dialog,
+        _("Ristretto is a fast and lightweight picture-viewer for the Xfce desktop environment."));
+    gtk_about_dialog_set_website((GtkAboutDialog *)about_dialog,
+        "http://goodies.xfce.org/projects/applications/ristretto");
+    gtk_about_dialog_set_logo_icon_name((GtkAboutDialog *)about_dialog,
+        "ristretto");
+    gtk_about_dialog_set_authors((GtkAboutDialog *)about_dialog,
+        authors);
+    gtk_about_dialog_set_translator_credits((GtkAboutDialog *)about_dialog,
+        _("translator-credits"));
+    gtk_about_dialog_set_license((GtkAboutDialog *)about_dialog,
+        xfce_get_license_text(XFCE_LICENSE_TEXT_GPL));
+    gtk_about_dialog_set_copyright((GtkAboutDialog *)about_dialog,
+        "Copyright \302\251 2006-2007 Stephan Arts");
 
-    gtk_about_dialog_set_logo_icon_name((GtkAboutDialog *)about_dialog, "ristretto");
-
-    gtk_about_dialog_set_authors((GtkAboutDialog *)about_dialog, authors);
-
-    gtk_about_dialog_set_translator_credits((GtkAboutDialog *)about_dialog, _("translator-credits"));
-
-    gtk_about_dialog_set_license((GtkAboutDialog *)about_dialog, xfce_get_license_text(XFCE_LICENSE_TEXT_GPL));
-
-    gtk_about_dialog_set_copyright((GtkAboutDialog *)about_dialog, "Copyright \302\251 2006-2007 Stephan Arts");
-
     gtk_dialog_run(GTK_DIALOG(about_dialog));
 
     gtk_widget_destroy(about_dialog);

Modified: ristretto/trunk/src/thumbnail_viewer.c
===================================================================
--- ristretto/trunk/src/thumbnail_viewer.c	2007-08-24 10:56:17 UTC (rev 3064)
+++ ristretto/trunk/src/thumbnail_viewer.c	2007-08-24 11:51:28 UTC (rev 3065)
@@ -649,7 +649,15 @@
         /* max_size */
         if (nr == viewer->priv->end)
         {
-            max_size = widget->allocation.width - (32 + ( nr * viewer->priv->dimension) - viewer->priv->offset + pixmap_offset);
+            switch (viewer->priv->orientation)
+            {
+                case GTK_ORIENTATION_HORIZONTAL:
+                    max_size = widget->allocation.width - (32 + ( nr * viewer->priv->dimension) - viewer->priv->offset + pixmap_offset);
+                    break;
+                case GTK_ORIENTATION_VERTICAL:
+                    max_size = widget->allocation.height - (32 + ( nr * viewer->priv->dimension) - viewer->priv->offset + pixmap_offset);
+                    break;
+            }
             if (max_size <= 0)
                 max_size = viewer->priv->dimension;
         }