[Xfce4-commits] <ristretto:master> Cleanup memory-leaks

[Stephan Arts]

Updating branch refs/heads/master
         to 01aed558c4cb54ff0fac58efef9aa00541814cec (commit)
       from 2e5441ed6bdcd7e79c2719694cdda33cf3fc48d3 (commit)

commit 01aed558c4cb54ff0fac58efef9aa00541814cec
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Apr 22 19:04:52 2012 +0200

    Cleanup memory-leaks

 NEWS               |    3 ++-
 src/image_list.c   |    7 +++++++
 src/image_viewer.c |    5 +++++
 src/main_window.c  |    3 +++
 4 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index dcb3f04..957a7c5 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,8 @@ x.x.x
 - Show a 'Loading...' message in the statusbar when loading an image or
   directory-contents.
 - Reload image when it is changed on the filesystem.
-- Add a new accelerator to force a reload (ctrl-r)
+- Add a new accelerator to force a reload (ctrl-r) - (requires the removal
+  of ~/.config/ristretto/accels.scm)
 
 0.5.2
 =====
diff --git a/src/image_list.c b/src/image_list.c
index 572837d..4cb94b6 100644
--- a/src/image_list.c
+++ b/src/image_list.c
@@ -791,6 +791,13 @@ cb_rstto_read_file ( gpointer user_data )
             iter = g_slist_next (iter);
         }
 
+        if (loader->n_files > 0)
+        {
+            g_free (loader->files);
+        }
+        g_object_unref (loader->file_enum);
+        g_free (loader);
+
         return FALSE;
     }
     return TRUE;
diff --git a/src/image_viewer.c b/src/image_viewer.c
index ff266b6..4d115cc 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -648,6 +648,11 @@ rstto_image_viewer_destroy(GtkObject *object)
             g_object_unref (viewer->priv->pixbuf);
             viewer->priv->pixbuf = NULL;
         }
+        if (viewer->priv->iter)
+        {
+            g_object_unref (viewer->priv->iter);
+            viewer->priv->iter = NULL;
+        }
         g_free (viewer->priv);
         viewer->priv = NULL;
     }
diff --git a/src/main_window.c b/src/main_window.c
index cc54f7b..e0309df 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -1310,6 +1310,9 @@ rstto_main_window_image_list_iter_changed (RsttoMainWindow *window)
                 gtk_menu_shell_append (GTK_MENU_SHELL (open_with_window_menu), menu_item);
                 menu_item = gtk_separator_menu_item_new ();
                 gtk_menu_shell_append (GTK_MENU_SHELL (open_with_menu), menu_item);
+
+                g_list_foreach (app_list, (GFunc)g_object_unref, NULL);
+                g_list_free (app_list);
             }
             else
             {