[Pkg-xfce-commits] [Git][xfce-team/desktop/thunar][debian/master] 4 commits: New upstream version 4.16.4
Yves-Alexis Perez
gitlab at salsa.debian.org
Sun Mar 7 10:12:48 GMT 2021
Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / thunar
Commits:
999baaf3 by Yves-Alexis Perez at 2021-03-07T10:57:55+01:00
New upstream version 4.16.4
- - - - -
288776a6 by Yves-Alexis Perez at 2021-03-07T10:58:00+01:00
Update upstream source from tag 'upstream/4.16.4'
Update to upstream version '4.16.4'
with Debian dir 375e080697447774e93c3021cf9aba57fcf7c391
- - - - -
242116f4 by Yves-Alexis Perez at 2021-03-07T10:58:08+01:00
finalize changelog
- - - - -
1a8dbe75 by Yves-Alexis Perez at 2021-03-07T10:58:20+01:00
upload thunar 4.16.4-1 to unstable
- - - - -
21 changed files:
- ChangeLog
- NEWS
- configure
- configure.ac
- debian/changelog
- docs/Thunar.1
- docs/reference/thunarx/html/index.html
- docs/reference/thunarx/html/thunarx-Variables-and-functions-to-check-the-library-version.html
- docs/reference/thunarx/version.xml
- po/gl.po
- po/he.po
- po/it.po
- po/oc.po
- thunar/thunar-gtk-extensions.c
- thunar/thunar-job.c
- thunar/thunar-shortcuts-model.c
- thunar/thunar-standard-view.c
- thunar/thunar-transfer-job.c
- thunar/thunar-window.c
- thunar/thunar-window.h
- thunarx/thunarx-config.h
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,137 @@
+commit 70f75b89cbfd7f330710631998ae21902f7a10e5
+Author: Tim Oehl <oehl.tim at gmail.com>
+Date: Mon Feb 22 12:17:36 2021 +0100
+
+ Bookmarks no longer need an existing, underlying file (Issue #47)
+
+ Co-authored-by: Dito didio <ditodidio at key-idea.de>
+
+commit 4dcff28647d15ec3226e8552a88128f4764ed964
+Author: Omer I.S <omeritzicschwartz at gmail.com>
+Date: Fri Mar 5 12:46:38 2021 +0100
+
+ I18n: Update translation he (100%).
+
+ 785 translated messages.
+
+ Transifex (https://www.transifex.com/xfce/public/).
+
+commit 0404c3c2df3f09fc1c21e8e704587b0dead89cb8
+Author: Omer I.S <omeritzicschwartz at gmail.com>
+Date: Fri Mar 5 00:45:56 2021 +0100
+
+ I18n: Update translation he (100%).
+
+ 785 translated messages.
+
+ Transifex (https://www.transifex.com/xfce/public/).
+
+commit e07bb8deca25addfc0d40c352828707a86151932
+Author: Alexander Schwinn <alexxcons at xfce.org>
+Date: Thu Mar 4 22:24:14 2021 +0100
+
+ Regression: Select copied files after copy operation (Issue #520)
+
+commit c13a9190d9995ca35bf7e7cded06a21282b9ee48
+Author: Alexander Schwinn <alexxcons at xfce.org>
+Date: Sun Feb 21 00:27:13 2021 +0100
+
+ Reintroduce alternative zoom shortcuts (Issue #514)
+
+ Regression to thunar 1.8.x. Defaults for the alternative shortcuts are:
+
+ zoom-in:
+ <Primary>equal
+ <Primary>plus
+
+ zoom-out:
+ <Primary>minus
+
+ zoom-reset:
+ <Primary>0
+
+commit 1cf7782bccf378ef69fe34ebe5f8fe7089ae175e
+Author: Omer I.S <omeritzicschwartz at gmail.com>
+Date: Wed Mar 3 00:45:56 2021 +0100
+
+ I18n: Update translation he (100%).
+
+ 785 translated messages.
+
+ Transifex (https://www.transifex.com/xfce/public/).
+
+commit 584c1b96e76851c38018a3c3b22b73deea6242da
+Author: Alexander Schwinn <alexxcons at xfce.org>
+Date: Thu Feb 18 21:43:29 2021 +0100
+
+ Prevent hangup if a copy task that is blocked is resumed (Issue #467)
+
+ By using 'g_signal_emit' over 'exo_job_emit'.
+
+ Fixes #467
+
+commit 14a0ca45ae02e7247ea2f1332e51be914ee652b4
+Author: Anonymous <noreply at xfce.org>
+Date: Fri Feb 26 00:46:00 2021 +0100
+
+ I18n: Update translation oc (83%).
+
+ 655 translated messages, 130 untranslated messages.
+
+ Transifex (https://www.transifex.com/xfce/public/).
+
+commit ca31905670ac0c3d4aa75120719b23de509ebf29
+Author: Alexander Schwinn <alexxcons at xfce.org>
+Date: Mon Feb 22 22:55:32 2021 +0100
+
+ Regression: Allow custom image files for UCA icons (Issue #517)
+
+ Fixes #517
+
+commit ab5de1650d797dd89d8e198c9a22bcc89e92690b
+Author: Theo Linkspfeifer <lastonestanding at tutanota.com>
+Date: Sun Feb 21 19:19:04 2021 +0100
+
+ Do not try to merge folders when creating copy with same name (Issue #491)
+
+commit 3cd56e24ef310f5a81663a95d702045f954907f7
+Author: Theo Linkspfeifer <lastonestanding at tutanota.com>
+Date: Thu Feb 18 23:13:40 2021 +0100
+
+ Fix incorrect return value in scroll event handler (Issue #512)
+
+commit 03f4a3cc9d1ac88efbacf46028ac85e7a8c0015c
+Author: Daniel Muñiz Fontoira <dani at damufo.com>
+Date: Thu Feb 18 00:46:03 2021 +0100
+
+ I18n: Update translation gl (100%).
+
+ 785 translated messages.
+
+ Transifex (https://www.transifex.com/xfce/public/).
+
+commit 1581e9d815de639865bb5b2b073899d9d5079a4f
+Author: Anonymous <noreply at xfce.org>
+Date: Sun Feb 14 00:45:32 2021 +0100
+
+ I18n: Update translation it (100%).
+
+ 785 translated messages.
+
+ Transifex (https://www.transifex.com/xfce/public/).
+
+commit 39ff308e4b1430f74b56ba70e21869f7ed0aa15c
+Author: Alexander Schwinn <alexxcons at xfce.org>
+Date: Tue Feb 9 14:15:59 2021 +0100
+
+ Back to development
+
+commit 03ddbeb989aa3a1a76cdb45e3d4a4bff6a1aa4a5
+Author: Alexander Schwinn <alexxcons at xfce.org>
+Date: Tue Feb 9 14:14:10 2021 +0100
+
+ Updates for release
+
commit dffd534ef8dd38812daed51668a67e80a072a255
Author: Ali Rostami <rostami.ali at gmail.com>
Date: Tue Feb 9 12:47:44 2021 +0100
=====================================
NEWS
=====================================
@@ -1,3 +1,15 @@
+4.16.4
+======
+- Bookmarks no longer need an existing, underlying file (Issue #47)
+- Regression: Select copied files after copy operation (Issue #520)
+- Reintroduce alternative zoom shortcuts (Issue #514)
+- Prevent hangup if a copy task that is blocked is resumed (Issue #467)
+- Regression: Allow custom image files for UCA icons (Issue #517)
+- Dont merge folders when creating copy with same name (Issue #491)
+- Fix incorrect return value in scroll event handler (Issue #512)
+- Translation Updates:
+ Galician, Hebrew, Italian, Occitan
+
4.16.3
======
- By default show all available volumes
=====================================
configure
=====================================
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac dffd534e.
+# From configure.ac 70f75b89.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for thunar 4.16.3.
+# Generated by GNU Autoconf 2.69 for thunar 4.16.4.
#
# Report bugs to <https://gitlab.xfce.org/xfce/thunar>.
#
@@ -593,8 +593,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='thunar'
PACKAGE_TARNAME='thunar'
-PACKAGE_VERSION='4.16.3'
-PACKAGE_STRING='thunar 4.16.3'
+PACKAGE_VERSION='4.16.4'
+PACKAGE_STRING='thunar 4.16.4'
PACKAGE_BUGREPORT='https://gitlab.xfce.org/xfce/thunar'
PACKAGE_URL=''
@@ -1561,7 +1561,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures thunar 4.16.3 to adapt to many kinds of systems.
+\`configure' configures thunar 4.16.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1637,7 +1637,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of thunar 4.16.3:";;
+ short | recursive ) echo "Configuration of thunar 4.16.4:";;
esac
cat <<\_ACEOF
@@ -1807,7 +1807,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-thunar configure 4.16.3
+thunar configure 4.16.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2178,7 +2178,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by thunar $as_me 4.16.3, which was
+It was created by thunar $as_me 4.16.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3158,7 +3158,7 @@ fi
# Define the identity of the package.
PACKAGE='thunar'
- VERSION='4.16.3'
+ VERSION='4.16.4'
cat >>confdefs.h <<_ACEOF
@@ -13996,7 +13996,7 @@ THUNARX_VERINFO=0:0:0
THUNARX_VERSION_API=3
THUNAR_VERSION_MAJOR=4
THUNAR_VERSION_MINOR=16
-THUNAR_VERSION_MICRO=3
+THUNAR_VERSION_MICRO=4
@@ -21377,7 +21377,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by thunar $as_me 4.16.3, which was
+This file was extended by thunar $as_me 4.16.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21443,7 +21443,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-thunar config.status 4.16.3
+thunar config.status 4.16.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
=====================================
configure.ac
=====================================
@@ -31,9 +31,9 @@ m4_define([thunarx_verinfo], [0:0:0])
m4_define([thunarx_version_api], [3])
m4_define([thunar_version_major], [4])
m4_define([thunar_version_minor], [16])
-m4_define([thunar_version_micro], [3])
+m4_define([thunar_version_micro], [4])
m4_define([thunar_version_nano], [])
-m4_define([thunar_version_build], [dffd534e])
+m4_define([thunar_version_build], [70f75b89])
m4_define([thunar_version_tag], [])
m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [git], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+thunar (4.16.4-1) unstable; urgency=medium
+
+ * New upstream version 4.16.4
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 07 Mar 2021 10:58:15 +0100
+
thunar (4.16.3-1) unstable; urgency=medium
* New upstream version 4.16.3
=====================================
docs/Thunar.1
=====================================
@@ -2,12 +2,12 @@
.\" Title: Thunar
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 02/09/2021
+.\" Date: 03/06/2021
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "THUNAR" "1" "02/09/2021" "[FIXME: source]" "[FIXME: manual]"
+.TH "THUNAR" "1" "03/06/2021" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
=====================================
docs/reference/thunarx/html/index.html
=====================================
@@ -31,7 +31,7 @@
<div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:jannis at xfce.org">jannis at xfce.org</a>></code></p></div></div>
</div>
</div></div>
-<div><p class="releaseinfo">Version 4.16.3
+<div><p class="releaseinfo">Version 4.16.4
</p></div>
<div><p class="copyright">Copyright © 2005 Benedikt Meurer</p></div>
<div><p class="copyright">Copyright © 2010 Jannis Pohlmann</p></div>
=====================================
docs/reference/thunarx/html/thunarx-Variables-and-functions-to-check-the-library-version.html
=====================================
@@ -242,7 +242,7 @@ represents the micro version of the</p>
<hr>
<div class="refsect2">
<a name="THUNARX-MICRO-VERSION:CAPS"></a><h3>THUNARX_MICRO_VERSION</h3>
-<pre class="programlisting">#define THUNARX_MICRO_VERSION 3
+<pre class="programlisting">#define THUNARX_MICRO_VERSION 4
</pre>
</div>
</div>
=====================================
docs/reference/thunarx/version.xml
=====================================
@@ -1 +1 @@
-4.16.3
+4.16.4
=====================================
po/gl.po
=====================================
@@ -5,6 +5,7 @@
#
# Translators:
# Xfce Bot <transifex at xfce.org>, 2021
+# Daniel Muñiz Fontoira <dani at damufo.com>, 2021
#
#, fuzzy
msgid ""
@@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-06 12:47+0100\n"
"PO-Revision-Date: 2020-12-28 17:42+0000\n"
-"Last-Translator: Xfce Bot <transifex at xfce.org>, 2021\n"
+"Last-Translator: Daniel Muñiz Fontoira <dani at damufo.com>, 2021\n"
"Language-Team: Galician (https://www.transifex.com/xfce/teams/16840/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -4048,7 +4049,7 @@ msgstr ""
#. to. This isn't a good idea, but is common on single user systems.
#: ../org.xfce.thunar.policy.in.in.h:6
msgid "Run Thunar as root"
-msgstr "Executar Thunar como administrador"
+msgstr "Executar Thunar como superusuario"
#: ../org.xfce.thunar.policy.in.in.h:7
msgid "Authentication is required to run Thunar as root."
=====================================
po/he.po
=====================================
@@ -5,6 +5,7 @@
#
# Translators:
# Xfce Bot <transifex at xfce.org>, 2021
+# Omer I.S. <omeritzicschwartz at gmail.com>, 2021
#
#, fuzzy
msgid ""
@@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-06 12:47+0100\n"
"PO-Revision-Date: 2020-12-28 17:42+0000\n"
-"Last-Translator: Xfce Bot <transifex at xfce.org>, 2021\n"
+"Last-Translator: Omer I.S. <omeritzicschwartz at gmail.com>, 2021\n"
"Language-Team: Hebrew (https://www.transifex.com/xfce/teams/16840/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -111,7 +112,7 @@ msgstr "שם '%s' אבד ב-dbus הודעה."
#: ../thunar/thunar-application.c:475
msgid "The Thunar development team. All rights reserved."
-msgstr "קבוצת הפיתוח של Thunar. כל הזכויות שמורות."
+msgstr "צוות הפיתוח של Thunar. כל הזכויות שמורות."
#: ../thunar/thunar-application.c:476
msgid "Written by Benedikt Meurer <benny at xfce.org>."
@@ -120,7 +121,7 @@ msgstr "נכתב ע\"י Benedikt Meurer <benny at xfce.org>."
#: ../thunar/thunar-application.c:477
#, c-format
msgid "Please report bugs to <%s>."
-msgstr "אנא דווח באגים ל-<%s>."
+msgstr "נא לדווח על באגים ל־<%s>."
#. display an error message to the user
#: ../thunar/thunar-application.c:751
@@ -146,7 +147,7 @@ msgstr "נכשל לפתוח את \"%s\": %s"
#: ../thunar/thunar-properties-dialog.c:739
#, c-format
msgid "Failed to rename \"%s\""
-msgstr "נכשל לשנות שם של \"%s\""
+msgstr "כשל בשינוי השם של \"%s\""
#: ../thunar/thunar-application.c:1798 ../thunar/thunar-launcher.c:2260
msgid "New Folder"
@@ -2638,7 +2639,7 @@ msgstr "כעת טוען תוכן תיקייה..."
#. display an error to the user
#: ../thunar/thunar-standard-view.c:2008 ../thunar/thunar-window.c:2952
msgid "Failed to open the home folder"
-msgstr "נכשל לפתוח תיקיית בית"
+msgstr "כשל בפתיחת תיקיית הבית"
#: ../thunar/thunar-standard-view.c:2079
msgid "Select by Pattern"
@@ -3061,7 +3062,7 @@ msgstr "הצג את מדריך למשתמש של Thunar"
#: ../thunar/thunar-window.c:411
msgid "Display information about Thunar"
-msgstr "הצג מידע אודות Thunar"
+msgstr "הצג מידע על Thunar"
#: ../thunar/thunar-window.c:412
msgid "Back"
=====================================
po/it.po
=====================================
@@ -5,6 +5,7 @@
#
# Translators:
# Xfce Bot <transifex at xfce.org>, 2021
+# Dmytro Tokayev, 2021
#
#, fuzzy
msgid ""
@@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-06 12:47+0100\n"
"PO-Revision-Date: 2020-12-28 17:42+0000\n"
-"Last-Translator: Xfce Bot <transifex at xfce.org>, 2021\n"
+"Last-Translator: Dmytro Tokayev, 2021\n"
"Language-Team: Italian (https://www.transifex.com/xfce/teams/16840/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2192,7 +2193,7 @@ msgstr "Impossibile mostrare le impostazioni della gestione dei volumi"
#: ../thunar/thunar-progress-dialog.c:96
msgid "File Operation Progress"
-msgstr "Avanzamento delle operazione sui file"
+msgstr "Avanzamento dell'operazione sul file"
#. build the tooltip text
#: ../thunar/thunar-progress-dialog.c:310
=====================================
po/oc.po
=====================================
@@ -5,6 +5,7 @@
#
# Translators:
# Xfce Bot <transifex at xfce.org>, 2021
+# Quentin PAGÈS, 2021
#
#, fuzzy
msgid ""
@@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-06 12:47+0100\n"
"PO-Revision-Date: 2020-12-28 17:42+0000\n"
-"Last-Translator: Xfce Bot <transifex at xfce.org>, 2021\n"
+"Last-Translator: Quentin PAGÈS, 2021\n"
"Language-Team: Occitan (post 1500) (https://www.transifex.com/xfce/teams/16840/oc/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -410,7 +411,7 @@ msgstr "Sètz segur que volètz suprimir « %s » ?"
#: ../thunar/thunar-chooser-dialog.c:721
msgid "_Remove"
-msgstr ""
+msgstr "_Suprimir"
#: ../thunar/thunar-chooser-dialog.c:724
msgid ""
=====================================
thunar/thunar-gtk-extensions.c
=====================================
@@ -87,6 +87,8 @@ thunar_gtk_menu_thunarx_menu_item_new (GObject *thunarx_menu_item,
GList *children;
GList *lp;
GtkWidget *submenu;
+ GtkWidget *image;
+ GIcon *icon;
g_return_val_if_fail (THUNARX_IS_MENU_ITEM (thunarx_menu_item), NULL);
@@ -100,9 +102,11 @@ thunar_gtk_menu_thunarx_menu_item_new (GObject *thunarx_menu_item,
NULL);
accel_path = g_strconcat ("<Actions>/ThunarActions/", name, NULL);
- gtk_menu_item = xfce_gtk_image_menu_item_new_from_icon_name (label_text, tooltip_text, accel_path,
- G_CALLBACK (thunarx_menu_item_activate),
- G_OBJECT (thunarx_menu_item), icon_name, menu_to_append_item);
+ icon = g_icon_new_for_string (icon_name, NULL);
+ image = gtk_image_new_from_gicon (icon,GTK_ICON_SIZE_MENU);
+ gtk_menu_item = xfce_gtk_image_menu_item_new (label_text, tooltip_text, accel_path,
+ G_CALLBACK (thunarx_menu_item_activate),
+ G_OBJECT (thunarx_menu_item), image, menu_to_append_item);
/* recursively add submenu items if any */
if (gtk_menu_item != NULL && thunarx_menu != NULL)
@@ -119,6 +123,7 @@ thunar_gtk_menu_thunarx_menu_item_new (GObject *thunarx_menu_item,
g_free (label_text);
g_free (tooltip_text);
g_free (icon_name);
+ g_object_unref (icon);
return gtk_menu_item;
}
=====================================
thunar/thunar-job.c
=====================================
@@ -711,7 +711,7 @@ thunar_job_ask_jobs (ThunarJob *job)
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), NULL);
- exo_job_emit (EXO_JOB (job), job_signals[ASK_JOBS], 0, &jobs);
+ g_signal_emit (EXO_JOB (job), job_signals[ASK_JOBS], 0, &jobs);
return jobs;
}
@@ -773,7 +773,7 @@ thunar_job_freeze (ThunarJob *job)
{
_thunar_return_if_fail (THUNAR_IS_JOB (job));
job->priv->frozen = TRUE;
- exo_job_emit (EXO_JOB (job), job_signals[FROZEN], 0);
+ g_signal_emit (EXO_JOB (job), job_signals[FROZEN], 0);
}
@@ -783,7 +783,7 @@ thunar_job_unfreeze (ThunarJob *job)
{
_thunar_return_if_fail (THUNAR_IS_JOB (job));
job->priv->frozen = FALSE;
- exo_job_emit (EXO_JOB (job), job_signals[UNFROZEN], 0);
+ g_signal_emit (EXO_JOB (job), job_signals[UNFROZEN], 0);
}
=====================================
thunar/thunar-shortcuts-model.c
=====================================
@@ -1330,47 +1330,40 @@ thunar_shortcuts_model_load_line (GFile *file_path,
_thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
_thunar_return_if_fail (name == NULL || g_utf8_validate (name, -1, NULL));
- /* handle local and remove files differently */
+ shortcut = g_slice_new0 (ThunarShortcut);
+ shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_BOOKMARKS;
+
+ /* handle local and remote files differently */
if (thunar_shortcuts_model_local_file (file_path))
{
/* try to open the file corresponding to the uri */
file = thunar_file_get (file_path, NULL);
if (G_UNLIKELY (file == NULL))
- return;
-
- /* make sure the file refers to a directory */
- if (G_UNLIKELY (thunar_file_is_directory (file)))
{
- /* create the shortcut entry */
- shortcut = g_slice_new0 (ThunarShortcut);
- shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_BOOKMARKS;
- shortcut->file = file;
- shortcut->sort_id = row_num;
- shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
- shortcut->name = g_strdup (name);
-
- /* append the shortcut to the list */
- thunar_shortcuts_model_add_shortcut (model, shortcut);
+ shortcut->gicon = g_themed_icon_new ("folder");
+ shortcut->location = g_object_ref (file_path);
}
else
{
- g_object_unref (file);
+ /* make sure the file refers to a directory */
+ if (G_UNLIKELY (thunar_file_is_directory (file)))
+ shortcut->file = file;
+ else
+ g_object_unref (file);
}
}
else
{
- /* create the shortcut entry */
- shortcut = g_slice_new0 (ThunarShortcut);
- shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_BOOKMARKS;
shortcut->gicon = g_themed_icon_new ("folder-remote");
shortcut->location = g_object_ref (file_path);
- shortcut->sort_id = row_num;
- shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
- shortcut->name = g_strdup (name);
-
- /* append the shortcut to the list */
- thunar_shortcuts_model_add_shortcut (model, shortcut);
}
+
+ shortcut->sort_id = row_num;
+ shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
+ shortcut->name = g_strdup (name);
+
+ /* append the shortcut to the list */
+ thunar_shortcuts_model_add_shortcut (model, shortcut);
}
@@ -1574,6 +1567,11 @@ thunar_shortcuts_model_file_changed (ThunarFile *file,
path = gtk_tree_path_new_from_indices (idx, -1);
gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
gtk_tree_path_free (path);
+
+ /* the shortcuts list was changed, so write the gtk bookmarks file */
+ if (shortcut->group == THUNAR_SHORTCUT_GROUP_PLACES_BOOKMARKS)
+ thunar_shortcuts_model_save (model);
+
break;
}
}
@@ -1602,9 +1600,29 @@ thunar_shortcuts_model_file_destroy (ThunarFile *file,
/* verify that we actually found a shortcut */
_thunar_assert (lp != NULL);
_thunar_assert (THUNAR_IS_FILE (shortcut->file));
+ if (shortcut->group == THUNAR_SHORTCUT_GROUP_PLACES_BOOKMARKS)
+ {
+ if (G_LIKELY (shortcut->gicon != NULL))
+ g_object_unref (shortcut->gicon);
- /* drop the shortcut from the model */
- thunar_shortcuts_model_remove_shortcut (model, shortcut);
+ if (G_LIKELY (shortcut->location != NULL))
+ g_object_unref (shortcut->location);
+
+ shortcut->gicon = g_themed_icon_new ("folder");
+ shortcut->location = g_object_ref (thunar_file_get_file (shortcut->file));
+
+ thunar_file_unwatch (shortcut->file);
+ g_signal_handlers_disconnect_matched (shortcut->file,
+ G_SIGNAL_MATCH_DATA, 0,
+ 0, NULL, NULL, model);
+ g_object_unref (shortcut->file);
+ shortcut->file = NULL;
+ }
+ else
+ {
+ /* drop the shortcut from the model */
+ thunar_shortcuts_model_remove_shortcut (model, shortcut);
+ }
}
=====================================
thunar/thunar-standard-view.c
=====================================
@@ -2337,7 +2337,7 @@ thunar_standard_view_scroll_event (GtkWidget *view,
else
{
g_debug ("GDK_SCROLL_SMOOTH scrolling event with no delta happened");
- return TRUE;
+ return FALSE;
}
if (G_UNLIKELY (scrolling_direction == GDK_SCROLL_LEFT || scrolling_direction == GDK_SCROLL_RIGHT))
=====================================
thunar/thunar-transfer-job.c
=====================================
@@ -600,7 +600,7 @@ thunar_transfer_job_copy_file (ThunarTransferJob *job,
if (err == NULL)
{
/* try to copy the file from source file to the duplicate file */
- if (ttj_copy_file (job, source_file, duplicate_file, copy_flags, TRUE, &err))
+ if (ttj_copy_file (job, source_file, duplicate_file, copy_flags, FALSE, &err))
{
/* return the real target file */
return duplicate_file;
=====================================
thunar/thunar-window.c
=====================================
@@ -387,8 +387,12 @@ static XfceGtkActionEntry thunar_window_action_entries[] =
{ THUNAR_WINDOW_ACTION_VIEW_MENUBAR, "<Actions>/ThunarWindow/view-menubar", "<Primary>m", XFCE_GTK_CHECK_MENU_ITEM, N_ ("_Menubar"), N_ ("Change the visibility of this window's menubar"), NULL, G_CALLBACK (thunar_window_action_menubar_changed), },
{ THUNAR_WINDOW_ACTION_SHOW_HIDDEN, "<Actions>/ThunarWindow/show-hidden", "<Primary>h", XFCE_GTK_CHECK_MENU_ITEM, N_ ("Show _Hidden Files"), N_ ("Toggles the display of hidden files in the current window"), NULL, G_CALLBACK (thunar_window_action_show_hidden), },
{ THUNAR_WINDOW_ACTION_ZOOM_IN, "<Actions>/ThunarWindow/zoom-in", "<Primary>KP_Add", XFCE_GTK_IMAGE_MENU_ITEM, N_ ("Zoom I_n"), N_ ("Show the contents in more detail"), "zoom-in-symbolic", G_CALLBACK (thunar_window_zoom_in), },
+ { THUNAR_WINDOW_ACTION_ZOOM_IN_ALT_1, "<Actions>/ThunarWindow/zoom-in-alt1", "<Primary>plus", XFCE_GTK_IMAGE_MENU_ITEM, NULL, NULL, NULL, G_CALLBACK (thunar_window_zoom_in), },
+ { THUNAR_WINDOW_ACTION_ZOOM_IN_ALT_2, "<Actions>/ThunarWindow/zoom-in-alt2", "<Primary>equal", XFCE_GTK_IMAGE_MENU_ITEM, NULL, NULL, NULL, G_CALLBACK (thunar_window_zoom_in), },
{ THUNAR_WINDOW_ACTION_ZOOM_OUT, "<Actions>/ThunarWindow/zoom-out", "<Primary>KP_Subtract", XFCE_GTK_IMAGE_MENU_ITEM, N_ ("Zoom _Out"), N_ ("Show the contents in less detail"), "zoom-out-symbolic", G_CALLBACK (thunar_window_zoom_out), },
+ { THUNAR_WINDOW_ACTION_ZOOM_OUT_ALT, "<Actions>/ThunarWindow/zoom-out-alt", "<Primary>minus", XFCE_GTK_IMAGE_MENU_ITEM, NULL, NULL, NULL, G_CALLBACK (thunar_window_zoom_out), },
{ THUNAR_WINDOW_ACTION_ZOOM_RESET, "<Actions>/ThunarWindow/zoom-reset", "<Primary>KP_0", XFCE_GTK_IMAGE_MENU_ITEM, N_ ("Normal Si_ze"), N_ ("Show the contents at the normal size"), "zoom-original-symbolic", G_CALLBACK (thunar_window_zoom_reset), },
+ { THUNAR_WINDOW_ACTION_ZOOM_RESET_ALT, "<Actions>/ThunarWindow/zoom-reset-alt", "<Primary>0", XFCE_GTK_IMAGE_MENU_ITEM, NULL, NULL, NULL, G_CALLBACK (thunar_window_zoom_reset), },
{ THUNAR_WINDOW_ACTION_CLEAR_DIRECTORY_SPECIFIC_SETTINGS,"<Actions>/ThunarWindow/clear-directory-specific-settings","", XFCE_GTK_IMAGE_MENU_ITEM, N_ ("Clear Saved _Folder View Settings"), N_ ("Delete saved view settings for this folder"), NULL, G_CALLBACK (thunar_window_action_clear_directory_specific_settings), },
{ THUNAR_WINDOW_ACTION_VIEW_AS_ICONS, "<Actions>/ThunarWindow/view-as-icons", "<Primary>1", XFCE_GTK_RADIO_MENU_ITEM, N_ ("_Icon View"), N_ ("Display folder content in an icon view"), NULL, G_CALLBACK (thunar_window_action_icon_view), },
{ THUNAR_WINDOW_ACTION_VIEW_AS_DETAILED_LIST, "<Actions>/ThunarWindow/view-as-detailed-list", "<Primary>2", XFCE_GTK_RADIO_MENU_ITEM, N_ ("_List View"), N_ ("Display folder content in a detailed list view"), NULL, G_CALLBACK (thunar_window_action_detailed_view), },
@@ -896,7 +900,7 @@ thunar_window_select_files (ThunarWindow *window,
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
for (GList *lp = files_to_selected; lp != NULL; lp = lp->next)
- thunarFiles = g_list_append (thunarFiles, thunar_file_get (G_FILE (files_to_selected->data), NULL));
+ thunarFiles = g_list_append (thunarFiles, thunar_file_get (G_FILE (lp->data), NULL));
thunar_view_set_selected_files (THUNAR_VIEW (window->view), thunarFiles);
g_list_free_full (thunarFiles, g_object_unref);
}
=====================================
thunar/thunar-window.h
=====================================
@@ -64,9 +64,12 @@ typedef enum
THUNAR_WINDOW_ACTION_VIEW_MENUBAR,
THUNAR_WINDOW_ACTION_SHOW_HIDDEN,
THUNAR_WINDOW_ACTION_ZOOM_IN,
- THUNAR_WINDOW_ACTION_ZOOM_IN_ALT,
+ THUNAR_WINDOW_ACTION_ZOOM_IN_ALT_1,
+ THUNAR_WINDOW_ACTION_ZOOM_IN_ALT_2,
THUNAR_WINDOW_ACTION_ZOOM_OUT,
+ THUNAR_WINDOW_ACTION_ZOOM_OUT_ALT,
THUNAR_WINDOW_ACTION_ZOOM_RESET,
+ THUNAR_WINDOW_ACTION_ZOOM_RESET_ALT,
THUNAR_WINDOW_ACTION_CLEAR_DIRECTORY_SPECIFIC_SETTINGS,
THUNAR_WINDOW_ACTION_VIEW_AS_ICONS,
THUNAR_WINDOW_ACTION_VIEW_AS_DETAILED_LIST,
=====================================
thunarx/thunarx-config.h
=====================================
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
#define THUNARX_MAJOR_VERSION 4
#define THUNARX_MINOR_VERSION 16
-#define THUNARX_MICRO_VERSION 3
+#define THUNARX_MICRO_VERSION 4
#define THUNARX_CHECK_VERSION(major,minor,micro) \
(THUNARX_MAJOR_VERSION > (major) \
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/thunar/-/compare/5b3e140f2f3ae34631c25cccb234b8670ad3122c...1a8dbe75f6c9c363b22348e129266503c80d52b5
--
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/thunar/-/compare/5b3e140f2f3ae34631c25cccb234b8670ad3122c...1a8dbe75f6c9c363b22348e129266503c80d52b5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20210307/95e3791e/attachment-0001.htm>
More information about the Pkg-xfce-commits
mailing list