diff -Nru thunar-dropbox-0.2.0/AUTHORS thunar-dropbox-0.2.1/AUTHORS --- thunar-dropbox-0.2.0/AUTHORS 2010-03-20 20:11:52.000000000 +0000 +++ thunar-dropbox-0.2.1/AUTHORS 2015-03-07 14:43:04.000000000 +0000 @@ -1 +1,11 @@ +Thunar-Dropbox authors/contributors: + Maato + - Developer + +Pablo Lezaeta + - Install library with proper permissions, respect --libdir. + - README + +Hudd A + - Fixed crash when files with invalid UTF-8 encoded filenames were selected. \ No newline at end of file diff -Nru thunar-dropbox-0.2.0/ChangeLog thunar-dropbox-0.2.1/ChangeLog --- thunar-dropbox-0.2.0/ChangeLog 2011-01-18 19:25:23.000000000 +0000 +++ thunar-dropbox-0.2.1/ChangeLog 2015-03-07 14:45:05.000000000 +0000 @@ -1,8 +1,13 @@ -0.2.0 +0.2.1: + - Fixed crash when files with invalid UTF-8 encoded filenames were selected. + - Resolve symbolic links in paths. + - Install library with proper permissions, respect --libdir. + +0.2.0: - Broke comptability with older version of thunar in favor of Thunar 1.2.0 -0.1.1 +0.1.1: - Added thunar-dropbox.png because 'dropbox.png' was not available on certain distributions. diff -Nru thunar-dropbox-0.2.0/debian/changelog thunar-dropbox-0.2.1/debian/changelog --- thunar-dropbox-0.2.0/debian/changelog 2014-09-20 14:03:06.000000000 +0000 +++ thunar-dropbox-0.2.1/debian/changelog 2015-05-02 13:20:47.000000000 +0000 @@ -1,3 +1,9 @@ +thunar-dropbox (0.2.1-1~ppa+utopic0) utopic; urgency=low + + * New upstream release. + + -- Thanh Tung Nguyen Sat, 02 May 2015 15:04:56 +0100 + thunar-dropbox (0.2.0-1~ppa+utopic0) utopic; urgency=low * Initial release. diff -Nru thunar-dropbox-0.2.0/debian/control thunar-dropbox-0.2.1/debian/control --- thunar-dropbox-0.2.0/debian/control 2014-09-20 14:04:07.000000000 +0000 +++ thunar-dropbox-0.2.1/debian/control 2015-05-02 13:11:50.000000000 +0000 @@ -5,6 +5,8 @@ Build-Depends: debhelper (>= 9), libthunarx-2-dev (>= 1.1.0), python (>= 2.0.0) Standards-Version: 3.9.5 Homepage: http://softwarebakery.com/maato/thunar-dropbox.html +Vcs-Git: https://github.com/Maato/thunar-dropbox.git +Vcs-Browser: https://github.com/Maato/thunar-dropbox Package: thunar-dropbox-plugin Architecture: any diff -Nru thunar-dropbox-0.2.0/debian/copyright thunar-dropbox-0.2.1/debian/copyright --- thunar-dropbox-0.2.0/debian/copyright 2014-09-20 14:04:01.000000000 +0000 +++ thunar-dropbox-0.2.1/debian/copyright 2015-05-02 13:06:49.000000000 +0000 @@ -1,13 +1,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: thunar-dropbox -Source: https://github.com/Maato/thunar-dropbox +Source: http://softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-*.*.*.tar.bz2 Files: * -Copyright: 2012 Maato +Copyright: 2012-2015 Maato License: GPL-3.0+ Files: debian/* -Copyright: 2013-2014 Thanh Tung Nguyen +Copyright: 2013-2015 Thanh Tung Nguyen License: GPL-3.0+ License: GPL-3.0+ diff -Nru thunar-dropbox-0.2.0/debian/install thunar-dropbox-0.2.1/debian/install --- thunar-dropbox-0.2.0/debian/install 2013-05-08 12:16:41.000000000 +0000 +++ thunar-dropbox-0.2.1/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -data/icons/hicolor/16x16/apps/thunar-dropbox.png usr/share/icons/hicolor/16x16/apps diff -Nru thunar-dropbox-0.2.0/debian/rules thunar-dropbox-0.2.1/debian/rules --- thunar-dropbox-0.2.0/debian/rules 2013-05-08 12:35:40.000000000 +0000 +++ thunar-dropbox-0.2.1/debian/rules 2015-05-02 13:02:14.000000000 +0000 @@ -3,25 +3,30 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed + +DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +CONFIG=--prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) +INSTALLDIR=debian/thunar-dropbox-plugin + override_dh_auto_clean: - dh_testdir - dh_testroot - dh_clean - rm -rf build .waf-1.5.16-e6d03192b5ddfa5ef2c8d65308e48e42 .lock-wscript + ./waf distclean override_dh_auto_configure: - ./waf configure --prefix=/usr + ./waf configure $(CONFIG) override_dh_auto_build: ./waf build override_dh_auto_install: - dh_install - mkdir -p debian/thunar-dropbox-plugin/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/thunarx-2 - cp -a build/default/libthunar-dropbox.so debian/thunar-dropbox-plugin/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/thunarx-2/thunar-dropbox.so + ./waf install --destdir=$(CURDIR)/$(INSTALLDIR) override_dh_installchangelogs: dh_installchangelogs ChangeLog +override_dh_builddeb: + dh_builddeb -- -Zxz -z9 + %: - dh $@ + dh $@ --parallel diff -Nru thunar-dropbox-0.2.0/README.md thunar-dropbox-0.2.1/README.md --- thunar-dropbox-0.2.0/README.md 1970-01-01 00:00:00.000000000 +0000 +++ thunar-dropbox-0.2.1/README.md 2015-03-07 14:39:06.000000000 +0000 @@ -0,0 +1,18 @@ +`Thunar Dropbox` +Thunar Dropbox is a plugin for thunar that adds context-menu items from +dropbox. This plugin does not come with dropbox itself, you will need to +install that separately. + +![Thunar-Dropbox](http://softwarebakery.com/maato/images/thunardropbox_contextmenu.png) + +###Dependencies +Depending on your distribution you might have to install +libthunarx-2 + +###Installation from sources + python2 ./waf configure + python2 ./waf build + sudo python2 ./waf install + +_Note_: the provided waf does not work correctly with python3, so make +sure you use python2 to run these commands. diff -Nru thunar-dropbox-0.2.0/src/tdp-provider.c thunar-dropbox-0.2.1/src/tdp-provider.c --- thunar-dropbox-0.2.0/src/tdp-provider.c 2011-01-18 19:12:17.000000000 +0000 +++ thunar-dropbox-0.2.1/src/tdp-provider.c 2015-03-07 13:08:23.000000000 +0000 @@ -21,6 +21,7 @@ // with this program. If not, see . //############################################################################## #include +#include #include #include "tdp-provider.h" @@ -186,8 +187,19 @@ if(path == NULL) continue; - dropbox_write(io_channel, "\t"); - dropbox_write(io_channel, path); + if(!g_utf8_validate(path, -1, NULL)) + continue; + + char *real_path = realpath(path, NULL); + if(real_path) { + dropbox_write(io_channel, "\t"); + dropbox_write(io_channel, real_path); + free(real_path); + real_path = NULL; + } else { + dropbox_write(io_channel, "\t"); + dropbox_write(io_channel, path); + } filelist = g_list_append(filelist, path); } diff -Nru thunar-dropbox-0.2.0/wscript thunar-dropbox-0.2.1/wscript --- thunar-dropbox-0.2.0/wscript 2011-01-18 19:22:06.000000000 +0000 +++ thunar-dropbox-0.2.1/wscript 2015-03-07 14:43:32.000000000 +0000 @@ -4,7 +4,7 @@ import Utils import Build -VERSION = '0.2.0' +VERSION = '0.2.1' APPNAME = 'thunar-dropbox' top = '.' @@ -13,11 +13,13 @@ def set_options(opt): opt.tool_options('compiler_cc') opt.tool_options('gnu_dirs') + opt.add_option('--libdir', action='store', default="${PREFIX}/lib", help="libdir") def configure(conf): conf.check_tool('compiler_cc') conf.check_cfg(package='thunarx-2', uselib_store='THUNARX', mandatory=True, args='--cflags --libs') conf.check_cfg(package='gio-2.0', uselib_store='GIO', mandatory=True, args='--cflags --libs') + conf.env.LIBDIR= Options.options.libdir def build(bld): prog = bld.new_task_gen('cc', 'cshlib') @@ -26,8 +28,8 @@ prog.uselib = 'THUNARX THUNARVFS' prog.includes = 'src' prog.find_sources_in_dirs('src') - bld.install_files('${PREFIX}/share/icons/hicolor/16x16/apps', 'data/icons/hicolor/16x16/apps/thunar-dropbox.png') - bld.install_as('${PREFIX}/lib/thunarx-2/thunar-dropbox.so', 'libthunar-dropbox.so') + bld.install_files ('${PREFIX}/share/icons/hicolor/16x16/apps', 'data/icons/hicolor/16x16/apps/thunar-dropbox.png') + bld.install_as (bld.env.LIBDIR + '/thunarx-2/thunar-dropbox.so', 'libthunar-dropbox.so', chmod=0755) def shutdown(): if Options.commands['install'] or Options.commands['uninstall']: