summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2005-07-01 15:39:08 +0000
committerAlexander Larsson <alexl@src.gnome.org>2005-07-01 15:39:08 +0000
commitee3e590b4f99fc1b97542e628ffed9c94b227a4e (patch)
treea3c8d4e25d89736ad74945cdeeb068bca762aeb8
parent977c0f99380c111749b04c20b34113f635d1d0e7 (diff)
downloadnautilus-NAUTILUS_2_11_3.tar.gz
2005-07-01 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-file-operations.c: Fix test * NEWS: Update for release * configure.in: Require eel 2.11.3
-rw-r--r--ChangeLog11
-rw-r--r--NEWS11
-rw-r--r--configure.in2
-rw-r--r--libnautilus-private/nautilus-file-operations.c4
-rw-r--r--po/ChangeLog5
-rw-r--r--po/POTFILES.in3
6 files changed, 32 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a7ccde85..d5e8046eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2005-07-01 Alexander Larsson <alexl@redhat.com>
+ * libnautilus-private/nautilus-file-operations.c:
+ Fix test
+
+ * NEWS:
+ Update for release
+
+ * configure.in:
+ Require eel 2.11.3
+
+2005-07-01 Alexander Larsson <alexl@redhat.com>
+
* libnautilus-private/nautilus-window-info.[ch]:
* src/nautilus-window.c:
Add nautilus_window_info_get_bookmark_list
diff --git a/NEWS b/NEWS
index 4913d62ea..9de0420ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Major changes in 2.11.3 are:
+* Turn the list view into a tree
+* No dnd drop rect on the desktop
+* Use gtk bookmars as bookmark source
+* Add bookmarks to spatial mode
+* New places sidebar
+* better sort order for filenames with numbers in them
+ (needs glib 2.7.x)
+* Better handling of font sizes wrt zoom in icon view
+* Fix leaks
+
Major changes in 2.11.2 are:
* Fix sort order for size/count/time
* ctrl+scrollwheel changes zoom, ctrl-= zooms in
diff --git a/configure.in b/configure.in
index c4ceb2927..75663556b 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl ===========================================================================
m4_define(art_minver, 2.3.10)
m4_define(bonobo_activation_minver, 2.1.0)
m4_define(bonobo_minver, 2.1.0)
-m4_define(eel_minver, 2.11.2)
+m4_define(eel_minver, 2.11.3)
m4_define(esound_minver, 0.2.27)
m4_define(glib_minver, 2.6.0)
m4_define(gnome_desktop_minver, 2.9.91)
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 2b73ec16e..fb88b95cb 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -2628,8 +2628,8 @@ nautilus_self_check_file_operations (void)
EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo.txt", 1), "foo (copy).txt");
EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo.txt", 1), "foo foo (copy).txt");
EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo.txt txt", 1), "foo foo (copy).txt txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...txt", 1), "foo.. (copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...", 1), "foo... (copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...txt", 1), "foo (copy)...txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...", 1), "foo (copy)...");
EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo. (copy)", 1), "foo. (another copy)");
EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (copy)", 1), "foo (another copy)");
EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (copy).txt", 1), "foo (another copy).txt");
diff --git a/po/ChangeLog b/po/ChangeLog
index 41ef08199..3a2c9d46e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-01 Alexander Larsson <alexl@redhat.com>
+
+ * POTFILES.in:
+ Add places sidebar.
+
2005-07-01 Funda Wang <fundawang@linux.net.cn>
* zh_CN.po: Updated Simplified Chinese translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f0671144d..91147ec70 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,6 +73,7 @@ src/nautilus-navigation-window-menus.c
src/nautilus-navigation-window-ui.xml
src/nautilus-navigation-window.c
src/nautilus-notes-viewer.c
+src/nautilus-places-sidebar.c
src/nautilus-property-browser.c
src/nautilus-shell-ui.xml
src/nautilus-shell.c
@@ -81,11 +82,11 @@ src/nautilus-sidebar-title.c
src/nautilus-spatial-window-ui.xml
src/nautilus-spatial-window.c
src/nautilus-throbber.c
+src/nautilus-window-bookmarks.c
src/nautilus-window-manage-views.c
src/nautilus-window-menus.c
src/nautilus-window-private.h
src/nautilus-window-toolbars.c
src/nautilus-window.c
-src/nautilus-window-bookmarks.c
src/nautilus-zoom-control.c
src/network-scheme.desktop.in