Skip to content

Commit

Permalink
Merge tag 'thunar-1.6.13' into mariux
Browse files Browse the repository at this point in the history 
1.6.13
======
- Handle cases when file watch is not supported (Bug #13881)
- Missing Trash Translation String (Bug #13409)
- Delete Thunar symlink on uninstall (Bug #13533)
- Handle g_mem_is_system_malloc deprecation
- Prefer local (file://) URIs than native ones (e.g. smb://) (Bug #13845)
- Translation updates: Amharic, Arabic, Asturian, Bangla, Basque, Belarusian,
  Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan),
  Croatian, Czech, Danish, Dutch, English (Australia), English (United Kingdom),
  Esperanto, Estonian, Finnish, French, Galician, German, Greek, Hebrew,
  Hungarian, Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Latvian,
  Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan, Persian,
  Polish, Portuguese, Portuguese (Brazil), Punjabi, Romanian, Russian, Serbian,
  Slovak, Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Urdu,
  Urdu (Pakistan), Uyghur, Vietnamese

* tag 'thunar-1.6.13': (304 commits)
  Updates for release
  I18n: Update translation da (100%).
  I18n: Update translation id (100%).
  I18n: Update translation ko (100%).
  I18n: Update translation ja (100%).
  I18n: Update translation it (100%).
  Handle cases when file watch is not supported (Bug #13881)
  I18n: Update translation da (100%).
  I18n: Update translation sv (100%).
  I18n: Update translation uk (100%).
  I18n: Update translation hu (100%).
  I18n: Update translation he (100%).
  I18n: Update translation el (100%).
  I18n: Update translation zh_TW (100%).
  I18n: Update translation pt_BR (100%).
  I18n: Update translation tr (100%).
  I18n: Update translation pt (100%).
  I18n: Update translation pl (100%).
  I18n: Update translation kk (100%).
  I18n: Update translation hr (99%).
  I18n: Update translation zh_CN (100%).
  I18n: Update translation da (100%).
  I18n: Update translation es (100%).
  I18n: Update translation lt (100%).
  I18n: Update translation fr (100%).
  I18n: Update translation ru (100%).
  I18n: Update translation de (100%).
  I18n: Update translation cs (100%).
  I18n: Update translation bg (100%).
  Missing Trash Translation String (Bug #13409)
  I18n: Update translation id (100%).
  I18n: Update translation da (100%).
  I18n: Update translation da (100%).
  I18n: Update translation da (100%).
  I18n: Update translation da (100%).
  I18n: Update translation da (100%).
  I18n: Update translation zh_TW (100%).
  I18n: Update translation zh_HK (99%).
  I18n: Update translation zh_CN (100%).
  I18n: Update translation vi (98%).
  I18n: Update translation ur (79%).
  I18n: Update translation ur_PK (79%).
  I18n: Update translation uk (100%).
  I18n: Update translation ug (89%).
  I18n: Update translation tr (100%).
  I18n: Update translation te (79%).
  I18n: Update translation sv (100%).
  I18n: Update translation sr (100%).
  I18n: Update translation sk (100%).
  I18n: Update translation ro (100%).
  I18n: Update translation pa (66%).
  I18n: Update translation oc (100%).
  I18n: Update translation nn (100%).
  I18n: Update translation nl (100%).
  I18n: Update translation nb (100%).
  I18n: Update translation ms (100%).
  I18n: Update translation lv (84%).
  I18n: Update translation lt (100%).
  I18n: Update translation ko (100%).
  I18n: Update translation kk (100%).
  I18n: Update translation ja (100%).
  I18n: Update translation it (100%).
  I18n: Update translation is (97%).
  I18n: Update translation id (100%).
  I18n: Update translation hu (100%).
  I18n: Update translation he (100%).
  I18n: Update translation gl (100%).
  I18n: Update translation fr (100%).
  I18n: Update translation fi (100%).
  I18n: Update translation fa_IR (55%).
  I18n: Update translation et (99%).
  I18n: Update translation es (100%).
  I18n: Update translation eo (81%).
  I18n: Update translation en_GB (100%).
  I18n: Update translation en_AU (100%).
  I18n: Update translation el (100%).
  I18n: Update translation de (100%).
  I18n: Update translation cs (100%).
  I18n: Update translation bn (84%).
  I18n: Update translation be (78%).
  I18n: Update translation ast (100%).
  I18n: Update translation ar (100%).
  I18n: Update translation am (54%).
  Delete Thunar symlink on uninstall (Bug #13533)
  I18n: Update translation da (100%).
  I18n: Update translation da (100%).
  Handle g_mem_is_system_malloc deprecation
  Prefer local (file://) URIs than native ones (e.g. smb://) (Bug #13845)
  I18n: Update translation th (100%).
  I18n: Update translation ca (100%).
  I18n: Update translation eu (99%).
  I18n: Update translation hr (99%).
  I18n: Update translation es (100%).
  I18n: Update translation pt (100%).
  I18n: Update translation pl (100%).
  I18n: Update translation eu (98%).
  I18n: Update translation bg (100%).
  I18n: Update translation ru (100%).
  I18n: Update translation pt (100%).
  I18n: Update translation pl (99%).
  ...
  • Loading branch information
@donald
donald committed Jan 31, 2018
2 parents aefb312 + ff618bf commit 9ec6123
Show file tree
Hide file tree
Showing 75 changed files with 38,250 additions and 25,879 deletions.
56 changes: 50 additions & 6 deletions NEWS
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,55 @@
1.6.13
======
- Handle cases when file watch is not supported (Bug #13881)
- Missing Trash Translation String (Bug #13409)
- Delete Thunar symlink on uninstall (Bug #13533)
- Handle g_mem_is_system_malloc deprecation
- Prefer local (file://) URIs than native ones (e.g. smb://) (Bug #13845)
- Translation updates: Amharic, Arabic, Asturian, Bangla, Basque, Belarusian,
Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan),
Croatian, Czech, Danish, Dutch, English (Australia), English (United Kingdom),
Esperanto, Estonian, Finnish, French, Galician, German, Greek, Hebrew,
Hungarian, Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Latvian,
Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan, Persian,
Polish, Portuguese, Portuguese (Brazil), Punjabi, Romanian, Russian, Serbian,
Slovak, Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Urdu,
Urdu (Pakistan), Uyghur, Vietnamese

1.6.12
======
- Fix deadlock in mutex causing Thunar to hang (Bug #13481)
- Add support for Exif:ImageDescription and Exif:UserComment
- Do not pass NULL to g_file_test
- Bump libxfce4panel version for TPA plugin to 4.9.0
- Switch from XfcePanelImage to GtkImage
- Fixed a compilation error with the newest dev panel API
- Translation updates: Catalan, Dutch (Flemish), Galician, Korean, Lithuanian,
Spanish, Thai

1.6.11
======
- Fix a crash for on cut/pasting of multiple files (Bug #12260)
- Fix a crash when renaming files (Bug #12264)
- Fix missing return value for debug in thunar_file_reload (bug #12827)
- Fix thunar history being deleted after view change (bug #12708)
- Expand the name column by default in details view (#11357)
- Silently ignore G_IO_ERROR_FAILED_HANDLED (#8695)
- Fixing missing return value in standard view
- Fix crashes when reloading target file after move (bug #11983)
- Translation updates: Arabic, Asturian, Basque, Bulgarian, Catalan, Croatian,
Danish, Dutch (Flemish), English (Australia), English (Great Britain), Finnish,
French, Galician, German, Greek, Hebrew, Hungarian, Icelandic, Italian, Korean,
Lithuanian, Norwegian Bokmal, Norwegian Nynorsk, Occitan, Portuguese,
Portuguese (Brazilian), Slovak, Swedish

1.6.10
======
- Do not track thunar/thunar-marshal.{c,h}
- Remove Makefile and Makefile.in files when running distclean
- Remove subversion $Id$ tags
- Really fix trash state at startup (bug #9513 and #11913)
- Use proper return type for thunar_file_reload (bug #11913)
- Revert "Fix loading the trash bin status at startup (bug #9513)"
- Do not track thunar/thunar-marshal.{c,h} (Harald Judt)
- Remove Makefile and Makefile.in files when running distclean (Harald Judt)
- Remove subversion $Id$ tags (Harald Judt)
- Really fix trash state at startup (bug #9513 and #11913) (Harald Judt)
- Use proper return type for thunar_file_reload (bug #11913) (Harald Judt)
- Revert "Fix loading the trash bin status at startup (bug #9513)" (Harald Judt)

1.6.9
=====
Expand Down
2 changes: 1 addition & 1 deletion acinclude.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ AC_DEFUN([BM_THUNAR_PLUGIN_TPA],
AC_ARG_ENABLE([tpa-plugin], AC_HELP_STRING([--disable-tpa-plugin], [Don't build the thunar-tpa plugin, see plugins/thunar-tpa/README]),
[ac_bm_thunar_plugin_tpa=$enableval], [ac_bm_thunar_plugin_tpa=yes])
if test x"$ac_bm_thunar_plugin_tpa" = x"yes"; then
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0],
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.9.0],
[
dnl # Can only build thunar-tpa if D-BUS was found previously
ac_bm_thunar_plugin_tpa=$DBUS_FOUND
Expand Down
2 changes: 1 addition & 1 deletion configure.ac.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ m4_define([thunarx_verinfo], [0:0:0])
m4_define([thunarx_version_api], [2])
m4_define([thunar_version_major], [1])
m4_define([thunar_version_minor], [6])
m4_define([thunar_version_micro], [10])
m4_define([thunar_version_micro], [13])
m4_define([thunar_version_nano], [])
m4_define([thunar_version_build], [@REVISION@])
m4_define([thunar_version_tag], [])
Expand Down
2 changes: 2 additions & 0 deletions plugins/thunar-apr/thunar-apr-image-page.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ static const struct
{ N_ ("Shutter Speed:"), EXIF_TAG_SHUTTER_SPEED_VALUE, },
{ N_ ("ISO Speed Ratings:"), EXIF_TAG_ISO_SPEED_RATINGS, },
{ N_ ("Software:"), EXIF_TAG_SOFTWARE, },
{ N_ ("Description:"), EXIF_TAG_IMAGE_DESCRIPTION, },
{ N_ ("Comment:"), EXIF_TAG_USER_COMMENT, },
};
#endif

Expand Down
33 changes: 12 additions & 21 deletions plugins/thunar-tpa/thunar-tpa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@

#include <thunar-tpa/thunar-tpa-bindings.h>

#ifdef LIBXFCE4PANEL_CHECK_VERSION
#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
#define HAS_PANEL_49
#endif
#endif

typedef struct _ThunarTpaClass ThunarTpaClass;
typedef struct _ThunarTpa ThunarTpa;

Expand All @@ -59,12 +53,8 @@ GType thunar_tpa_get_type (void);
void thunar_tpa_register_type (XfcePanelTypeModule *type_module);
static void thunar_tpa_finalize (GObject *object);
static void thunar_tpa_construct (XfcePanelPlugin *panel_plugin);

#ifdef HAS_PANEL_49
static gboolean thunar_tpa_size_changed (XfcePanelPlugin *panel_plugin,
gint size);
#endif

static void thunar_tpa_error (ThunarTpa *plugin,
GError *error);
static void thunar_tpa_state (ThunarTpa *plugin,
Expand Down Expand Up @@ -157,10 +147,7 @@ thunar_tpa_class_init (ThunarTpaClass *klass)

plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass);
plugin_class->construct = thunar_tpa_construct;

#ifdef HAS_PANEL_49
plugin_class->size_changed = thunar_tpa_size_changed;
#endif
}


Expand All @@ -183,7 +170,7 @@ thunar_tpa_init (ThunarTpa *plugin)
gtk_widget_show (plugin->button);

/* setup the image for the trash plugin */
plugin->image = xfce_panel_image_new_from_source ("user-trash");
plugin->image = gtk_image_new_from_icon_name ("user-trash", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (plugin->button), plugin->image);
gtk_widget_show (plugin->image);

Expand Down Expand Up @@ -246,10 +233,8 @@ thunar_tpa_construct (XfcePanelPlugin *panel_plugin)
{
ThunarTpa *plugin = THUNAR_TPA (panel_plugin);

#ifdef HAS_PANEL_49
/* make the plugin fit a single row */
xfce_panel_plugin_set_small (panel_plugin, TRUE);
#endif

/* add the "Empty Trash" menu item */
xfce_panel_plugin_menu_insert_item (panel_plugin, GTK_MENU_ITEM (plugin->mi));
Expand All @@ -260,20 +245,26 @@ thunar_tpa_construct (XfcePanelPlugin *panel_plugin)



#ifdef HAS_PANEL_49
static gboolean
thunar_tpa_size_changed (XfcePanelPlugin *panel_plugin,
gint size)
{
g_return_val_if_fail (panel_plugin != NULL, FALSE);
ThunarTpa *plugin = THUNAR_TPA (panel_plugin);
gint image_size;

/* make the plugin fit a single row */
size /= xfce_panel_plugin_get_nrows (panel_plugin);
gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), size, size);

#if LIBXFCE4PANEL_CHECK_VERSION (4,13,0)
image_size = xfce_panel_plugin_get_icon_size (panel_plugin);
#else
image_size = size - 2; // fall-back for older panel versions
#endif
gtk_image_set_pixel_size (GTK_IMAGE (plugin->image), image_size);

return TRUE;
}
#endif



Expand All @@ -295,7 +286,7 @@ thunar_tpa_error (ThunarTpa *plugin,
g_free (tooltip);

/* setup an error plugin */
xfce_panel_image_set_from_source (XFCE_PANEL_IMAGE (plugin->image), "stock_dialog-error");
gtk_image_set_from_icon_name (GTK_IMAGE (plugin->image), "stock_dialog-error", GTK_ICON_SIZE_BUTTON);
}


Expand All @@ -308,7 +299,7 @@ thunar_tpa_state (ThunarTpa *plugin,
gtk_widget_set_tooltip_text (plugin->button, full ? _("Trash contains files") : _("Trash is empty"));

/* setup the appropriate plugin */
xfce_panel_image_set_from_source (XFCE_PANEL_IMAGE (plugin->image), full ? "user-trash-full" : "user-trash");
gtk_image_set_from_icon_name (GTK_IMAGE (plugin->image), full ? "user-trash-full" : "user-trash", GTK_ICON_SIZE_BUTTON);

/* sensitivity of the menu item */
gtk_widget_set_sensitive (plugin->mi, full);
Expand Down
Loading

0 comments on commit 9ec6123

Please sign in to comment.