[Xfce4-commits] <thunar:nick/gtk3> Fix some mistakes.

Nick Schermer noreply at xfce.org
Tue May 15 21:20:01 CEST 2012


Updating branch refs/heads/nick/gtk3
         to 400ee75c28d904103669158c1ac8e8c8579bda12 (commit)
       from 61a0f524a177f79980a27ca53f4888f645eef759 (commit)

commit 400ee75c28d904103669158c1ac8e8c8579bda12
Author: Nick Schermer <nick at xfce.org>
Date:   Tue May 15 21:19:02 2012 +0200

    Fix some mistakes.

 thunar/thunar-folder.c        |    1 -
 thunar/thunar-path-entry.c    |    2 +-
 thunar/thunar-standard-view.c |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
index 799a360..1b3b971 100644
--- a/thunar/thunar-folder.c
+++ b/thunar/thunar-folder.c
@@ -825,6 +825,5 @@ thunar_folder_destroy (ThunarFolder *folder)
    * emitted once there. there we can use g_object_unref on
    * folders */
   g_signal_emit (G_OBJECT (folder), folder_signals[DESTROY], 0);
-  
   g_object_unref (G_OBJECT (folder));
 }
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index a6ec868..94aaf58 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -869,7 +869,7 @@ thunar_path_entry_changed (GtkEditable *editable)
 
       /* cleanup */
       if (G_LIKELY (folder != NULL))
-        thunar_folder_destroy (folder);
+        g_object_unref (G_OBJECT (folder));
     }
 
   /* update the current file if required */
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 54fe1c9..bfd324e 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -1210,7 +1210,7 @@ thunar_standard_view_set_current_directory (ThunarNavigator *navigator,
 
   /* apply the new folder */
   thunar_list_model_set_folder (standard_view->model, folder);
-  thunar_folder_destroy (folder);
+  g_object_unref (G_OBJECT (folder));
 
   /* reconnect our model to the view */
   g_object_set (G_OBJECT (child), "model", standard_view->model, NULL);
@@ -2747,7 +2747,7 @@ thunar_standard_view_drag_data_received (GtkWidget          *view,
                       /* reload the folder corresponding to the file */
                       folder = thunar_folder_get_for_file (file);
                       thunar_folder_reload (folder);
-                      thunar_folder_destroy (folder);
+                      g_object_unref (G_OBJECT (folder));
                     }
 
                   /* cleanup */


More information about the Xfce4-commits mailing list