diff options
Diffstat (limited to 'src/file-manager')
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 1 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 4 | ||||
| -rw-r--r-- | src/file-manager/nautilus-trash-monitor.c | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 5917300d8..082f5eb69 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -2488,6 +2488,7 @@ no_items_showing (FMDirectoryView *directory_view) /* This can happen when it's too early to tell. */ if (!nautilus_file_is_directory (directory_as_file)) { + nautilus_file_unref (directory_as_file); return FALSE; } diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 937d37c82..bf8db4d7b 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -1539,7 +1539,9 @@ install_row_images (FMListView *list_view, guint row) &pixmap, &bitmap); gtk_clist_set_pixmap (clist, row, LIST_VIEW_COLUMN_ICON, pixmap, bitmap); gdk_pixmap_unref (pixmap); - gdk_bitmap_unref (bitmap); + if (bitmap != NULL) { + gdk_bitmap_unref (bitmap); + } /* Install any emblems for this file. */ nautilus_list_set_pixbuf_list (list, row, LIST_VIEW_COLUMN_EMBLEMS, diff --git a/src/file-manager/nautilus-trash-monitor.c b/src/file-manager/nautilus-trash-monitor.c index 940f51680..190240fef 100644 --- a/src/file-manager/nautilus-trash-monitor.c +++ b/src/file-manager/nautilus-trash-monitor.c @@ -158,7 +158,10 @@ nautilus_trash_monitor_get (void) { if (nautilus_trash_monitor == NULL) { /* not running yet, start it up */ - nautilus_trash_monitor = gtk_type_new (NAUTILUS_TYPE_TRASH_MONITOR); + nautilus_trash_monitor = NAUTILUS_TRASH_MONITOR + (gtk_object_new (NAUTILUS_TYPE_TRASH_MONITOR, NULL)); + gtk_object_ref (GTK_OBJECT (nautilus_trash_monitor)); + gtk_object_sink (GTK_OBJECT (nautilus_trash_monitor)); g_atexit (unref_trash_monitor); } |