Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2016-06-25 02:23:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo" Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2016-06-02 09:39:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2016-06-25 02:24:02.000000000 +0200 @@ -1,0 +2,28 @@ +Thu Jun 23 18:43:19 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 3.0.6: + * Generate action files manually (as opposed to during the build). + * nemo-desktop-utils.c: return 0 for monitor index if a widget + isn't realised (this can happen during configuration changes + and during session startup). + * nemo-desktop-icon-view.c: Disconnect from the same gsettings + instance we connected to. + * nemo-desktop-manager, nemo-application: Fix some cleanup + issues - disconnect from the correct objects when disposing of + the desktop manager, and destroy the desktop manager earlier + in Nemo's destruction so there are no issues freeing the + DesktopInfos. + * notebook: Remove unused ifdef code. + * nemo-list-view.c: Detach the column header menu from metadata + when setting it up. Use the actual view's layout instead. When + reacting to visible columns being changed, simplify things by + iterating through the treeview column to build a new metadata + list. + * nemo-list-view.c: Don't show trash-specific columns in the + header menu. + * list view: Make changes to the search results view persistent. + gvfs can't save metadata for the search 'folder' so we store it + ourselves. + * eel-canvas.c: Fix touchscreen selection in icon views. + +------------------------------------------------------------------- Old: ---- nemo-3.0.5.tar.gz New: ---- nemo-3.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.RP801U/_old 2016-06-25 02:24:03.000000000 +0200 +++ /var/tmp/diff_new_pack.RP801U/_new 2016-06-25 02:24:03.000000000 +0200 @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 3.0.5 +Version: 3.0.6 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0+ @@ -36,7 +36,7 @@ BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python3-gobject BuildRequires: python3-polib BuildRequires: shared-mime-info ++++++ nemo-3.0.5.tar.gz -> nemo-3.0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/configure.ac new/nemo-3.0.6/configure.ac --- old/nemo-3.0.5/configure.ac 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/configure.ac 2016-06-23 14:33:15.000000000 +0200 @@ -18,7 +18,7 @@ m4_define(nemo_extension_current, 5) m4_define(nemo_extension_revision, 0) -AC_INIT(nemo, 3.0.5, https://github.com/linuxmint/nemo) +AC_INIT(nemo, 3.0.6, https://github.com/linuxmint/nemo) dnl =========================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/debian/changelog new/nemo-3.0.6/debian/changelog --- old/nemo-3.0.5/debian/changelog 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/debian/changelog 2016-06-23 14:33:15.000000000 +0200 @@ -1,3 +1,24 @@ +nemo (3.0.6) sarah; urgency=medium + + [ Clement Lefebvre ] + * Generate action files manually (as opposed to during the build) + + [ Michael Webster ] + * nemo-desktop-utils.c: return 0 for monitor index if a widget isn't realized (this can happen during configuration changes and during session startup). + * nemo-desktop-icon-view.c: disconnect from the same gsettings instance we connected to. + * nemo-desktop-manager, nemo-application: Fix some cleanup issues - disconnect from the correct objects when disposing of the desktop manager, and destroy the desktop manager earlier in nemo's destruction so there are no issues freeing the DesktopInfos. + + [ leigh123linux ] + * notebook: removed unused ifdef code + + [ Michael Webster ] + * nemo-list-view.c: detach the column header menu from metadata when setting it up. Use the actual view's layout instead. When reacting to visible columns being changed, simplify things by iterating through the treeview column to build a new metadata list. + * nemo-list-view.c: Don't show trash-specific columns in the header menu. + * list view: Make changes to the search results view persistent. gvfs can't save metadata for the search 'folder' so we store it ourselves. + * eel-canvas.c: Fix touchscreen selection in icon views. + + -- Clement Lefebvre <r...@linuxmint.com> Thu, 23 Jun 2016 13:32:32 +0100 + nemo (3.0.5) sarah; urgency=medium [ leigh123linux ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/eel/eel-canvas.c new/nemo-3.0.6/eel/eel-canvas.c --- old/nemo-3.0.5/eel/eel-canvas.c 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/eel/eel-canvas.c 2016-06-23 14:33:15.000000000 +0200 @@ -3032,9 +3032,11 @@ /* Pick the current item as if the button were not pressed, and * then process the event. */ + event->state ^= mask; canvas->state = event->state; pick_current_item (canvas, (GdkEvent *) event); - canvas->state ^= mask; + event->state ^= mask; + canvas->state = event->state; retval = emit_event (canvas, (GdkEvent *) event); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/Makefile.in new/nemo-3.0.6/files/Makefile.in --- old/nemo-3.0.5/files/Makefile.in 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/files/Makefile.in 2016-06-23 14:33:15.000000000 +0200 @@ -7,7 +7,7 @@ check: install: - cd ../data && ./merge_action_strings && cd ../files && find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \; + find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \; uninstall: find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/90_new-workspace.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/90_new-workspace.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/90_new-workspace.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/90_new-workspace.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,93 @@ +[Nemo Action] + +Name=Jump to new workspace + +Comment=Create a new workspace and activate it + +Exec=sh -c 'dbus-send --dest=org.Cinnamon --print-reply /org/Cinnamon org.Cinnamon.JumpToNewWorkspace >/dev/null' + +Selection=None + +Extensions=any; + +Conditions=desktop;dbus org.Cinnamon; + +Active=false + +Name[zh_HK]=跳至新工作區 +Name[pt]=Ir para nova área de trabalho +Name[ro]=Sari la un spaţiu de lucru nou +Name[cy]=Neidio i weithle newydd +Name[ru]=Перейти на новое рабочее место +Name[ms]=Lompat ke kawasan kerja baru +Name[da]=Hop til nyt arbejdsområde +Name[is]=Hoppa á nýtt vinnusvæði +Name[hr]=Skoči u novi radni prostor +Name[tr]=Yeni çalışma alanına git +Name[uk]=Перейти на новий робочий простір +Name[sk]=Skočiť na novú plochu +Name[fi]=Siirry uuteen työtilaan +Name[ca]=Vés a un espai de treball nou +Name[el]=Μετάβαση σε νέο χώρο εργασίας +Name[cs]=Přejít na novou pracovní plochu. +Name[sv]=Hoppa till ny arbetsyta +Name[ia]=Saltar a un nove spatio de labor +Name[th]=ข้ามไปพื้นที่ทำงานใหม่ +Name[nl]=Spring naar nieuw werkblad +Name[en_GB]=Jump to new workspace +Name[gl]=Cambiar a un espazo de traballo novo +Name[it]=Salta a nuovo spazio di lavoro +Name[pt_BR]=Ir para nova área de trabalho +Name[es]=Saltar a un espacio de trabajo nuevo +Name[eu]=Joan laneko area berrira +Name[gd]=Gearr leum tu rum-obrach ùr +Name[lt]=Pereiti į naują darbo sritį +Name[zh_TW]=跳至新工作區 +Name[sr]=Пређи у нови радни простор +Name[fr]=Aller vers un nouvel espace de travail +Name[hu]=Ugrás az új munkaterületre +Name[bg]=Върви на ново работно място +Name[de]=Zu neuer Arbeitsfläche wechseln +Name[ko]=새 작업 공간으로 가기 +Name[zh_CN]=跳到新的工作区 +Name[pl]=Przejdź do nowej przestrzeni roboczej +Name[ta]=புதிய பணிதளத்திற்கு தாவு +Name[vi]=Chuyển qua vùng làm việc mới +Comment[zh_HK]=建立新工作區並將其啟動 +Comment[pt]=Criar uma nova área de trabalho e activá-la +Comment[ro]=Creează un spaţiu de lucru nou şi activează-l +Comment[cy]=Creu gweithle newydd a'i roi ar waith +Comment[ru]=Создать рабочее место и сделать активным +Comment[ms]=Cipta kawasan kerja baru dan aktifkan ia. +Comment[da]=Opret et nyt arbejdsområde og aktivér det +Comment[is]=Búa til nýtt vinnusvæði og virkja það +Comment[hr]=Stvori novi radni prostor i aktiviraj ga +Comment[tr]=Yeni bir çalışma alanı oluştur ve etkinleştir +Comment[uk]=Створити й активувати новий робочий простір +Comment[sk]=Vytvoriť novú pracovnú plochu a aktivovať ju +Comment[fi]=Luo uusi työtila ja aktivoi se +Comment[ca]=Crea un nou espai de treball i activa'l +Comment[el]=Δημιουργία νέου χώρου εργασίας και ενεργοποίηση +Comment[cs]=Vytvořit novou pracovní plochu a aktivovat ji +Comment[sv]=Skapa en ny arbetsyta och aktivera den +Comment[ia]=Crear un nove spatio de labor e activar lo +Comment[th]=สร้างพื้นที่ทำงานใหม่และใช้งานพื้นที่ทำงานนั้น +Comment[nl]=Maak een nieuw werkblad en activeer het +Comment[en_GB]=Create a new workspace and activate it +Comment[gl]=Crear un novo espazo de traballo e activalo +Comment[it]=Crea un nuovo spazio di lavoro e attivalo +Comment[pt_BR]=Criar um novo espaço de trabalho e ativá-lo +Comment[es]=Crear un nuevo espacio de trabajo y activarlo +Comment[eu]=Laneko area berri bat sortu eta aktibatzen du +Comment[gd]=Cruthaich rum-obrach ùr is gnìomhaich e +Comment[lt]=Sukurti naują darbo sritį ir ją aktyvuoti +Comment[zh_TW]=建立新工作區並啟用 +Comment[sr]=Направите нови радни простор и активирајте га +Comment[fr]=Créer et activer un nouvel espace de travail +Comment[hu]=Új munkaterület létrehozása és aktiválása +Comment[bg]=Създаване и активиране на ново работно място +Comment[de]=Eine neue Arbeitsfläche erstellen und diese aktivieren +Comment[ko]=새로운 작업 공간을 만들고 사용합니다 +Comment[zh_CN]=创建新的工作区并激活它 +Comment[pl]=Utwórz nową przestrzeń roboczą i aktywuj ją +Comment[vi]=Tạo và kích hoạt vùng làm việc mới diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/91_delete-workspace.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/91_delete-workspace.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/91_delete-workspace.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/91_delete-workspace.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,95 @@ +[Nemo Action] + +Name=Remove workspace + +Comment=Remove the currently active workspace + +Exec=sh -c 'dbus-send --dest=org.Cinnamon --print-reply /org/Cinnamon org.Cinnamon.RemoveCurrentWorkspace >/dev/null' + +Selection=None + +Extensions=any; + +Conditions=desktop;dbus org.Cinnamon;gsettings org.cinnamon number-workspaces i gt 1; + +Active=false + +Name[zh_HK]=移除工作區 +Name[pt]=Remover área de trabalho +Name[ro]=Elimină spaţiu de lucru +Name[cy]=Dileu gweithle +Name[ru]=Удалить рабочее место +Name[ms]=Hapus kawasan kerja +Name[da]=Fjern arbejdsområde +Name[is]=Fjarlægja vinnusvæði +Name[hr]=Prikaži tipku idi na sljedeću lokaciju +Name[tr]=Çalışma alanını sil +Name[uk]=Вилучити робочий простір +Name[sk]=Odstrániě pracovnú plochu +Name[fi]=Poista työtila +Name[ca]=Elimina espai de treball +Name[el]=Απομακρύνση/Αφαίρεση του χώρου εργασίας +Name[cs]=Odstranit pracovní plochu +Name[sv]=Ta bort arbetsyta +Name[ia]=Remover le spatio de labor +Name[ja]=ワークスペースの削除 +Name[th]=ลบพื้นที่ทำงาน +Name[nl]=Werkblad verwijderen +Name[en_GB]=Remove workspace +Name[gl]=Eliminar o espazo de traballo +Name[it]=Rimuovi spazio di lavoro +Name[pt_BR]=Remover espaço de trabalho +Name[es]=Eliminar espacio de trabajo +Name[eu]=Kendu laneko area +Name[gd]=Thoir an rum-obrach air falbh +Name[lt]=Šalinti darbo sritį +Name[zh_TW]=移除工作區 +Name[sr]=Уклони радни простор +Name[fr]=Supprimer l'espace de travail +Name[hu]=Munkaterület eltávolítása +Name[bg]=Премахване на работно място +Name[de]=Arbeitsfläche entfernen +Name[ko]=작업 공간 제거 +Name[zh_CN]=移除工作区 +Name[pl]=Usuń przestrzeń roboczą +Name[ta]=பணிதளத்தை நீக்கு +Name[vi]=Bỏ vùng làm việc +Comment[zh_HK]=移除目前作用中的工作區 +Comment[pt]=Remover a área de trabalho activa no momento +Comment[ro]=Elimină spaţiul de lucru activ în acest moment +Comment[cy]=Tynnu gweithle gweithredol cyfredol +Comment[ru]=Удалить текущее рабочее место +Comment[ms]=Hapus kawasan kerja semasa +Comment[da]=Fjern det nuværende aktive arbejdsområde +Comment[is]=Fjarlægja vinnusvæðið sem er virkt núna +Comment[hr]=Ukloni trenutno aktivni radni prostor +Comment[tr]=Şu an aktif olan çalışma alanını sil +Comment[uk]=Вилучити поточний робочий простір +Comment[sk]=Odstrániť momentálne aktívnu plochu +Comment[fi]=Poista nykyinen aktiivinen työtila +Comment[ca]=Elimina l'espai de treball actiu +Comment[el]=Απομακρύνση/Αφαίρεση του τρέχοντος ενεργού χώρου εργασίας +Comment[cs]=Odstranit aktuálně aktivní pracovní plochu +Comment[sv]=Ta bort den nuvarande aktiva arbetsytan +Comment[ia]=Remover le spatio de labor currentemente active +Comment[ja]=現在のアクティブなワークスペースの削除 +Comment[th]=ลบพื้นที่ทำงานที่ใช้งานอยู่ตอนนี้ +Comment[nl]=Verwijder het thans actieve werkblad +Comment[en_GB]=Remove the currently active workspace +Comment[gl]=Eliminar o espazo de traballo activo +Comment[it]=Rimuovi lo spazio di lavoro corrente +Comment[pt_BR]=Remova o espaço de trabalho ativo no momento +Comment[es]=Eliminar el espacio de trabajo activo +Comment[eu]=Kendu uneko laneko area aktiboa +Comment[gd]=Thoir air falbh an rum-obrach a tha gnìomhach an-dràsta +Comment[lt]=Šalinti esamą aktyvią darbo sritį +Comment[zh_TW]=移除目前使用中的工作區 +Comment[sr]=Уклоните тренутно активан радни простор +Comment[fr]=Supprimer l'espace de travail actif +Comment[hu]=Aktív munkaterület eltávolítása +Comment[bg]=Премахване на актовното работно място +Comment[de]=Die aktuell aktive Arbeitsfläche entfernen +Comment[ko]=현재 사용 중인 작업 공간을 제거합니다 +Comment[zh_CN]=移除当前活跃的工作区 +Comment[pl]=Usuń obecnie aktywną przestrzeń roboczą +Comment[vi]=Bỏ vùng làm việc hiện hoạt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/92_show-expo.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/92_show-expo.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/92_show-expo.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/92_show-expo.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,95 @@ +[Nemo Action] + +Name=Manage workspaces (Expo) + +Comment=Open Expo to add, remove, or organize workspaces + +Exec=sh -c 'dbus-send --dest=org.Cinnamon --print-reply /org/Cinnamon org.Cinnamon.ShowExpo >/dev/null' + +Selection=None + +Extensions=any; + +Conditions=desktop;dbus org.Cinnamon; + +Active=false + +Name[zh_HK]=管理工作區 (Expo) +Name[pt]=Gerir áreas de trabalho (Expo) +Name[ro]=Gestionează spațiile de lucru (Expo) +Name[cy]=Rheoli mannau gwaith (Expo) +Name[ru]=Менеджер рабочих мест (Expo) +Name[ms]=Mengurus kawasan kerja (Expo) +Name[da]=Håndtér arbejdsområder (oversigt) +Name[is]=Sýsla með vinnusvæði (Expo) +Name[hr]=Upravljanje radnim prostorima (Prikaz radnih prostora) +Name[tr]=Çalışma alanlarını yönet (Sergi-Expo) +Name[uk]=Керування робочими просторами (Expo) +Name[sk]=Spravovať plochy (Expo) +Name[fi]=Hallitse työtiloja (Expo) +Name[ca]=Gestionar espais de treball (Expo) +Name[el]=Διαχείριση χώρων εργασίας (Expo) +Name[cs]=Spravovat pracovní plochy (Expo) +Name[sv]=Hantera arbetsytor (Expo) +Name[ia]=Administrar le spatios de labor (Expo) +Name[ja]=ワークスペースの管理 (Expo) +Name[th]=จัดการพื้นที่ทำงาน (Expo) +Name[nl]=Werkbladen beheren (Expo) +Name[en_GB]=Manage workspaces (Expo) +Name[gl]=Administrar os espazos de traballo (Expo) +Name[it]=Gestisci spazi di lavoro (Expo) +Name[pt_BR]=Gerenciar espaços de trabalho (Expo) +Name[es]=Gestionar espacios de trabajo (Expo) +Name[eu]=Kudeatu laneko areak (Expo) +Name[gd]=Rianaich rumannan-obrach (Expo) +Name[lt]=Tvarkyti darbo sritis (Expo) +Name[zh_TW]=工作區管理 (Expo) +Name[sr]=Управљај радним просторима (експо) +Name[fr]=Gérer les espaces de travail (Expo) +Name[am]=የ ስራ ቦታ አስተዳዳሪ (Expo) +Name[hu]=Munkaterületek kezelése (Közszemle) +Name[bg]=Управление на работни места (Експо) +Name[de]=Arbeitsflächenübersicht +Name[ko]=작업 공간 관리 (Expo) +Name[zh_CN]=管理工作区（即Expo模式） +Name[pl]=Zarządzaj przestrzeniami roboczymi (Expo) +Name[ta]=பணிதளங்களை நிர்வகி +Name[vi]=Quản lý vùng làm việc (Expo) +Comment[zh_HK]=開啟 Expo 以新增、移除或組織工作區 +Comment[pt]=Abrir Expo para adicionar, remover ou organizar áreas de trabalho +Comment[ro]=Deschide Expo pentru a adăuga, a șterge sau pentru a organiza spațiile de lucru +Comment[cy]=Agor Expo i ychwanegu, dileu, neu drefnu'r gweithleoedd +Comment[ru]=Открыть Expo для добавления, удаления и организации рабочих мест +Comment[ms]=Buka Expo ke tambah, hapus, atau uruskan kawasan kerja +Comment[da]=Åbn visning af arbejdsområder for at tilføje, fjerne eller organisere arbejdsområder +Comment[is]=Opna Expo til að bæta við, fjarlægja eða skipuleggja vinnusvæði +Comment[hr]=Otvorite prikaz radnih postora za dodavanje, uklanjanje ili organizaciju radnih prostora +Comment[tr]=Çalışma alanları eklemek, silmek ya da organize etmek için Sergi görünümünü aç +Comment[uk]=Відкрити Expo для керування робочими просторами +Comment[sk]=Otvoriť Expo pre pridávanie, odstraňovanie a organizovanie pracovných plôch +Comment[fi]=Avaa Expo lisätäksesi, poistaaksesi tai järjestääksesi työtiloja +Comment[ca]=Obre Expo per afegir, treure o organitzar espais de treball +Comment[el]=Άνοιγμα Expo για προσθήκη, κατάργηση ή οργάνωση των χώρων εργασίας +Comment[cs]=Otevřít Expo k přidání, odstranění nebo organizaci pracovních ploch +Comment[sv]=Öppna Expo för att lägga till, ta bort, eller ordna arbetsytor +Comment[ia]=Aperir Expo pro adder, remover, o organisar le spatios de labor +Comment[ja]=ワークスペースを管理するために Expo を開く +Comment[th]=เปิด Expo เพื่อเพิ่ม ลบ หรือจัดระเบียบพื้นที่ทำงาน +Comment[nl]=Open Expo om werkbladen toe te voegen, te verwijderen of te organiseren +Comment[en_GB]=Open Expo to add, remove, or organise workspaces +Comment[gl]=Abrir Expo para engadir, retirar ou organizar espazos de traballo +Comment[it]=Apri Expo per aggiungere, togliere o organizzare gli spazi di lavoro +Comment[pt_BR]=Abrir Expo para adicionar, remover ou organizar espaços de trabalho +Comment[es]=Abrir Expo para añadir, quitar u organizar espacios de trabajo +Comment[eu]=Ireki Expo laneko areak gehitu, kendu edo antolatzeko +Comment[gd]=Fosgail Expo gus rumannan-obrach a chur ris, a thoirt air falbh no a rianachadh +Comment[zh_TW]=開啟工作區管理 (Expo) 以加入，移除，或組織工作區 +Comment[sr]=Отворите експо да додате, уклоните или уредите радне просторе +Comment[fr]=Ouvrir Expo pour gérer les espaces de travail +Comment[hu]=Közszemle megnyitása a munkaterületek hozzáadásához, eltávolításához és kezeléséhez +Comment[bg]=Отваряне на Експо за добавяне, премахване или организиране на работните места +Comment[de]=Arbeitsflächenübersicht öffnen, um Arbeitsflächen hinzuzufügen, zu entfernen oder zu organisieren +Comment[ko]=작업 공간의 추가, 제거, 또는 구성을 위해 Expo 열기 +Comment[zh_CN]=打开 Expo 以添加，移除或整理工作区 +Comment[pl]=Otwórz Expo, aby dodawać, usuwać i organizować przestrzenie robocze +Comment[vi]=Mở Expo để thêm, bỏ, quản lý vùng làm việc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/add-desklets.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/add-desklets.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/add-desklets.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/add-desklets.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,106 @@ +[Nemo Action] + +Name=Add Desklets + +Comment=Add Cinamon desklets + +Exec=cinnamon-settings desklets + +Selection=None + +Extensions=any; + +Icon-Name=cs-desklets + +Dependencies=cinnamon-settings; + +Conditions=desktop;dbus org.Cinnamon; +Name[zh_HK]=新增桌面小工具 +Name[pt]=Adicionar Mini-Aplicações +Name[ro]=Adaugă deskleturi +Name[sl]=Dodaj aplete namizja +Name[cy]=Ychwanegu Desgynau +Name[nb]=Legg til skrivebordsprogrammer +Name[ru]=Добавить десклеты +Name[ms]=Tambah Desklet +Name[ga]=Cuir le Deiscíní +Name[da]=Tilføj skrivebordsprogrammer +Name[is]=Bæta við skjáborðsgræjum (desklets) +Name[en_AU]=Add Desklets +Name[hr]=Dodaj desklete +Name[be]=Дадаць дэсклеты +Name[tr]=Masaüstü Uygulamacıkları Ekle +Name[uk]=Додати десклети +Name[sk]=Pridať Desklet +Name[fi]=Lisää työpöytäsovelmia +Name[tg]=Илова кардани барномаҳои мизи корӣ +Name[ca]=Afegir Desklets +Name[el]=Προσθήκη εφαρμογών οθόνης +Name[he]=Add Desklets +Name[cs]=Přidej Desklet +Name[sv]=Lägg till skrivbordsprogram +Name[ia]=Adder desklets +Name[ja]=デスクレットを追加 +Name[af]=Voeg Desklets By +Name[th]=เพิ่มเดสก์เล็ต +Name[nl]=Minitoepassingen toevoegen +Name[id]=Tambah Desklet +Name[en_GB]=Add Desklets +Name[et]=Lisa Desklet +Name[gl]=Engadir trebellos +Name[it]=Aggiungi Desklet +Name[bs]=Dodaj Desklet-e +Name[pt_BR]=Adicionar Desklets +Name[es]=Añadir Desklets +Name[eu]=Gehitu desklet-ak +Name[gd]=Cuir desktlets ris +Name[lt]=Pridėti ekrano programėlių +Name[zh_TW]=加入桌面小程式 +Name[sr]=Додај справице +Name[fr]=Ajouter des desklets +Name[am]=ዴስክሌትስ መጨመሪያ +Name[jv]=Kabeh Desklet +Name[hu]=Asztalkalmazások hozzáadása +Name[bn]=ডেস্কলেট যুক্ত করুন +Name[bg]=Добавяне на десклети +Name[de]=Desklets hinzufügen +Name[ko]=데스크릿 추가 +Name[zh_CN]=添加桌面小工具 +Name[pl]=Dodaj desklety +Name[vi]=Thêm Tiểu trình màn hình +Comment[zh_HK]=新增 Cinnamon 桌面小工具 +Comment[pt]=Adicionar desklets Cinnamon +Comment[ro]=Adaugă deskleturi Cinnamon +Comment[cy]=Ychwanegu desgledi Cinnamon +Comment[ru]=Добавить десклеты Cinnamon +Comment[ms]=Tambah desklet Cinamon +Comment[da]=Tilføj Cinnamon-skrivebordsprogrammer +Comment[is]=Bæta við Cinnamon skjáborðsgræjum (desklets) +Comment[hr]=Dodaj Cinnamon desklete +Comment[tr]=Cinnamon masaüstü uygulamacıkları ekle +Comment[uk]=Додати десклети Cinnamon +Comment[sk]=Pridať desklety prostredia Cinnamon +Comment[fi]=Lisää Cinnamon työpöytäsovelmia +Comment[ca]=Afegeix desklets de Cinnamon +Comment[el]=Προσθήκη μικροεφαρμογής στην επιφάνεια εργασίας +Comment[cs]=Přidat Cinnamon desklety +Comment[sv]=Lägg till Cinnamon skrivbordsprogram +Comment[ia]=Adder le desklets de Cinamon +Comment[ja]=Cinnamonデスクレットを追加 +Comment[th]=เพิ่มเดสก์เล็ต Cinnamon +Comment[nl]=Minitoepassingen toevoegen aan Cinnamon +Comment[en_GB]=Add Cinamon desklets +Comment[it]=Aggiungi desklets di Cinnamon +Comment[pt_BR]=Adicionar desklets do Cinnamon +Comment[es]=Añadir desklets de Cinnamon +Comment[eu]=Gehitu Cinnamon desklet-ak +Comment[zh_TW]=加入 Cinamon 桌面小程式 +Comment[sr]=Додајте Циметове справице на радну површ +Comment[fr]=Ajouter des desklets Cinnamon +Comment[hu]=Cinnamon Asztalkalmazások hozzáadása +Comment[bg]=Добави десклети на Cinnamon +Comment[de]=Cinamon-Desklets hinzufügen +Comment[ko]=시나몬 데스크릿 더하기 +Comment[zh_CN]=添加 Cinamon 桌面小工具 +Comment[pl]=Dodaj desklety Cinnamon +Comment[vi]=Thêm tiểu dụng màn hình Cinnamon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/change-background.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/change-background.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/change-background.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/change-background.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,117 @@ +[Nemo Action] + +Name=Change Desktop _Background + +Comment=Change the Cinnamon desktop background + +Exec=cinnamon-settings backgrounds + +Selection=None + +Icon-Name=cs-backgrounds + +Extensions=any; + +Dependencies=cinnamon-settings; + +Conditions=desktop;dbus org.Cinnamon; + +Name[zh_HK]=變更桌面背景(_B) +Name[pt]=Alterar _fundo da área de trabalho +Name[ro]=Schim_bă imaginea de fundal +Name[sl]=Spremeni _ozadje namizja +Name[cy]=Newid Cefndir y _Bwrdd Gwaith +Name[ast]=Camudar el fon_du d'escritoriu +Name[nb]=Endre skrivebords_bakgrunn +Name[ru]=Изменить _фон рабочего стола +Name[ms]=Tukar Latar _Belakang Desktop +Name[ga]=Athraigh Cúlra_na Deisce +Name[da]=Skift skrive_bordsbaggrund +Name[is]=Breyta _bakgrunni skjáborðs +Name[en_AU]=Change Desktop _Background +Name[hr]=Promijeni pozadinu _radne površine +Name[be]=Змяніць _фон працоўнага стала +Name[tr]=Masaüstü _Arkaplanını Değiştir +Name[uk]=Змінити т_ло стільниці +Name[sk]=Zmeniť _pozadie plochy +Name[fi]=Muuta työpöydän _taustaa +Name[tg]=Тағйир додани пасзаминаи _мизи корӣ +Name[ca]=Canvia el _fons de l'escriptori +Name[el]=Αλλαγή _εικόνας επιφάνειας εργασίας +Name[sr@latin]=Iz_meni pozadinu +Name[sq]=Ndrysho _sfondin e desktopit +Name[he]=שנה את _רקע שולחן העבודה +Name[cs]=Změnit _pozadí plochy +Name[sv]=Byt skrivbordsbak_grund +Name[ia]=Cambiar le fundo (_Background) del scriptorio +Name[ja]=背景を変更 (_B) +Name[af]=Verander Werkskerm Agtergrond +Name[th]=_เปลี่ยนพื้นหลังของพื้นโต๊ะ +Name[nl]=Werk_bladachtergrond wijzigen +Name[kk]=Ф_он суретін ауыстыру +Name[id]=Ubah Latar _Belakang Desktop +Name[en_GB]=Change Desktop _Background +Name[et]=Vaheta töölaua _taust +Name[gl]=Cambiar o _fondo do escritorio +Name[ml]=ഡെസ്ക്ടോപ്പിന്റെ _പശ്ചാത്തലം മാറ്റുക +Name[it]=Ca_mbia sfondo scrivania +Name[bs]=Promijeni _pozadinu desktopa +Name[pt_BR]=Alterar plano de fundo +Name[es]=Cambiar el _fondo del escritorio +Name[eu]=Aldatu _mahaigainaren atzeko planoa +Name[gd]=Atharraich _cùlaibh an desktop +Name[lt]=Keisti darbastalio _foną +Name[zh_TW]=變更桌面背景(_B) +Name[sr]=Из_мени позадину +Name[fr]=Modifier l'arrière-plan du _bureau +Name[am]=የዴስክቶፕ _መደብ መቀየሪያ +Name[jv]=Ganti Gambar _Buri Desktop +Name[nds]=Desktop_Hintergrund ändern +Name[hu]=Asztal _hátterének módosítása +Name[bn]=ডেস্কটপের পটভূমি পরিবর্তন করুন (_B) +Name[bg]=Промяна на _фона +Name[de]=_Hintergrund des Schreibtisches ändern +Name[ko]=바탕화면 배경 바꾸기(_B) +Name[oc]=Modificar lo _rèire plan del burèu +Name[zh_CN]=更改桌面背景(_B) +Name[pl]=Zmień _tło pulpitu +Name[ta]=(_B)பணிமேடை பின்னனியை மாற்று +Name[vi]=Đổi Ảnh _nền Màn hình +Name[fr_CA]=Changer l'_arrière-plan du bureau +Comment[zh_HK]=變更 Cinnamon 桌面背景 +Comment[pt]=Mudar o fundo da área de trabalho do Cinnamon +Comment[ro]=Schimbă fundalul desktopului Cinnamon +Comment[cy]=Newid cefndir bwrdd gwaith Cinnamon +Comment[ru]=Сменить фон рабочего стола Cinnamon +Comment[ms]=Tukar latar belakang desktop Cinnamon +Comment[da]=Skift Cinnamon-skrivebordsbaggrund +Comment[is]=Breyta bakgrunni skjáborðsins +Comment[hr]=Promijeni pozadinu Cinnamon radne površine +Comment[tr]=Cinnamon masaüstü arkaplanını değiştir +Comment[uk]=Змінити фон робочого столу Cinnamon +Comment[sk]=Zmeniť pozadie pracovnej plochy prostredia Cinnamon +Comment[fi]=Muuta Cinnamon työpöydän taustaa +Comment[ca]=Canvia el fons d'escriptori de Cinnamon +Comment[el]=Αλλάξτε το φόντο της επιφάνειας εργασίας +Comment[cs]=Změnit pozadí plochy Cinnamonu +Comment[sv]=Byt bakgrundsbild på skrivbordet i Cinnamon +Comment[ia]=Cambiar le fundo del scriptorio de Cinnamon +Comment[ja]=壁紙を変更する +Comment[th]=เปลี่ยนภาพพื้นหลังเดสก์ท็อป Cinnamon +Comment[nl]=Verander de bureaubladachtergrond van Cinnamon +Comment[en_GB]=Change the Cinnamon desktop background +Comment[it]=Cambia il background del desktop Cinnamon +Comment[pt_BR]=Mude o background do Cinnamon +Comment[es]=Cambiar el fondo de escritorio de Cinnamon +Comment[eu]=Aldatu Cinnamon mahaigainaren atzeko planoa +Comment[lt]=Keisti Cinnamon darbastalio foną +Comment[zh_TW]=變更 Cinnamon 桌面背景 +Comment[sr]=Измените позадину радне површи +Comment[fr]=Changer le fond d'écran de Cinnamon +Comment[hu]=A Cinnamon asztal hátterének módosítása +Comment[bg]=Смени фона на работния плот +Comment[de]=Cinnamons Schreibtischhintergrund ändern +Comment[ko]=시나몬 데스크톱의 배경화면 바꾸기 +Comment[zh_CN]=更改 Cinnamon 桌面背景 +Comment[pl]=Zmień tło pulpitu Cinnamon +Comment[vi]=Đổi ảnh nền Cinnamon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/desktop-settings.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/desktop-settings.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/desktop-settings.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/desktop-settings.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,55 @@ +[Nemo Action] + +Name=Desktop _Settings + +Comment=Change how your desktop works + +Exec=cinnamon-settings desktop + +Selection=None + +Icon-Name=cs-desktop + +Extensions=any; + +Dependencies=cinnamon-settings; + +Conditions=desktop;dbus org.Cinnamon; + +Name[zh_HK]=桌面設定(_S) +Name[pt]=Definiçõe_s do Ambiente de Trabalho +Name[ru]=Настройка рабочего стола +Name[da]=_Skrivebordsindstillinger +Name[hr]=Postavke _radne površine +Name[tr]=Masaüstü _Ayarları +Name[uk]=Налаштування _стільниці +Name[sk]=_Nastavenia pracovnej plochy +Name[ca]=_Configuració de l'escriptori +Name[sv]=Skrivbords _Inställningar +Name[nl]=Instellingen van werkomgeving +Name[pt_BR]=Configurações_Desktop +Name[es]=_Configuración del escritorio +Name[fr]=_Paramètres de bureau +Name[hu]=Asztal _beállítások +Name[bg]=_Настройки на десктопа +Name[de]=_Schreibtischeinstellungen +Name[ko]=바탕화면 설정(_S) +Name[pl]=_Ustawienia pulpitu +Comment[pt]=Muda como o ambiente de trabalho funciona +Comment[ru]=Изменить как ваш рабочий стол +Comment[da]=Ændrer dit skrivebords virkemåde +Comment[hr]=Promijenite način rada vaše radne površine +Comment[tr]=Masaüstünüzün nasıl olacağını belirler +Comment[uk]=Змінити як Вашу стільницю +Comment[sk]=Zmení fungovanie vašej pracovnej plochy +Comment[ca]=Canvia el funcionament de l'escriptori +Comment[sv]=Ändra hur ditt skrivbord fungerar +Comment[nl]=Verander hoe uw werkomgeving werkt +Comment[pt_BR]=Alterar como funciona a sua área de trabalho +Comment[es]=Cambia el funcionamiento del escritorio +Comment[fr]=Modifier le fonctionnement de votre bureau +Comment[hu]=Asztal működésének megáltoztatása +Comment[bg]=Промени работата на десктопа +Comment[de]=Die Arbeitsweise des Schreibtischs ändern +Comment[ko]=바탕화면 작업 방식을 변경합니다 +Comment[pl]=Zmień sposób działania pulpitu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/mount-archive.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/mount-archive.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/mount-archive.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/mount-archive.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,109 @@ +[Nemo Action] + +Name=Mount archive + +Comment=Mount %f to browse its contents + +Exec=/usr/lib/gvfs/gvfsd-archive file="%U" + +Selection=s + +Mimetypes=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/zip; + +Stock-Id=gtk-directory + +Dependencies=/usr/lib/gvfs/gvfsd-archive; + +Selection=s +Name[zh_HK]=掛載壓縮檔 +Name[pt]=Montar arquivo +Name[ro]=Montează arhiva +Name[sl]=Priklopi arhiv +Name[cy]=Arosod Archif +Name[ast]=Montar archivu +Name[ru]=Подключить архив +Name[ms]=Pautkan arkib +Name[ga]=Feistigh an Cartlann +Name[da]=Montér arkiv +Name[is]=Tengja safnskrá +Name[hr]=Montiraj arhivu +Name[be]=Падключыць архіў +Name[tr]=Arşivi bağla +Name[uk]=Змонтувати архів +Name[sk]=Pripojiť archív +Name[fi]=Liitä arkisto +Name[ca]=Muntar arxiu +Name[el]=Αρχείο προσάρτησης +Name[he]=עגן ארכיון +Name[cs]=Připojit archiv +Name[sv]=Montera arkiv +Name[ia]=Montar le archivo +Name[th]=เมานท์แฟ้มจัดเก็บ +Name[nl]=Archiefbestand aankoppelen +Name[id]=Pasang archive +Name[en_GB]=Mount archive +Name[et]=Haagi arhiiv +Name[gl]=Montar o ficheiro +Name[it]=Monta l'archivio +Name[bs]=Montiraj arhivu +Name[pt_BR]=Montar arquivo +Name[es]=Montar archivo +Name[eu]=Muntatu fitxategia +Name[gd]=Munntaich tasglann +Name[lt]=Prijungti archyvą +Name[zh_TW]=掛載壓縮檔 +Name[sr]=Прикачи архиву +Name[fr]=Monter l'archive +Name[hu]=Archívum csatolása +Name[bg]=Монтиране на архив +Name[de]=Archive einhängen +Name[ko]=마운트 기록 +Name[zh_CN]=挂载档案 +Name[pl]=Zamontuj archiwum +Name[vi]=Gắn kết bộ lưu trữ +Comment[zh_HK]=掛載 %f 以瀏覽其內容 +Comment[pt]=Montar %f para navegar no seu conteúdo +Comment[ro]=Montează %f pentru a-i răsfoi conținutul +Comment[sl]=Priklopi %f za brskanje po vsebini +Comment[cy]=Arosod %f i bori ei gynnwys +Comment[ast]=Montar %f pa restolar el so conteníu +Comment[ru]=Подключить %f для просмотра +Comment[ms]=Pautkan %f untuk layari kandungan +Comment[ga]=Feistigh %f chun féachaint ar inneachar +Comment[da]=Montér %f for at gennemse indholdet +Comment[is]=Tengja %f til að skoða innihald hennar +Comment[hr]=Montiraj %f za pregled sadržaja +Comment[be]=Падключыць %f, чтобы просмотреть его содержимое +Comment[tr]=İçeriğini açmak için %f öğesini bağla +Comment[uk]=Змонтувати %f щоб переглядати вміст +Comment[sk]=Pripojiť %f pre prehliadnutie jeho obsahu +Comment[fi]=Liitä %f selataksesi sen sisältöä +Comment[ca]=Muntar %f per examinar-ne el contingut +Comment[el]=Προσαρτήστε το %f για να περιηγηθείτε στα περιεχόμενά του +Comment[he]=עגן את %f לעיון בתוכנו +Comment[cs]=Připojit %f k prohlížení jeho obsahu +Comment[sv]=Montera %f för att se dess innehåll +Comment[ia]=Montar %f pro explorar su contento +Comment[th]=เมานท์ %f เพื่อเรียกดูเนื้อหาของมัน +Comment[nl]=Koppel %f aan om zijn inhoud te verkennen +Comment[id]=Pasang %f untuk menelusuri isinya +Comment[en_GB]=Mount %f to browse its contents +Comment[et]=%f haakimine sisu sirvimiseks +Comment[gl]=Montar %f para examinar o seu contido +Comment[it]=Monta %f per sfogliarne i contenuti +Comment[bs]=Montirajte %f da pregledate njen sadržaj +Comment[pt_BR]=Montar %f para navegar em seu conteúdo +Comment[es]=Montar %f para examinar su contenido +Comment[eu]=Muntatu %f bere edukiak arakatzeko +Comment[gd]=Munntaich %f gus an susbaint aice a bhrabhsadh +Comment[lt]=Prijungti %f naršyti po jo turinį +Comment[zh_TW]=掛載 %f 以瀏覽其內容 +Comment[sr]=Прикачите „%f“ да бисте видели садржај +Comment[fr]=Monter %f pour parcourir son contenu +Comment[hu]=„%f” archívum csatolása a tartalom böngészéséhez +Comment[bg]=Монтиране на %f за преглед на съдържанието +Comment[de]=%f einhängen, um den Inhalt zu durchsuchen +Comment[ko]=내용을 보기위해 %f를 마운트 합니다 +Comment[zh_CN]=挂载 %f 以浏览其内容 +Comment[pl]=Zamontuj %f, aby móc przeglądać jego zawartość +Comment[vi]=Gắn kết %f để duyệt xem nội dung diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/new-launcher.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/new-launcher.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/new-launcher.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/new-launcher.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,113 @@ +[Nemo Action] + +Name=Create a new l_auncher here... + +Comment=Create a new launcher in this folder + +Exec=cinnamon-desktop-editor -mnemo-launcher -d"%P" + +Selection=None + +Stock-Id=gtk-add + +Extensions=any; + +Dependencies=cinnamon-desktop-editor; + +Conditions=desktop; + +Name[zh_HK]=在此建立新啟動器(_A)... +Name[pt]=Criar um novo L_ançador aqui... +Name[ro]=Creează un l_ansator nou aici... +Name[sl]=Ustvari nov z_aganjalnik tukaj ... +Name[cy]=Creu C_ychwynnydd yma... +Name[ast]=Crear un ll_anzador nuevu equí... +Name[ru]=Создать к_нопку запуска здесь... +Name[ms]=Cipta pe_lancar baru disini... +Name[da]=Opret en ny _programstarter her... +Name[is]=Búa til nýjan _forritaræsi hér... +Name[hr]=Stvori novi p_okretač ovdje... +Name[be]=Стварыць новы стартар тут... +Name[tr]=Burada yeni bir b_aşlatıcı oluştur... +Name[uk]=Створити нового пускача тут... +Name[sk]=Vytvoriť sem nový spúšťač +Name[fi]=Luo uusi k_äynnistin... +Name[tg]=Эҷод кардани о_ғозкунандаи нав дар ин ҷо... +Name[ca]=Crear un nou l_lançador aquí ... +Name[el]=Δημιουργία ενός νέου ε_κκινητή εδώ... +Name[he]=יצירת מ_שגר חדש כאן.. +Name[cs]=Vytvořit zde nový s_pouštěč... +Name[sv]=Skapa en ny l_auncher här... +Name[ia]=Crear un nove l_anceator ci... +Name[ja]=新しいランチャをここに作成 (_A) ... +Name[th]=_สร้างลอนเชอร์ใหม่ที่นี่... +Name[nl]=Maak hier een nieuwe starter... +Name[id]=Buat sebuah pel_uncur disini... +Name[en_GB]=Create a new l_auncher here... +Name[et]=Uue käivitaja _loomine... +Name[gl]=Crear aquí un novo _iniciador +Name[it]=Crea un nuovo l_anciatore qui ... +Name[bs]=Napravi novi p_okretač ovdje... +Name[pt_BR]=Criar novo l_ançador aqui... +Name[es]=Crear un nuevo l_anzador aquí ... +Name[eu]=Sortu _abiarazle berri bat hemen... +Name[gd]=Cruthaich lòinsear ùr an-seo... +Name[lt]=Sukurti čia n_aują leistuką +Name[zh_TW]=在此建立新啟動器(_A)... +Name[sr]=Овде направи нови _покретач... +Name[fr]=Créer un nouveau l_anceur +Name[am]=አዲስ ማ_ስነሻ እዚህ መፍጠሪያ... +Name[hu]=In_dító létrehozása… +Name[bg]=Създаване на нов с_тартер тук... +Name[de]=Neuen _Starter hier erstellen … +Name[ko]=여기에 새 런처 만들기(_A)... +Name[zh_CN]=在此创建一个新的启动器... +Name[pl]=Utwórz nowy _aktywator tutaj... +Name[vi]=Tạo trình _khởi chạy mới ở đây... +Comment[zh_HK]=在此資料夾裏建立新啟動器 +Comment[pt]=Criar um novo Lançador neste directório +Comment[ro]=Creează un lansator nou în acest dosar +Comment[sl]=Ustvari nov zaganjalnik v tej mapi +Comment[cy]=Creu cychwynydd newydd yn y ffolder +Comment[ast]=Crea un llanzador nuevu nesta carpeta +Comment[ru]=Создать _кнопку запуска в текущей папке +Comment[ms]=Cipta pelancar baru dalam folder ini +Comment[da]=Opret en ny programstarter i denne mappe +Comment[is]=Búa til nýjan forritaræsi í þessari möppu +Comment[hr]=Stvori novi pokretač u ovoj mapi +Comment[be]=Стварыць новы стартар у гэтай папцы +Comment[tr]=Bu dizin içinde yeni bir başlatıcı oluştur +Comment[uk]=Створити нового пускача у цій теці +Comment[sk]=Vytvoriť nový spúšťač do tohto priečinka +Comment[fi]=Luo uusi käynnistin tähän kansioon +Comment[tg]=Эҷод кардани оғозкунандаи нав дар ин ҷузвдон +Comment[ca]=Crear un nou llançador en aquesta carpeta +Comment[el]=Δημιουργία ενός νέου εκκινητή σε αυτό το φάκελο +Comment[he]=יצירת משגר חדש בתיקייה זו +Comment[cs]=Vytvoří nový spouštěč v této složce +Comment[sv]=Skapa en ny programstartare i denna mapp +Comment[ia]=Crear un nove lanceator in ce plica +Comment[ja]=新しいランチャをこのフォルダに作成 +Comment[th]=สร้างลอนเชอร์ใหม่ในโฟลเดอร์นี้ +Comment[nl]=Maak een nieuwe starter in deze map +Comment[id]=Buat sebuah peluncur baru didalam folder ini +Comment[en_GB]=Create a new launcher in this folder +Comment[et]=Sellesse kausta uue käivitaja loomine +Comment[gl]=Crear un novo iniciador neste cartafol +Comment[it]=Crea un nuovo lanciatore in questa cartella +Comment[bs]=Napravi novi p_okretač u ovom direktoriju +Comment[pt_BR]=Criar um novo lançador nesta pasta +Comment[es]=Crear un nuevo lanzador en esta carpeta +Comment[eu]=Sortu abiarazle berri bat karpeta honetan +Comment[gd]=Cruthaich lòinsear ùr anns a' phasgan seo +Comment[lt]=Sukurti šiame aplanke naują leistuką +Comment[zh_TW]=在此資料夾建立新啟動器 +Comment[sr]=Направи нови покретач у овој фасцикли +Comment[fr]=Créer un nouveau lanceur dans ce dossier +Comment[hu]=Új indító létrehozása ebben a mappában +Comment[bg]=Създаване на нов стартер в тази папка +Comment[de]=Einen neuen Starter in diesem Ordner erstellen +Comment[ko]=이 폴더에 새 런처 만들기 +Comment[zh_CN]=在此文件夹中创建一个新的启动器 +Comment[pl]=Utwórz nowy aktywator w tym katalogu +Comment[vi]=Tạo trình khởi chạy mới trong thư mục này diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/files/usr/share/nemo/actions/set-as-background.nemo_action new/nemo-3.0.6/files/usr/share/nemo/actions/set-as-background.nemo_action --- old/nemo-3.0.5/files/usr/share/nemo/actions/set-as-background.nemo_action 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/files/usr/share/nemo/actions/set-as-background.nemo_action 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,102 @@ +[Nemo Action] + +Name=Set as Wallpaper... + +Comment=Set the selected image as your Cinnamon desktop wallpaper + +Exec=gsettings set org.cinnamon.desktop.background picture-uri "%U" + +Selection=s + +Mimetypes=image/*; + +Conditions=dbus org.Cinnamon; +Name[zh_HK]=設為桌布... +Name[pt]=Definir como fundo do Ambiente de Trabalho +Name[ro]=Setează ca imagine de fundal... +Name[sl]=Nastavi kot sliko ozadja ... +Name[cy]=Gosod fel Papur Wal... +Name[ast]=Afitar como fondu pantalla... +Name[nb]=Sett som bakgrunn... +Name[ru]=Сделать фоном... +Name[ms]=Tetapkan sebagai Kertas Dinding... +Name[ga]=Socraigh mar Cúlra na Deisce +Name[da]=Anvend som baggrund +Name[is]=Gera að veggfóðri... +Name[hr]=Postavi kao pozadinu... +Name[be]=Ўсталяваць у якасці фонавага малюнка... +Name[tr]=Duvarkağıdı olarak ayarla... +Name[uk]=Встановити як тло... +Name[sk]=Nastaviť ako tapeta... +Name[fi]=Aseta taustakuvaksi... +Name[tg]=Танзим кардан ҳамчун тасвири экран... +Name[ca]=Defineix com a fons de pantalla +Name[el]=Ορισμός ως Ταπετσαρίας... +Name[sr@latin]=Postavi kao pozadinu... +Name[he]=הגדרה כרקע... +Name[cs]=Nastavit jako pozadí plochy... +Name[sv]=Ange som skrivbordsbakgrund... +Name[ia]=Fixar como tapete de papiro... +Name[ja]=壁紙に設定... +Name[th]=ตั้งเป็นภาพพื้นหลัง... +Name[nl]=Gebruik als bureaubladachtergrond... +Name[id]=Pasang sebagai Wallpaper... +Name[en_GB]=Set as Wallpaper... +Name[et]=Määra taustapildiks... +Name[gl]=Estabelecer como fondo de pantalla +Name[ml]=പശ്ചാത്തലചിത്രമായി സജ്ജീകരിക്കുക... +Name[it]=Imposta come sfondo... +Name[bs]=Postavi kao pozadinu... +Name[pt_BR]=Definir como papel de parede +Name[es]=Establecer como papel tapiz... +Name[eu]=Ezarri atzeko plano gisa... +Name[gd]=Suidhich mar phàipear-balla... +Name[lt]=Nustatyti kaip darbastalio foną +Name[zh_TW]=設為桌布... +Name[sr]=Постави као позадину... +Name[fr]=Définir en tant que fond d'écran... +Name[am]=እንደ ግድግዳ ወረቀት ማሰናጃ... +Name[hu]=Beállítás háttérképként… +Name[bg]=Задаване като тапет... +Name[de]=Als Hintergrund festlegen … +Name[ko]=배경화면으로 설정하기... +Name[zh_CN]=设置为壁纸... +Name[pl]=Ustaw jako tło pulpitu... +Name[vi]=Đặt làm Hình nền... +Comment[zh_HK]=將選擇的影像設為你的 Cinnamon 桌面桌布 +Comment[pt]=Definir a imagem seleccionada como o fundo da área de trabalho do Cinnamon +Comment[ro]=Setează imaginea selectată ca imagine de fundal pentru desktopul Cinnamon +Comment[cy]=Gosod y ddelwedd hon fel eich papur wall bwrdd gwaith Cinnamon +Comment[ru]=Установить выбранное изображение фоном рабочего стола Cinnamon +Comment[ms]=Set imej dipilih sebagai wallpaper desktop Cinnamon +Comment[da]=Anvend det markerede billede som din Cinnamon-skrivebordsbaggrund +Comment[is]=Setja valda mynd sem bakgrunnsmynd skjáborðs +Comment[hr]=Postavi odabranu sliku kao svoju pozadinu Cinnamon radne površine +Comment[tr]=Seçilen görüntüyü Cinnamon masaüstü duvarkağıdı olarak ayarla +Comment[uk]=Встановити вибране зображення в якості шпалер робочого столу Cinnamon +Comment[sk]=Nastaviť vybratý obrázok ako pozadie vašej pracovnej plochy prostredia Cinnamon +Comment[fi]=Aseta valittu kuva Cinnamon työpöytäsi taustakuvaksi +Comment[ca]=Estableix la imatge seleccionada com a fons d'escriptori de Cinnamon +Comment[el]=Ορίστε την επιλεγμένη εικόνα ως ταπετσαρία της επιφάνειας εργασίας σας +Comment[cs]=Nastavit vybraný obrázek jako pozadí plochy v Cinnamonu +Comment[sv]=Ange den valda bilden som bakgrundsbild för skrivbordet i Cinnamon +Comment[ia]=Configurar le imagine seligite imagine como tapete de papiro de tu scriptorio Cinnamon +Comment[ja]=選択した画像を壁紙に設定 +Comment[th]=ตั้งรูปที่เลือกเป็นภาพพื้นหลังเดสก์ท็อป Cinnamon ของคุณ +Comment[nl]=Stel de geselecteerde afbeelding in als uw bureaubladachtergrond voor Cinnamon +Comment[en_GB]=Set the selected image as your Cinnamon desktop wallpaper +Comment[it]=Imposta l'immagine selezionata come tuo wallpaper del desktop Cinnamon +Comment[pt_BR]=Escolher a imagem selecionada como seu papel de parede no desktop Cinnamon +Comment[es]=Establecer la imagen seleccionada como fondo de escritorio de Cinnamon +Comment[eu]=Ezarri hautatutako irudia zure Cinnamon mahaigaineko horma-paper bezala +Comment[lt]=Nustatyti pasirinktą paveikslą kaip jūsų Cinnamon darbalaukio foną +Comment[zh_TW]=將選擇的影像設為您 Cinnamon 桌面的桌布 +Comment[sr]=Поставите изабрану слику за позадину радне површи +Comment[fr]=Utiliser l'image sélectionnée comme fond d'écran de Cinnamon +Comment[hu]=A kiválasztott kép beállítása Cinnamon asztal háttérképként +Comment[bg]=Задай избраното изображение като тапет за Cinnamon +Comment[de]=Ausgewähltes Bild als Cinnamons Schreibtischhintergrund einstellen +Comment[ko]=선택한 이미지를 시나몬 데스크톱의 배경화면으로 사용하기 +Comment[zh_CN]=将选中的图片设为您的 Cinnamon 桌面壁纸 +Comment[pl]=Ustaw wybrany obraz jako Twoje tło pulpitu Cinnamon +Comment[vi]=Đặt ảnh được chọn làm màn hình nền Cinnamon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/generate_additional_file new/nemo-3.0.6/generate_additional_file --- old/nemo-3.0.5/generate_additional_file 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.6/generate_additional_file 2016-06-23 14:33:15.000000000 +0200 @@ -0,0 +1,6 @@ +#!/usr/bin/python3 + +import os + +os.chdir("data") +os.system("./merge_action_strings") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/libnemo-private/nemo-desktop-utils.c new/nemo-3.0.6/libnemo-private/nemo-desktop-utils.c --- old/nemo-3.0.5/libnemo-private/nemo-desktop-utils.c 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/libnemo-private/nemo-desktop-utils.c 2016-06-23 14:33:15.000000000 +0200 @@ -49,6 +49,9 @@ GdkWindow *window = gtk_widget_get_window (widget); + if (window == NULL) + return 0; + gint monitor = gdk_screen_get_monitor_at_window (default_screen, window); return monitor; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/libnemo-private/nemo-global-preferences.h new/nemo-3.0.6/libnemo-private/nemo-global-preferences.h --- old/nemo-3.0.5/libnemo-private/nemo-global-preferences.h 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/libnemo-private/nemo-global-preferences.h 2016-06-23 14:33:15.000000000 +0200 @@ -167,6 +167,7 @@ #define NEMO_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL "default-zoom-level" #define NEMO_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS "default-visible-columns" #define NEMO_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER "default-column-order" +#define NEMO_PREFERENCES_LIST_VIEW_SEARCH_VISIBLE_COLUMNS "search-visible-columns" enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/libnemo-private/org.nemo.gschema.xml.in new/nemo-3.0.6/libnemo-private/org.nemo.gschema.xml.in --- old/nemo-3.0.5/libnemo-private/org.nemo.gschema.xml.in 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/libnemo-private/org.nemo.gschema.xml.in 2016-06-23 14:33:15.000000000 +0200 @@ -450,6 +450,11 @@ <_summary>Default column order in the list view</_summary> <_description>Default column order in the list view.</_description> </key> + <key name="search-visible-columns" type="as"> + <default>[ 'name', 'size', 'type', 'where' ]</default> + <_summary>Default list of columns visible in the search view.</_summary> + <_description>Default list of columns visible in the search view.</_description> + </key> </schema> <schema id="org.nemo.sidebar-panels" path="/org/nemo/sidebar-panels/" gettext-domain="nemo"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/src/nemo-application.c new/nemo-3.0.6/src/nemo-application.c --- old/nemo-3.0.5/src/nemo-application.c 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/src/nemo-application.c 2016-06-23 14:33:15.000000000 +0200 @@ -598,8 +598,6 @@ g_clear_object (&application->priv->dbus_manager); g_clear_object (&application->priv->fdb_manager); - g_clear_object (&application->priv->desktop_manager); - notify_uninit (); G_OBJECT_CLASS (nemo_application_parent_class)->finalize (object); @@ -661,6 +659,9 @@ nemo_application_quit (NemoApplication *self) { GApplication *app = G_APPLICATION (self); + + g_clear_object (&self->priv->desktop_manager); + GList *windows; windows = gtk_application_get_windows (GTK_APPLICATION (app)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/src/nemo-desktop-icon-view.c new/nemo-3.0.6/src/nemo-desktop-icon-view.c --- old/nemo-3.0.5/src/nemo-desktop-icon-view.c 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/src/nemo-desktop-icon-view.c 2016-06-23 14:33:15.000000000 +0200 @@ -127,7 +127,7 @@ g_signal_handlers_disconnect_by_func (nemo_icon_view_preferences, default_zoom_level_changed, icon_view); - g_signal_handlers_disconnect_by_func (nemo_preferences, + g_signal_handlers_disconnect_by_func (nemo_desktop_preferences, font_changed_callback, icon_view); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/src/nemo-desktop-manager.c new/nemo-3.0.6/src/nemo-desktop-manager.c --- old/nemo-3.0.5/src/nemo-desktop-manager.c 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/src/nemo-desktop-manager.c 2016-06-23 14:33:15.000000000 +0200 @@ -253,8 +253,8 @@ g_signal_handler_disconnect (nemo_desktop_preferences, manager->show_desktop_changed_id); g_signal_handler_disconnect (nemo_desktop_preferences, manager->desktop_layout_changed_id); g_signal_handler_disconnect (manager->screen, manager->size_changed_id); - g_signal_handler_disconnect (manager->screen, manager->home_dir_changed_id); - g_signal_handler_disconnect (manager->screen, manager->orphaned_icon_handling_id); + g_signal_handler_disconnect (nemo_preferences, manager->home_dir_changed_id); + g_signal_handler_disconnect (nemo_preferences, manager->orphaned_icon_handling_id); remove_workarea_filter (manager); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/src/nemo-list-view.c new/nemo-3.0.6/src/nemo-list-view.c --- old/nemo-3.0.5/src/nemo-list-view.c 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/src/nemo-list-view.c 2016-06-23 14:33:15.000000000 +0200 @@ -97,7 +97,7 @@ gboolean row_selected_on_button_down; gboolean menus_ready; gboolean active; - + GHashTable *columns; GtkWidget *column_editor; @@ -169,14 +169,6 @@ G_DEFINE_TYPE (NemoListView, nemo_list_view, NEMO_TYPE_VIEW); -static const char * default_search_visible_columns[] = { - "name", "size", "type", "where", NULL -}; - -static const char * default_search_columns_order[] = { - "name", "size", "type", "where", NULL -}; - static const char * default_trash_visible_columns[] = { "name", "size", "type", "trashed_on", "trash_orig_path", NULL }; @@ -193,6 +185,26 @@ "name", "size", "type", "date_accessed", NULL }; +static gchar ** +string_array_from_string_glist (GList *list) +{ + GPtrArray *res; + GList *l; + gchar **ret; + + res = g_ptr_array_new (); + + for (l = list; l != NULL; l = l->next) { + g_ptr_array_add (res, g_strdup (l->data)); + } + + g_ptr_array_add (res, NULL); + + ret = (char **) g_ptr_array_free (res, FALSE); + + return ret; +} + static const gchar* get_default_sort_order (NemoFile *file, gboolean *reversed) { @@ -732,8 +744,8 @@ columns_reordered_callback (AtkObject *atk, gpointer user_data) { - NemoListView *view = NEMO_LIST_VIEW (user_data); + NemoDirectory *directory; gchar **columns; GList *vis_columns = NULL; @@ -759,14 +771,25 @@ list = g_list_prepend (list, (gchar *)l->data); } } + list = g_list_reverse (list); - if (nemo_global_preferences_get_ignore_view_metadata ()) + directory = nemo_view_get_model (NEMO_VIEW (view)); + + if (nemo_global_preferences_get_ignore_view_metadata ()) { nemo_window_set_ignore_meta_column_order (nemo_view_get_nemo_window (NEMO_VIEW (view)), list); - else + } else if (NEMO_IS_SEARCH_DIRECTORY (directory)) { + gchar **column_array = string_array_from_string_glist (list); + g_settings_set_strv (nemo_list_view_preferences, + NEMO_PREFERENCES_LIST_VIEW_SEARCH_VISIBLE_COLUMNS, + (const gchar **) column_array); + + g_strfreev (column_array); + } else { nemo_file_set_metadata_list (file, NEMO_METADATA_KEY_LIST_VIEW_COLUMN_ORDER, list); + } g_list_free_full (list, g_free); g_free (columns); g_list_free (vis_columns); @@ -1709,40 +1732,51 @@ NemoListView *list_view) { NemoFile *file; - char **visible_columns; - char **column_order; - const char *column; + NemoDirectory *directory; + char **visible_columns; + const char *menu_item_column_id; GList *list = NULL; - GList *l; + GList *l, *current_view_columns; int i; - file = nemo_view_get_directory_as_file (NEMO_VIEW (list_view)); - visible_columns = get_visible_columns (list_view); - column_order = get_column_order (list_view); - column = g_object_get_data (G_OBJECT (menu_item), "column-name"); + file = nemo_view_get_directory_as_file (NEMO_VIEW (list_view)); + menu_item_column_id = g_object_get_data (G_OBJECT (menu_item), "column-name"); - for (i = 0; visible_columns[i] != NULL; ++i) { - list = g_list_prepend (list, visible_columns[i]); - } + current_view_columns = gtk_tree_view_get_columns (list_view->details->tree_view); - if (gtk_check_menu_item_get_active (menu_item)) { - list = g_list_prepend (list, g_strdup (column)); - } else { - l = g_list_find_custom (list, column, (GCompareFunc) g_strcmp0); - list = g_list_delete_link (list, l); - } + for (l = current_view_columns; l != NULL; l = l->next) { + GtkTreeViewColumn *c = GTK_TREE_VIEW_COLUMN (l->data); + + const char *current_id = g_object_get_data (G_OBJECT (c), "column-id"); + + if (g_strcmp0 (current_id, menu_item_column_id) == 0) { + if (gtk_check_menu_item_get_active (menu_item)) { + list = g_list_prepend (list, g_strdup (current_id)); + } + } else { + if (gtk_tree_view_column_get_visible (c)) + list = g_list_prepend (list, g_strdup (current_id)); + } + } + + directory = nemo_view_get_model (NEMO_VIEW (list_view)); list = g_list_reverse (list); if (nemo_global_preferences_get_ignore_view_metadata ()) nemo_window_set_ignore_meta_visible_columns (nemo_view_get_nemo_window (NEMO_VIEW (list_view)), list); - else + else if (NEMO_IS_SEARCH_DIRECTORY (directory)) { + gchar **column_array = string_array_from_string_glist (list); + g_settings_set_strv (nemo_list_view_preferences, + NEMO_PREFERENCES_LIST_VIEW_SEARCH_VISIBLE_COLUMNS, + (const gchar **) column_array); + + g_strfreev (column_array); + } else nemo_file_set_metadata_list (file, NEMO_METADATA_KEY_LIST_VIEW_VISIBLE_COLUMNS, list); - g_free (visible_columns); - visible_columns = g_new0 (char *, g_list_length (list) + 1); for (i = 0, l = list; l != NULL; ++i, l = l->next) { visible_columns[i] = l->data; @@ -1751,10 +1785,10 @@ /* set view values ourselves, as new metadata could not have been * updated yet. */ - apply_columns_settings (list_view, column_order, visible_columns); + apply_columns_settings (list_view, visible_columns, visible_columns); g_list_free (list); - g_strfreev (column_order); + g_list_free (current_view_columns); g_strfreev (visible_columns); } @@ -1763,6 +1797,7 @@ NemoListView *list_view) { NemoFile *file; + NemoDirectory *directory; char **default_columns; char **default_order; @@ -1781,6 +1816,11 @@ nemo_file_set_metadata_list (file, NEMO_METADATA_KEY_LIST_VIEW_VISIBLE_COLUMNS, NULL); } + directory = nemo_view_get_model (NEMO_VIEW (list_view)); + + if (NEMO_IS_SEARCH_DIRECTORY (directory)) + g_settings_reset (nemo_list_view_preferences, NEMO_PREFERENCES_LIST_VIEW_SEARCH_VISIBLE_COLUMNS); + default_columns = get_default_visible_columns (list_view); default_order = get_default_column_order (list_view); @@ -1812,78 +1852,65 @@ GdkEventButton *event, NemoListView *list_view) { - NemoFile *file; - char **visible_columns; - char **column_order; - GList *all_columns; - GHashTable *visible_columns_hash; - int i; - GList *l; - GtkWidget *menu; - GtkWidget *menu_item; + GList *current_view_columns, *l; + NemoFile *file; + GtkWidget *menu; + GtkWidget *menu_item; if (event->button != GDK_BUTTON_SECONDARY) { return FALSE; } - file = nemo_view_get_directory_as_file (NEMO_VIEW (list_view)); + file = nemo_view_get_directory_as_file (NEMO_VIEW (list_view)); - visible_columns = get_visible_columns (list_view); - column_order = get_column_order (list_view); + menu = gtk_menu_new (); - all_columns = nemo_get_columns_for_file (file); - all_columns = nemo_sort_columns (all_columns, column_order); + current_view_columns = gtk_tree_view_get_columns (list_view->details->tree_view); - /* hash table to lookup if a given column should be visible */ - visible_columns_hash = g_hash_table_new_full (g_str_hash, - g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) g_free); - if (visible_columns != NULL) { - for (i = 0; visible_columns[i] != NULL; ++i) { - g_hash_table_insert (visible_columns_hash, - g_ascii_strdown (visible_columns[i], -1), - g_ascii_strdown (visible_columns[i], -1)); - } - } + for (l = current_view_columns; l != NULL; l = l->next) { + const char *name; + char *label; + char *lowercase; + gboolean visible; - menu = gtk_menu_new (); + GtkTreeViewColumn *c = GTK_TREE_VIEW_COLUMN (l->data); - for (l = all_columns; l != NULL; l = l->next) { - char *name; - char *label; - char *lowercase; + name = g_object_get_data (G_OBJECT (c), "column-id"); - g_object_get (G_OBJECT (l->data), - "name", &name, - "label", &label, - NULL); - lowercase = g_ascii_strdown (name, -1); + if (!nemo_file_is_in_trash (file)) { + if (g_strcmp0 (name, "trashed_on") == 0 || + g_strcmp0 (name, "trash_orig_path") == 0) + continue; + } - menu_item = gtk_check_menu_item_new_with_label (label); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + g_object_get (G_OBJECT (c), + "title", &label, + "visible", &visible, + NULL); - g_object_set_data_full (G_OBJECT (menu_item), - "column-name", name, g_free); + lowercase = g_ascii_strdown (name, -1); - if (g_hash_table_lookup (visible_columns_hash, lowercase) != NULL) { - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), - TRUE); - } + menu_item = gtk_check_menu_item_new_with_label (label); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + + g_object_set_data_full (G_OBJECT (menu_item), + "column-name", g_strdup (name), g_free); + + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), visible); /* Don't allow hiding the filename */ if (g_strcmp0 (lowercase, "name") == 0) { gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE); } - g_signal_connect (menu_item, - "toggled", - G_CALLBACK (column_header_menu_toggled), - list_view); + g_signal_connect (menu_item, + "toggled", + G_CALLBACK (column_header_menu_toggled), + list_view); - g_free (lowercase); - g_free (label); - } + g_clear_pointer (&lowercase, g_free); + g_clear_pointer (&label, g_free); + } menu_item = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); @@ -1916,11 +1943,6 @@ NULL, NULL, NULL, NULL, NULL, event->button, event->time); - g_hash_table_destroy (visible_columns_hash); - nemo_column_list_free (all_columns); - g_strfreev (column_order); - g_strfreev (visible_columns); - return TRUE; } @@ -2217,6 +2239,11 @@ view->details->file_name_column = gtk_tree_view_column_new (); gtk_tree_view_append_column (view->details->tree_view, view->details->file_name_column); + + g_object_set_data_full (G_OBJECT (view->details->file_name_column), + "column-id", g_strdup (name), + g_free); + view->details->file_name_column_num = column_num; g_hash_table_insert (view->details->columns, @@ -2269,16 +2296,25 @@ NULL); view->details->cells = g_list_append (view->details->cells, cell); - column = gtk_tree_view_column_new_with_attributes (label, - cell, - "text", column_num, - NULL); + column = gtk_tree_view_column_new (); + + g_object_set_data_full (G_OBJECT (column), + "column-id", g_strdup (name), + g_free); + + gtk_tree_view_column_set_title (column, label); + gtk_tree_view_column_pack_start (column, cell, TRUE); + gtk_tree_view_column_set_attributes (column, cell, + "text", column_num, + NULL); + gtk_tree_view_append_column (view->details->tree_view, column); gtk_tree_view_column_set_min_width (column, 30); gtk_tree_view_column_set_sort_column_id (column, column_num); - g_hash_table_insert (view->details->columns, - g_strdup (name), - column); + + g_hash_table_insert (view->details->columns, + g_strdup (name), + column); g_signal_connect (gtk_tree_view_column_get_button (column), "button-press-event", @@ -2349,7 +2385,7 @@ directory = nemo_view_get_model (NEMO_VIEW (list_view)); if (NEMO_IS_SEARCH_DIRECTORY (directory)) { - return g_strdupv ((gchar **) default_search_visible_columns); + return g_settings_get_strv (nemo_list_view_preferences, NEMO_PREFERENCES_LIST_VIEW_SEARCH_VISIBLE_COLUMNS); } return g_settings_get_strv (nemo_list_view_preferences, @@ -2375,17 +2411,8 @@ } if (visible_columns) { - GPtrArray *res; - GList *l; - - res = g_ptr_array_new (); - for (l = visible_columns; l != NULL; l = l->next) { - g_ptr_array_add (res, l->data); - } - g_ptr_array_add (res, NULL); - - ret = (char **) g_ptr_array_free (res, FALSE); - g_list_free (visible_columns); + ret = string_array_from_string_glist (visible_columns); + g_list_free_full (visible_columns, g_free); } if (ret != NULL) { @@ -2413,7 +2440,7 @@ directory = nemo_view_get_model (NEMO_VIEW (list_view)); if (NEMO_IS_SEARCH_DIRECTORY (directory)) { - return g_strdupv ((gchar **) default_search_columns_order); + return g_settings_get_strv (nemo_list_view_preferences, NEMO_PREFERENCES_LIST_VIEW_SEARCH_VISIBLE_COLUMNS); } return g_settings_get_strv (nemo_list_view_preferences, @@ -2438,19 +2465,10 @@ NEMO_METADATA_KEY_LIST_VIEW_COLUMN_ORDER); } - if (column_order) { - GPtrArray *res; - GList *l; - - res = g_ptr_array_new (); - for (l = column_order; l != NULL; l = l->next) { - g_ptr_array_add (res, l->data); - } - g_ptr_array_add (res, NULL); - - ret = (char **) g_ptr_array_free (res, FALSE); - g_list_free (column_order); - } + if (column_order) { + ret = string_array_from_string_glist (column_order); + g_list_free_full (column_order, g_free); + } if (ret != NULL) { return ret; @@ -3131,6 +3149,7 @@ nemo_list_view_reset_to_defaults (NemoView *view) { NemoFile *file; + NemoDirectory *directory; file = nemo_view_get_directory_as_file (view); @@ -3153,6 +3172,11 @@ nemo_file_set_metadata_list (file, NEMO_METADATA_KEY_LIST_VIEW_VISIBLE_COLUMNS, NULL); } + directory = nemo_view_get_model (view); + + if (NEMO_IS_SEARCH_DIRECTORY (directory)) + g_settings_reset (nemo_list_view_preferences, NEMO_PREFERENCES_LIST_VIEW_SEARCH_VISIBLE_COLUMNS); + char **default_columns, **default_order; default_columns = get_default_visible_columns (NEMO_LIST_VIEW (view)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.5/src/nemo-notebook.c new/nemo-3.0.6/src/nemo-notebook.c --- old/nemo-3.0.5/src/nemo-notebook.c 2016-05-31 14:59:08.000000000 +0200 +++ new/nemo-3.0.6/src/nemo-notebook.c 2016-06-23 14:33:15.000000000 +0200 @@ -51,14 +51,6 @@ static void nemo_notebook_remove (GtkContainer *container, GtkWidget *tab_widget); -#if 0 -static const GtkTargetEntry url_drag_types[] = -{ - { NEMO_ICON_DND_GNOME_ICON_LIST_TYPE, 0, NEMO_ICON_DND_GNOME_ICON_LIST }, - { NEMO_ICON_DND_URI_LIST_TYPE, 0, NEMO_ICON_DND_URI_LIST }, -}; -#endif - enum { TAB_CLOSE_REQUEST, @@ -259,19 +251,6 @@ G_CALLBACK(control_key_checker_cb), GINT_TO_POINTER (TRUE)); g_signal_connect (notebook, "key-release-event", G_CALLBACK(control_key_checker_cb), GINT_TO_POINTER (FALSE)); - - /* Set up drag-and-drop target */ - /* TODO this would be used for opening a new tab. - * It will only work properly as soon as GtkNotebook - * supports to find out whether a particular point - * is on a tab button or not. - */ -#if 0 - gtk_drag_dest_set (GTK_WIDGET (notebook), 0, - url_drag_types, G_N_ELEMENTS (url_drag_types), - GDK_ACTION_LINK); - gtk_drag_dest_set_track_motion (GTK_WIDGET (notebook), TRUE); -#endif } void
