[nautilus/revert-4930ec0b] Revert "Merge branch '105-expanding-folders-crashes-nautilus' into 'master'"
- From: Gitlab Administrative User <gitlab src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/revert-4930ec0b] Revert "Merge branch '105-expanding-folders-crashes-nautilus' into 'master'"
- Date: Tue, 7 Nov 2017 14:59:25 +0000 (UTC)
commit f120bbd8f19021588301c3303b3e44c671ea7892
Author: António Fernandes <antoniojpfernandes gmail com>
Date: Tue Nov 7 14:58:38 2017 +0000
Revert "Merge branch '105-expanding-folders-crashes-nautilus' into 'master'"
This reverts merge request !22
src/nautilus-list-view.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index c284a675a..1de1b4b6a 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -519,13 +519,6 @@ on_star_cell_renderer_clicked (GtkTreePath *path,
list_model = list_view->details->model;
file = nautilus_list_model_file_for_path (list_model, path);
-
- if (file == NULL)
- {
- /* This row is a label, not a file */
- return;
- }
-
uri = nautilus_file_get_uri (file);
selection = g_list_prepend (NULL, file);
@@ -1684,16 +1677,6 @@ favorite_cell_data_func (GtkTreeViewColumn *column,
NAUTILUS_LIST_MODEL_FILE_COLUMN, &file,
-1);
- if (file == NULL)
- {
- /* This row is a label, not a file */
- g_object_set (renderer,
- "icon-name", NULL,
- "mode", GTK_CELL_RENDERER_MODE_INERT,
- NULL);
- return;
- }
-
uri = nautilus_file_get_uri (file);
if (nautilus_tag_manager_file_is_favorite (view->details->tag_manager, uri))
@@ -2211,6 +2194,7 @@ create_and_set_up_tree_view (NautilusListView *view)
{
cell = gtk_cell_renderer_pixbuf_new ();
g_object_set (cell,
+ "icon-name", "non-starred-symbolic",
"mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]