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

[Stephan Arts]

Author: stephan
Date: 2007-09-30 12:07:28 +0000 (Sun, 30 Sep 2007)
New Revision: 3281

Modified:
   ristretto/trunk/src/main_window.c
   ristretto/trunk/src/navigator.c
Log:
Fix segfault and some b0rked if-statements



Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c	2007-09-30 11:46:03 UTC (rev 3280)
+++ ristretto/trunk/src/main_window.c	2007-09-30 12:07:28 UTC (rev 3281)
@@ -895,11 +895,11 @@
             gchar *file_media = thunar_vfs_mime_info_get_media(info->mime_info);
             if(!strcmp(file_media, "image"))
             {
-                if(rstto_navigator_get_is_album(window->priv->navigator));
+                if(rstto_navigator_get_is_album(window->priv->navigator) == TRUE)
                 {
                     rstto_navigator_clear(window->priv->navigator);
-                    rstto_navigator_set_is_album(window->priv->navigator, FALSE);
                 }
+                rstto_navigator_set_is_album(window->priv->navigator, FALSE);
                 RsttoNavigatorEntry *entry = rstto_navigator_entry_new(info);
                 rstto_navigator_add (window->priv->navigator, entry);
                 gchar *uri = thunar_vfs_path_dup_uri(info->path);
@@ -985,11 +985,11 @@
         {
             if(strcmp(thunar_vfs_mime_info_get_name(info->mime_info), "inode/directory"))
             {
-                if(rstto_navigator_get_is_album(window->priv->navigator));
+                if(rstto_navigator_get_is_album(window->priv->navigator) == TRUE)
                 {
                     rstto_navigator_clear(window->priv->navigator);
-                    rstto_navigator_set_is_album(window->priv->navigator, FALSE);
                 }
+                rstto_navigator_set_is_album(window->priv->navigator, FALSE);
                 RsttoNavigatorEntry *entry = rstto_navigator_entry_new(info);
                 rstto_navigator_add (window->priv->navigator, entry);
             }

Modified: ristretto/trunk/src/navigator.c
===================================================================
--- ristretto/trunk/src/navigator.c	2007-09-30 11:46:03 UTC (rev 3280)
+++ ristretto/trunk/src/navigator.c	2007-09-30 12:07:28 UTC (rev 3281)
@@ -100,6 +100,7 @@
     navigator->compare_func = (GCompareFunc)rstto_navigator_entry_name_compare_func;
     navigator->old_position = -1;
     navigator->timeout = 5000;
+    navigator->album = FALSE;
 }
 
 static void
@@ -632,19 +633,26 @@
     {
         gchar *filename = thunar_vfs_path_dup_string(entry->info->path);
         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-        entry->pixbuf = gdk_pixbuf_rotate_simple(pixbuf, entry->rotation);
-        gdk_pixbuf_unref(pixbuf);
-        if (entry->v_flipped)
+        if (pixbuf)
         {
-            pixbuf = entry->pixbuf;
-            entry->pixbuf = gdk_pixbuf_flip(pixbuf, FALSE);
+            entry->pixbuf = gdk_pixbuf_rotate_simple(pixbuf, entry->rotation);
             gdk_pixbuf_unref(pixbuf);
+            if (entry->v_flipped)
+            {
+                pixbuf = entry->pixbuf;
+                entry->pixbuf = gdk_pixbuf_flip(pixbuf, FALSE);
+                gdk_pixbuf_unref(pixbuf);
+            }
+            if (entry->v_flipped)
+            {
+                pixbuf = entry->pixbuf;
+                entry->pixbuf = gdk_pixbuf_flip(pixbuf, TRUE);
+                gdk_pixbuf_unref(pixbuf);
+            }
         }
-        if (entry->v_flipped)
+        else
         {
-            pixbuf = entry->pixbuf;
-            entry->pixbuf = gdk_pixbuf_flip(pixbuf, TRUE);
-            gdk_pixbuf_unref(pixbuf);
+            entry->pixbuf = NULL;
         }
         g_free(filename);
     }