summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--thunar/thunar-history.c19
2 files changed, 13 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f292588f..f4f9ff1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-30 Jannis Pohlmann <jannis@xfce.org>
+
+ * thunar/thunar-history.c (thunar_history_set_current_directory): If
+ the new directory is the first one in the forward list, we just go
+ one step forward instead of clearing the whole forward history.
+ Don't try to be intelligent anymore if the new directory is the
+ first one in the backward history.
+
2008-11-30 Nick Schermer <nick@xfce.org>
* thunar/thunar-tree-model.c: Fix a possible crash discovered by
diff --git a/thunar/thunar-history.c b/thunar/thunar-history.c
index e9e73004..7cba6ed0 100644
--- a/thunar/thunar-history.c
+++ b/thunar/thunar-history.c
@@ -312,20 +312,11 @@ thunar_history_set_current_directory (ThunarNavigator *navigator,
if (G_UNLIKELY (current_directory == history->current_directory))
return;
- /* we try to be smart and check if the new current directory
- * is the first element on either "back" or "forward" and if
- * so, perform the appropriate operation.
- */
- if (history->back_list != NULL && history->back_list->data == current_directory)
- {
- /* go back one step */
- thunar_history_go_back (history, 1);
- }
- else if (history->forward_list != NULL && history->forward_list->data == current_directory)
- {
- /* go forward one step */
- thunar_history_go_forward (history, 1);
- }
+ /* if the new directory is the first one in the forward history, we
+ * just move forward one step instead of clearing the whole forward
+ * history */
+ if (history->forward_list != NULL && history->forward_list->data == current_directory)
+ thunar_history_go_forward (history, 1);
else
{
/* clear the "forward" list */