summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Camp <dave@ximian.com>2003-01-18 21:14:12 +0000
committerDave Camp <campd@src.gnome.org>2003-01-18 21:14:12 +0000
commit1d70f58e575b12a5a2d2763eeae91ba73fbc3d58 (patch)
tree3a996d015e9238ad1beeb67d31d5ff11efb706e6
parent45dd65cfe38098b96c0bf874a63395500afde89b (diff)
downloadnautilus-1d70f58e575b12a5a2d2763eeae91ba73fbc3d58.tar.gz
Don't initiate a rename on mouse clicks. Patch from Marten Ter Borgh
2003-01-18 Dave Camp <dave@ximian.com> * src/file-manager/fm-list-view.c: (cell_renderer_edited), (create_and_set_up_tree_view), (fm_list_view_start_renaming_file): Don't initiate a rename on mouse clicks. Patch from Marten Ter Borgh <marten-devel@terborgh.demon.nl>, fixes bug #83552.
-rw-r--r--ChangeLog8
-rw-r--r--src/file-manager/fm-list-view.c15
2 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b254a6d2f..d74cb5a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-18 Dave Camp <dave@ximian.com>
+
+ * src/file-manager/fm-list-view.c: (cell_renderer_edited),
+ (create_and_set_up_tree_view), (fm_list_view_start_renaming_file):
+ Don't initiate a rename on mouse clicks.
+ Patch from Marten Ter Borgh <marten-devel@terborgh.demon.nl>,
+ fixes bug #83552.
+
2003-01-18 Tõivo Leedjärv <toivo@linux.ee>
* configure.in: Added et to ALL_LINGUAS.
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 4fee54339..cff067b7f 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -286,6 +286,12 @@ cell_renderer_edited (GtkCellRendererText *cell,
fm_rename_file (file, new_text);
nautilus_file_unref (file);
+
+ /*We're done editing - make the filename-cells readonly again.*/
+ g_object_set (G_OBJECT (view->details->file_name_cell),
+ "editable", FALSE,
+ NULL);
+
}
static char *
@@ -418,9 +424,7 @@ create_and_set_up_tree_view (FMListView *view)
gtk_tree_view_column_pack_start (view->details->file_name_column, cell, TRUE);
gtk_tree_view_column_set_attributes (view->details->file_name_column, cell,
- "text", FM_LIST_MODEL_NAME_COLUMN,
- "editable", FM_LIST_MODEL_FILE_NAME_IS_EDITABLE_COLUMN,
- NULL);
+ "text", FM_LIST_MODEL_NAME_COLUMN, NULL);
gtk_tree_view_append_column (view->details->tree_view, view->details->file_name_column);
/* Create the size column */
@@ -826,6 +830,11 @@ fm_list_view_start_renaming_file (FMDirectoryView *view, NautilusFile *file)
}
path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_view->details->model), &iter);
+
+ /*Make filename-cells editable.*/
+ g_object_set (G_OBJECT (list_view->details->file_name_cell),
+ "editable", TRUE,
+ NULL);
gtk_tree_view_set_cursor (list_view->details->tree_view,
path,