gnome-session r4639 - branches/gnome-2-22/gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Thu Apr 10 15:31:15 2008
New Revision: 4639
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4639&view=rev

Log:
2008-04-10  Vincent Untz  <vuntz gnome org>

	* migrate-trash.c: (move_file): last argument of g_build_filename()
	should be NULL. Fix a crasher for some people.


Modified:
   branches/gnome-2-22/gnome-session/ChangeLog
   branches/gnome-2-22/gnome-session/migrate-trash.c

Modified: branches/gnome-2-22/gnome-session/migrate-trash.c
==============================================================================
--- branches/gnome-2-22/gnome-session/migrate-trash.c	(original)
+++ branches/gnome-2-22/gnome-session/migrate-trash.c	Thu Apr 10 15:31:15 2008
@@ -219,7 +219,7 @@
 
   /* We don't know the original dirname of the file, so we'll just assume it
    * was the desktop. This way, the file is easy to find again. */
-  original_name = g_build_filename (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP), basename);
+  original_name = g_build_filename (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP), basename, NULL);
   original_name_escaped = escape_trash_name (original_name);
   g_free (original_name);