Hello community,
here is the log from the commit of package nautilus
checked in at Mon Apr 28 18:11:56 CEST 2008.
--------
--- GNOME/nautilus/nautilus.changes 2008-04-23 21:49:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2008-04-28 18:07:58.251719000 +0200
@@ -1,0 +2,8 @@
+Mon Apr 28 18:12:44 CEST 2008 - federico@novell.com
+
+- Rebased these patches:
+ nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff
+ nautilus-bgo350950-search-desktop.diff
+ nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
+
+-------------------------------------------------------------------
Old:
----
nautilus-icon.patch
nautilus-name-length.patch
nautilus-search-desktop.patch
New:
----
nautilus-bgo350950-search-desktop.diff
nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff
nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus.spec ++++++
--- /var/tmp/diff_new_pack.fR4089/_old 2008-04-28 18:11:05.000000000 +0200
+++ /var/tmp/diff_new_pack.fR4089/_new 2008-04-28 18:11:05.000000000 +0200
@@ -16,17 +16,17 @@
License: GPL v2 or later
Group: Productivity/File utilities
Version: 2.22.2
-Release: 9
+Release: 11
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# PATCH-NEEDS-REBASE nautilus-name-length.patch
-Patch2: nautilus-name-length.patch
-# PATCH-FIX-UPSTREAM nautilus-search-desktop.patch bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface
-Patch4: nautilus-search-desktop.patch
-# PATCH-NEEDS-REBASE nautilus-icon.patch bgo350962 bnc117333 federico@novell.com
-Patch5: nautilus-icon.patch
+# PATCH-FIX-UPSTREAM nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff bgo364843 -- make "longfilename (copy).txt" not overflow the maximum filename length
+Patch2: nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff
+# PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface
+Patch4: nautilus-bgo350950-search-desktop.diff
+# PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 federico@novell.com - Use a folder icon instead of a file cabinet window
+Patch5: nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
# PATCH-FIX-OPENSUSE nautilus-genericname.patch
Patch6: nautilus-genericname.patch
# PATCH-FIX-OPENSUSE nautilus-disable-zoom-control-and-view-as-option-menu.patch
@@ -86,11 +86,11 @@
%prep
%setup -q
gnome-patch-translation-prepare
-#%patch2 -p0
+%patch2 -p1
%if ! %sles_version
-%patch4
+%patch4 -p1
%endif
-### %patch5 -p1
+%patch5 -p1
%patch6 -p0
%patch7
### %patch8 -p1
@@ -188,6 +188,11 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Apr 28 2008 federico@novell.com
+- Rebased these patches:
+ nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff
+ nautilus-bgo350950-search-desktop.diff
+ nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
* Wed Apr 23 2008 vuntz@suse.de
- Rename nautilus-docpath.patch to nautilus-genericname.patch and
drop the part of the patch adding a DocPath.
++++++ nautilus-bgo350950-search-desktop.diff ++++++
http://bugzilla.gnome.org/show_bug.cgi?id=350950
From: Federico Mena Quintero
Install a nautilus-search.desktop with a shortcut to
x-nautilus-search: so that people can easily add *that* link to their
desktops.
---
Makefile.am | 1
nautilus-search.desktop.in | 113 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 114 insertions(+), 0 deletions(-)
create mode 100644 nautilus-search.desktop.in
diff --git a/Makefile.am b/Makefile.am
index 7e134d9..997ae21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ desktop_in_files = \
nautilus.desktop.in \
nautilus-home.desktop.in \
nautilus-computer.desktop.in \
+ nautilus-search.desktop.in \
nautilus-folder-handler.desktop.in \
nautilus-file-management-properties.desktop.in \
nautilus-autorun-software.desktop.in
diff --git a/nautilus-search.desktop.in b/nautilus-search.desktop.in
new file mode 100644
index 0000000..e8bc394
--- /dev/null
+++ b/nautilus-search.desktop.in
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Search for Files...
+Name[bg]=Търсене за файлове...
+Name[ca]=Cerca fitxers...
+Name[cs]=Hledat soubory...
+Name[cy]=Chwilio am Ffeiliau...
+Name[da]=Søg efter filer...
+Name[de]=Nach Dateien suchen...
+Name[el]=Αναζήτηση για αρχεία...
+Name[en_CA]=Search for Files...
+Name[en_GB]=Search for Files...
+Name[es]=Buscar archivos...
+Name[et]=Otsi faile...
+Name[fa]=جستجوی پروندهها...
+Name[fi]=Etsi tiedostoja...
+Name[fr]=Rechercher des fichiers...
+Name[gl]=Buscar ficheiros...
+Name[gu]=ફાઈલો માટે શોધો...
+Name[he]=חפש קבצים...
+Name[hi]=फ़ाइलों हेतु ढूंढें...
+Name[hu]=Fájlok keresése...
+Name[id]=Cari Berkas...
+Name[it]=Cerca file...
+Name[ja]=ファイルの検索...
+Name[ko]=파일 찾기...
+Name[lt]=Ieškoti bylų...
+Name[mk]=Барај датотеки...
+Name[nb]=Søk etter filer...
+Name[ne]=...फाइलहरूलाई खोज्नुहोस्
+Name[nl]=Bestanden zoeken...
+Name[no]=Søk etter filer...
+Name[pa]=ਫਾਇਲਾਂ ਦੀ ਖੋਜ...
+Name[pl]=Wyszukaj pliki...
+Name[pt]=Procurar Ficheiros...
+Name[pt_BR]=Procurar por Arquivos...
+Name[ro]=Caută fişiere...
+Name[ru]=Поиск файлов...
+Name[sq]=Kërko për files...
+Name[sr]=Тражи датотеке...
+Name[sr@Latn]=Traži datoteke...
+Name[sv]=Sök efter filer...
+Name[th]=ค้นหาแฟ้ม...
+Name[tr]=Dosya Ara...
+Name[uk]=Пошук файлів...
+Name[vi]=Tìm kiếm tập tin...
+Name[xh]=Khangela iiFayili...
+Name[zh_CN]=搜索文件...
+Name[zh_TW]=搜尋檔案...
+Comment=Find files, folders, and documents on your computer
+Comment[ar]=إيجاد ملفّات و مجلّدات و مستندات على حاسوبك
+Comment[az]=Kompüterinizdəki faylları, qovluqları və sənədləri tapın
+Comment[bg]=Намиране на файлове, папки и документи на вашия компютър
+Comment[bs]=Nalazi datoteke, direktorije, i dokumente na vašem računaru
+Comment[ca]=Cerca fitxers, carpetes i documents al vostre ordinador
+Comment[cs]=Hledat soubory, adresáře a dokumenty ve vašem počítači
+Comment[cy]=Canfod ffeiliau, ffolderi a dogfennau ar eich cyfrifiadur
+Comment[da]=Find filer, mapper og dokumenter på din maskine
+Comment[de]=Dateien, Ordner und Dokumente auf Ihrem Computer finden
+Comment[el]=Εύρεση αρχείων, φακέλων και εγγράφων στον υπολογιστή σας
+Comment[en_CA]=Find files, folders, and documents on your computer
+Comment[en_GB]=Find files, folders, and documents on your computer
+Comment[es]=Busca archivos, carpetas y documentos en su equipo
+Comment[et]=Failide, kataloogide ja dokumentide otsimine
+Comment[eu]=Aurkitu fitxategiak, karpetak eta dokumentuak zure ordenagailuan
+Comment[fa]=پیدا کردن پروندهها، پوشهها و نوشتارها در کامپیوتر شما
+Comment[fi]=Etsi tiedostoja, kansioita ja asiakirjoja tietokoneeltasi
+Comment[fr]=Recherche des fichiers, des dossiers et des documents dans votre ordinateur
+Comment[gl]=Bucar ficheiros, carpetas, e documentos no seu ordenador
+Comment[gu]=તમારા કમ્પ્યૂટર પર ફાઈલો, ફોલ્ડરો અને દસ્તાવેજો શોધો
+Comment[he]=מצא קבצים, תיקיות ומסמכים במחשב שלך
+Comment[hi]=कंप्यूटर में फ़ाइल, फ़ोल्डर और दस्तावेज़ ढूंढें
+Comment[hu]=Fájlok, mappák és dokumentumok keresése a számítógépen
+Comment[id]=Cari berkas, folder, dan dokumen dalam komputer
+Comment[it]=Trova file, cartelle e documenti nel computer
+Comment[ja]=お使いのコンピュータにあるファイルやフォルダ、ドキュメントを検索します
+Comment[ko]=컴퓨터에 들어 있는 파일, 폴더, 문서 찾기
+Comment[lt]=Raskite bylas, aplankus ir dokumentus esančius Jūsų kompiuteryje
+Comment[mk]=Најдете датотеки, папки и документи на Вашиот компјутер
+Comment[ms]=Cari fail, folder, dan dokumen pada komputer anda
+Comment[nb]=Finn filer, mapper og dokumenter på din datamaskin
+Comment[ne]=कम्प्युटरका फाइलहरू, फोल्डरहरू, र कागजातहरू फेला पार्नुहोस्
+Comment[nl]=Bestanden, mappen en documenten zoeken op uw computer
+Comment[nn]=Finn filer, mapper og dokument på datamaskinen
+Comment[no]=Finn filer, mapper og dokumenter på din datamaskin
+Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੇ ਫਾਇਲਾਂ, ਫੋਲਡਰ ਤੇ ਦਸਤਾਵੇਜ਼ ਲੱਭੋ
+Comment[pl]=Wyszukuje pliki, foldery i dokumenty na komputerze
+Comment[pt]=Procurar ficheiros, pastas e documentos no seu computador
+Comment[pt_BR]=Encontre arquivos, pastas e documentos em seu computador
+Comment[ro]=Caută fişiere, dosare şi documente pe calculatorul dumneavoastră
+Comment[ru]=Поиск файлов, папок и документов на вашем компьютере
+Comment[sk]=Hľadať súbory, priečinky a dokumenty na vašom počítači
+Comment[sq]=Gjej files, kartela, dhe dokumentë në kompjuterin tuaj
+Comment[sr]=Тражите датотеке, фасцикле и документе на вашем рачунару
+Comment[sr@Latn]=Tražite datoteke, fascikle i dokumente na vašem računaru
+Comment[sv]=Sök filer, mappar och dokument på din dator
+Comment[ta]=உங்கள் கணினியில் உள்ள கோப்புகள்,அடைவுகள் மற்றும் ஆவணங்களை கண்டுபிடி
+Comment[th]=ค้นหาแฟ้ม โฟลเดอร์ หรือเอกสาร ในคอมพิวเตอร์เครื่องนี้
+Comment[tr]=Bilgisayarınızdaki dosyaları, klasörleri ve belgeleri bulun
+Comment[uk]=Пошук файлів, тек та документів на вашому комп'ютері
+Comment[vi]=Tìm tập tin, thư mục và tài liệu trên máy tính.
+Comment[xh]=Ukufumana iifayili, iziqulathi zeefayili, namaxwebhu kwikhompyutha yakho
+Comment[zh_CN]=在您的计算机上查找文件、文件夹和文档
+Comment[zh_TW]=在電腦中搜尋檔案、資料夾和文件
+Exec=nautilus x-nautilus-search:
+Icon=stock_search
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Core;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=nautilus
+X-GNOME-Bugzilla-Component=general
++++++ nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff ++++++
2008-04-21 Federico Mena Quintero
From: Federico Mena Quintero
http://bugzilla.gnome.org/show_bug.cgi?id=364843
Keep the generated names for "reallylongfilename (copy).txt" from
overflowing the maximum allowed length for path names.
Original patch by Dave Camp
* libnautilus-private/nautilus-file-operations.c
(shorten_utf8_string): New function; takes an UTF8 string and
hygienically truncates it to a given number of bytes.
(get_link_name): Ensure the final name doesn't exceed a maximum length.
(make_next_duplicate_name): Likewise.
(get_max_name_length): Wrapper around pathconf() for basename lengths.
(get_unique_target_file): Use a maximum length for the target name.
(get_target_file_for_link): Likewise.
---
libnautilus-private/nautilus-file-operations.c | 239 +++++++++++++++++++-----
1 files changed, 186 insertions(+), 53 deletions(-)
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 15dd601..bc1d941 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -228,15 +228,55 @@ format_time (int seconds)
hours), hours);
}
+static char *
+shorten_utf8_string (const char *base, int reduce_by_num_bytes)
+{
+ int len;
+ char *ret;
+ const char *p;
+
+ len = strlen (base);
+ len -= reduce_by_num_bytes;
+
+ if (len <= 0) {
+ return NULL;
+ }
+
+ ret = g_new (char, len + 1);
+
+ p = base;
+ while (len) {
+ char *next;
+ next = g_utf8_next_char (p);
+ if (next - p > len || *next == '\0') {
+ break;
+ }
+
+ len -= next - p;
+ p = next;
+ }
+
+ if (p - base == 0) {
+ g_free (ret);
+ return NULL;
+ } else {
+ memcpy (ret, base, p - base);
+ ret[p - base] = '\0';
+ return ret;
+ }
+}
+
/* Note that we have these two separate functions with separate format
* strings for ease of localization.
*/
static char *
-get_link_name (const char *name, int count)
+get_link_name (const char *name, int count, int max_length)
{
const char *format;
char *result;
+ int unshortened_length;
+ gboolean use_count;
g_assert (name != NULL);
@@ -262,8 +302,8 @@ get_link_name (const char *name, int count)
format = _("Another link to %s");
break;
}
- result = g_strdup_printf (format, name);
+ use_count = FALSE;
} else {
/* Handle special cases for the first few numbers of each ten.
* For locales where getting this exactly right is difficult,
@@ -290,7 +330,30 @@ get_link_name (const char *name, int count)
format = _("%'dth link to %s");
break;
}
+
+ use_count = TRUE;
+ }
+
+ if (use_count)
result = g_strdup_printf (format, count, name);
+ else
+ result = g_strdup_printf (format, name);
+
+ if (max_length > 0 && (unshortened_length = strlen (result)) > max_length) {
+ char *new_name;
+
+ new_name = shorten_utf8_string (name, unshortened_length - max_length);
+ if (new_name) {
+ g_free (result);
+
+ if (use_count)
+ result = g_strdup_printf (format, count, new_name);
+ else
+ result = g_strdup_printf (format, new_name);
+
+ g_assert (strlen (result) <= max_length);
+ g_free (new_name);
+ }
}
return result;
@@ -482,11 +545,12 @@ parse_previous_duplicate_name (const char *name,
}
static char *
-make_next_duplicate_name (const char *base, const char *suffix, int count)
+make_next_duplicate_name (const char *base, const char *suffix, int count, int max_length)
{
const char *format;
char *result;
-
+ int unshortened_length;
+ gboolean use_count;
if (count < 1) {
g_warning ("bad count %d in get_duplicate_name", count);
@@ -510,7 +574,8 @@ make_next_duplicate_name (const char *base, const char *suffix, int count)
break;
}
- result = g_strdup_printf (format, base, suffix);
+
+ use_count = FALSE;
} else {
/* Handle special cases for the first few numbers of each ten.
@@ -553,14 +618,37 @@ make_next_duplicate_name (const char *base, const char *suffix, int count)
}
}
+ use_count = TRUE;
+
+ }
+
+ if (use_count)
result = g_strdup_printf (format, base, count, suffix);
+ else
+ result = g_strdup_printf (format, base, suffix);
+
+ if (max_length > 0 && (unshortened_length = strlen (result)) > max_length) {
+ char *new_base;
+
+ new_base = shorten_utf8_string (base, unshortened_length - max_length);
+ if (new_base) {
+ g_free (result);
+
+ if (use_count)
+ result = g_strdup_printf (format, new_base, count, suffix);
+ else
+ result = g_strdup_printf (format, new_base, suffix);
+
+ g_assert (strlen (result) <= max_length);
+ g_free (new_base);
+ }
}
return result;
}
static char *
-get_duplicate_name (const char *name, int count_increment)
+get_duplicate_name (const char *name, int count_increment, int max_length)
{
char *result;
char *name_base;
@@ -568,7 +656,7 @@ get_duplicate_name (const char *name, int count_increment)
int count;
parse_previous_duplicate_name (name, &name_base, &suffix, &count);
- result = make_next_duplicate_name (name_base, suffix, count + count_increment);
+ result = make_next_duplicate_name (name_base, suffix, count + count_increment, max_length);
g_free (name_base);
@@ -2626,6 +2714,45 @@ report_copy_progress (CopyMoveJob *copy_job,
nautilus_progress_info_set_progress (job->progress, transfer_info->num_bytes, total_size);
}
+static int
+get_max_name_length (GFile *file_dir)
+{
+ int max_length;
+ char *dir;
+ long max_path;
+ long max_name;
+
+ max_length = -1;
+
+ if (!g_file_has_uri_scheme (file_dir, "file"))
+ return max_length;
+
+ dir = g_file_get_path (file_dir);
+ if (!dir)
+ return max_length;
+
+ max_path = pathconf (dir, _PC_PATH_MAX);
+ max_name = pathconf (dir, _PC_NAME_MAX);
+
+ if (max_name == -1 && max_path == -1) {
+ max_length = -1;
+ } else if (max_name == -1 && max_path != -1) {
+ max_length = max_path - (strlen (dir) + 1);
+ } else if (max_name != -1 && max_path == -1) {
+ max_length = max_name;
+ } else {
+ int leftover;
+
+ leftover = max_path - (strlen (dir) + 1);
+
+ max_length = MIN (leftover, max_name);
+ }
+
+ g_free (dir);
+
+ return max_length;
+}
+
static GFile *
get_unique_target_file (GFile *src,
GFile *dest_dir,
@@ -2636,6 +2763,9 @@ get_unique_target_file (GFile *src,
char *basename, *new_name;
GFileInfo *info;
GFile *dest;
+ int max_length;
+
+ max_length = get_max_name_length (dest_dir);
dest = NULL;
info = g_file_query_info (src,
@@ -2645,7 +2775,7 @@ get_unique_target_file (GFile *src,
editname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME);
if (editname != NULL) {
- new_name = get_duplicate_name (editname, count);
+ new_name = get_duplicate_name (editname, count, max_length);
dest = g_file_get_child_for_display_name (dest_dir, new_name, NULL);
g_free (new_name);
}
@@ -2657,7 +2787,7 @@ get_unique_target_file (GFile *src,
basename = g_file_get_basename (src);
if (g_utf8_validate (basename, -1, NULL)) {
- new_name = get_duplicate_name (basename, count);
+ new_name = get_duplicate_name (basename, count, max_length);
dest = g_file_get_child_for_display_name (dest_dir, new_name, NULL);
g_free (new_name);
}
@@ -2687,7 +2817,10 @@ get_target_file_for_link (GFile *src,
char *basename, *new_name;
GFileInfo *info;
GFile *dest;
-
+ int max_length;
+
+ max_length = get_max_name_length (dest_dir);
+
dest = NULL;
info = g_file_query_info (src,
G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
@@ -2696,7 +2829,7 @@ get_target_file_for_link (GFile *src,
editname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME);
if (editname != NULL) {
- new_name = get_link_name (editname, count);
+ new_name = get_link_name (editname, count, max_length);
dest = g_file_get_child_for_display_name (dest_dir, new_name, NULL);
g_free (new_name);
}
@@ -2708,7 +2841,7 @@ get_target_file_for_link (GFile *src,
basename = g_file_get_basename (src);
if (g_utf8_validate (basename, -1, NULL)) {
- new_name = get_link_name (basename, count);
+ new_name = get_link_name (basename, count, max_length);
dest = g_file_get_child_for_display_name (dest_dir, new_name, NULL);
g_free (new_name);
}
@@ -5136,47 +5269,47 @@ nautilus_self_check_file_operations (void)
/* test the next duplicate name generator */
- EEL_CHECK_STRING_RESULT (get_duplicate_name (" (copy)", 1), " (another copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo", 1), "foo (copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name (".bashrc", 1), ".bashrc (copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name (".foo.txt", 1), ".foo (copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo", 1), "foo foo (copy)");
- 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. (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");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (another copy)", 1), "foo (3rd copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (another copy).txt", 1), "foo (3rd copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (another copy).txt", 1), "foo foo (3rd copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (13th copy)", 1), "foo (14th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (13th copy).txt", 1), "foo (14th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (21st copy)", 1), "foo (22nd copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (21st copy).txt", 1), "foo (22nd copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (22nd copy)", 1), "foo (23rd copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (22nd copy).txt", 1), "foo (23rd copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (23rd copy)", 1), "foo (24th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (23rd copy).txt", 1), "foo (24th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (24th copy)", 1), "foo (25th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (24th copy).txt", 1), "foo (25th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (24th copy)", 1), "foo foo (25th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (24th copy).txt", 1), "foo foo (25th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (100000000000000th copy).txt", 1), "foo foo (copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (10th copy)", 1), "foo (11th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (10th copy).txt", 1), "foo (11th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (11th copy)", 1), "foo (12th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (11th copy).txt", 1), "foo (12th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (12th copy)", 1), "foo (13th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (12th copy).txt", 1), "foo (13th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (110th copy)", 1), "foo (111th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (110th copy).txt", 1), "foo (111th copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (122nd copy)", 1), "foo (123rd copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (122nd copy).txt", 1), "foo (123rd copy).txt");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy)", 1), "foo (124th copy)");
- EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy).txt", 1), "foo (124th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name (" (copy)", 1, -1), " (another copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo", 1, -1), "foo (copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name (".bashrc", 1, -1), ".bashrc (copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name (".foo.txt", 1, -1), ".foo (copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo", 1, -1), "foo foo (copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo.txt", 1, -1), "foo (copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo.txt", 1, -1), "foo foo (copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo.txt txt", 1, -1), "foo foo (copy).txt txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...txt", 1, -1), "foo (copy)...txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...", 1, -1), "foo (copy)...");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo. (copy)", 1, -1), "foo. (another copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (copy)", 1, -1), "foo (another copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (copy).txt", 1, -1), "foo (another copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (another copy)", 1, -1), "foo (3rd copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (another copy).txt", 1, -1), "foo (3rd copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (another copy).txt", 1, -1), "foo foo (3rd copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (13th copy)", 1, -1), "foo (14th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (13th copy).txt", 1, -1), "foo (14th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (21st copy)", 1, -1), "foo (22nd copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (21st copy).txt", 1, -1), "foo (22nd copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (22nd copy)", 1, -1), "foo (23rd copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (22nd copy).txt", 1, -1), "foo (23rd copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (23rd copy)", 1, -1), "foo (24th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (23rd copy).txt", 1, -1), "foo (24th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (24th copy)", 1, -1), "foo (25th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (24th copy).txt", 1, -1), "foo (25th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (24th copy)", 1, -1), "foo foo (25th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (24th copy).txt", 1, -1), "foo foo (25th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (100000000000000th copy).txt", 1, -1), "foo foo (copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (10th copy)", 1, -1), "foo (11th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (10th copy).txt", 1, -1), "foo (11th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (11th copy)", 1, -1), "foo (12th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (11th copy).txt", 1, -1), "foo (12th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (12th copy)", 1, -1), "foo (13th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (12th copy).txt", 1, -1), "foo (13th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (110th copy)", 1, -1), "foo (111th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (110th copy).txt", 1, -1), "foo (111th copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (122nd copy)", 1, -1), "foo (123rd copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (122nd copy).txt", 1, -1), "foo (123rd copy).txt");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy)", 1, -1), "foo (124th copy)");
+ EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy).txt", 1, -1), "foo (124th copy).txt");
setlocale (LC_MESSAGES, "");
}
++++++ nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff ++++++
http://bugzilla.gnome.org/show_bug.cgi?id=350962
From: Federico Mena Quintero
https://bugzilla.novell.com/show_bug.cgi?id=117333
Use "gnome-fs-directory" instead of "file-manager" as an icon. A
folder is more recognizable than a filing cabinet.
---
nautilus-file-management-properties.desktop.in.in | 2 +-
nautilus.desktop.in.in | 2 +-
src/nautilus-file-management-properties.c | 2 +-
src/nautilus-navigation-window.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nautilus-file-management-properties.desktop.in.in b/nautilus-file-management-properties.desktop.in.in
index a696c81..d372b64 100644
--- a/nautilus-file-management-properties.desktop.in.in
+++ b/nautilus-file-management-properties.desktop.in.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=File Management
_Comment=Change the behaviour and appearance of file manager windows
Exec=nautilus-file-management-properties
-Icon=system-file-manager
+Icon=gnome-fs-directory
Terminal=false
Type=Application
StartupNotify=true
diff --git a/nautilus.desktop.in.in b/nautilus.desktop.in.in
index ef7d18d..ed6314f 100644
--- a/nautilus.desktop.in.in
+++ b/nautilus.desktop.in.in
@@ -4,7 +4,7 @@ _Name=File Browser
_Comment=Browse the file system with the file manager
TryExec=nautilus
Exec=nautilus --no-desktop --browser %U
-Icon=system-file-manager
+Icon=gnome-fs-directory
Terminal=false
StartupNotify=true
Type=Application
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 6fcb700..b1338f6 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -789,7 +789,7 @@ nautilus_file_management_properties_dialog_setup (GladeXML *xml_dialog, GtkWindo
(GClosureNotify)g_object_unref,
0);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), "file-manager");
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "gnome-fs-directory");
if (window) {
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index f22e2cd..a23cfca 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -949,7 +949,7 @@ real_set_title (NautilusWindow *window, const char *title)
static NautilusIconInfo *
real_get_icon (NautilusWindow *window)
{
- return nautilus_icon_info_lookup_from_name ("file-manager", 48);
+ return nautilus_icon_info_lookup_from_name ("gnome-fs-directory", 48);
}
static void
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org