cheese r821 - in trunk: . src

[fargiolas svn gnome org]

Author: fargiolas
Date: Sat Aug  2 16:00:19 2008
New Revision: 821
URL: http://svn.gnome.org/viewvc/cheese?rev=821&view=rev

Log:
initialize error in move_file_to_trash to NULL, fixes #545997


Modified:
   trunk/ChangeLog
   trunk/src/cheese-window.c

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Sat Aug  2 16:00:19 2008
@@ -348,7 +348,7 @@
 static void
 cheese_window_cmd_move_file_to_trash (CheeseWindow *cheese_window, GList *files)
 {
-  GError *error;
+  GError *error = NULL;
   GList *l;
   gchar *primary, *secondary;
   GtkWidget *error_dialog;
@@ -372,6 +372,7 @@
       g_free (primary);
       g_free (secondary);
       g_error_free(error);
+      error = NULL;
       /*TODO if we can't move files to trash, maybe we should try to delete them....*/
     }
   }