[Xfce4-commits] <ristretto:master> Improve variable-naming and add white-space

[Stephan Arts]

Updating branch refs/heads/master
         to fe8798d4f12b306f6a97c1f63a4fb94bde329c49 (commit)
       from 564dfb88c47284d3c2e6fd6966863a355da52fdb (commit)

commit fe8798d4f12b306f6a97c1f63a4fb94bde329c49
Author: Stephan Arts <stephan at xfce.org>
Date:   Sat Apr 28 19:17:19 2012 +0200

    Improve variable-naming and add white-space

 src/file.c       |   56 +++++++++++++++++++++++++++---------------------------
 src/image_list.c |    1 +
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/file.c b/src/file.c
index 6d7d8b3..7491954 100644
--- a/src/file.c
+++ b/src/file.c
@@ -134,9 +134,9 @@ struct _RsttoFilePriv
 static void
 rstto_file_init (GObject *object)
 {
-    RsttoFile *file = RSTTO_FILE (object);
+    RsttoFile *r_file = RSTTO_FILE (object);
 
-    file->priv = g_new0 (RsttoFilePriv, 1);
+    r_file->priv = g_new0 (RsttoFilePriv, 1);
 }
 
 
@@ -173,55 +173,55 @@ rstto_file_class_init (GObjectClass *object_class)
 static void
 rstto_file_dispose (GObject *object)
 {
-    RsttoFile *file = RSTTO_FILE (object);
+    RsttoFile *r_file = RSTTO_FILE (object);
     gint i = 0;
 
-    if (file->priv)
+    if (r_file->priv)
     {
-        if (file->priv->file)
+        if (r_file->priv->file)
         {
-            g_object_unref (file->priv->file);
-            file->priv->file = NULL;
+            g_object_unref (r_file->priv->file);
+            r_file->priv->file = NULL;
         }
-        if (file->priv->display_name)
+        if (r_file->priv->display_name)
         {
-            g_free (file->priv->display_name);
-            file->priv->display_name = NULL;
+            g_free (r_file->priv->display_name);
+            r_file->priv->display_name = NULL;
         }
-        if (file->priv->content_type)
+        if (r_file->priv->content_type)
         {
-            g_free (file->priv->content_type);
-            file->priv->content_type = NULL;
+            g_free (r_file->priv->content_type);
+            r_file->priv->content_type = NULL;
         }
-        if (file->priv->path)
+        if (r_file->priv->path)
         {
-            g_free (file->priv->path);
-            file->priv->path = NULL;
+            g_free (r_file->priv->path);
+            r_file->priv->path = NULL;
         }
-        if (file->priv->thumbnail_path)
+        if (r_file->priv->thumbnail_path)
         {
-            g_free (file->priv->thumbnail_path);
-            file->priv->thumbnail_path = NULL;
+            g_free (r_file->priv->thumbnail_path);
+            r_file->priv->thumbnail_path = NULL;
         }
-        if (file->priv->uri)
+        if (r_file->priv->uri)
         {
-            g_free (file->priv->uri);
-            file->priv->uri = NULL;
+            g_free (r_file->priv->uri);
+            r_file->priv->uri = NULL;
         }
 
         for (i = 0; i < THUMBNAIL_SIZE_COUNT; ++i)
         {
-            if (file->priv->thumbnails[i])
+            if (r_file->priv->thumbnails[i])
             {
-                g_object_unref (file->priv->thumbnails[i]);
-                file->priv->thumbnails[i] = NULL;
+                g_object_unref (r_file->priv->thumbnails[i]);
+                r_file->priv->thumbnails[i] = NULL;
             }
         }
 
-        g_free (file->priv);
-        file->priv = NULL;
+        g_free (r_file->priv);
+        r_file->priv = NULL;
 
-        open_files = g_list_remove_all (open_files, file);
+        open_files = g_list_remove_all (open_files, r_file);
     }
 }
 
diff --git a/src/image_list.c b/src/image_list.c
index e550834..f1289ab 100644
--- a/src/image_list.c
+++ b/src/image_list.c
@@ -383,6 +383,7 @@ static void
 rstto_image_list_dispose(GObject *object)
 {
     RsttoImageList *image_list = RSTTO_IMAGE_LIST(object);
+
     if (NULL != image_list->priv)
     {
         if (image_list->priv->settings)