[Xfce4-commits] r29769 - in thunar/branches/migration-to-gio: . thunar

[Jannis Pohlmann]

Author: jannis
Date: 2009-04-11 21:07:38 +0000 (Sat, 11 Apr 2009)
New Revision: 29769

Modified:
   thunar/branches/migration-to-gio/ChangeLog
   thunar/branches/migration-to-gio/thunar/thunar-trash-action.c
   thunar/branches/migration-to-gio/thunar/thunar-window.c
Log:
	* thunar/thunar-trash-action.c: Replace all ThunarVfsPath references
	  with GFile.

Modified: thunar/branches/migration-to-gio/ChangeLog
===================================================================
--- thunar/branches/migration-to-gio/ChangeLog	2009-04-11 19:56:14 UTC (rev 29768)
+++ thunar/branches/migration-to-gio/ChangeLog	2009-04-11 21:07:38 UTC (rev 29769)
@@ -1,5 +1,10 @@
 2009-04-11	Jannis Pohlmann <jannis at xfce.org>
 
+	* thunar/thunar-trash-action.c: Replace all ThunarVfsPath references
+	  with GFile.
+
+2009-04-11	Jannis Pohlmann <jannis at xfce.org>
+
 	* thunar/thunar-file.c: Add assertion to thunar_file_load() to see for
 	  which files it fails rather than to see that in some random function
 	  later.

Modified: thunar/branches/migration-to-gio/thunar/thunar-trash-action.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-trash-action.c	2009-04-11 19:56:14 UTC (rev 29768)
+++ thunar/branches/migration-to-gio/thunar/thunar-trash-action.c	2009-04-11 21:07:38 UTC (rev 29769)
@@ -1,6 +1,7 @@
 /* $Id$ */
 /*-
  * Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
+ * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -98,12 +99,12 @@
 static void
 thunar_trash_action_init (ThunarTrashAction *trash_action)
 {
-  ThunarVfsPath *trash_bin_path;
+  GFile *trash_bin;
 
   /* try to connect to the trash bin */
-  trash_bin_path = thunar_vfs_path_get_for_trash ();
-  trash_action->trash_bin = thunar_file_get_for_path (trash_bin_path, NULL);
-  thunar_vfs_path_unref (trash_bin_path);
+  trash_bin = g_file_new_for_trash ();
+  trash_action->trash_bin = thunar_file_get (trash_bin, NULL);
+  g_object_unref (trash_bin);
 
   /* safety check for trash bin... */
   if (G_LIKELY (trash_action->trash_bin != NULL))

Modified: thunar/branches/migration-to-gio/thunar/thunar-window.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-window.c	2009-04-11 19:56:14 UTC (rev 29768)
+++ thunar/branches/migration-to-gio/thunar/thunar-window.c	2009-04-11 21:07:38 UTC (rev 29769)
@@ -1,6 +1,7 @@
 /* $Id$ */
 /*-
  * Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
+ * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free