[Merge] ~rs2009/unity:master into unity:master

[Dmitry Shachnev]

Review: Needs Fixing

Left some inline comments.

And regarding EmptyTrash change: system() is executing the command in a shell, which is very inefficient.

What was wrong with the previous code? org.gnome.Nautilus.FileOperations2 is a modern interface and it works for me.

What I can suggest, in order of preference:

1) Figure out what's wrong with old code and fix it.
2) Show a dialog with GTK API and then empty trash with GIO API.
3) Show a dialog with GTK API and then empty trash using a gio subprocess.
4) Show a dialog with zenity subprocess, then empty trash using gio subprocess, but use secure API to run a subprocess, not shell.

Diff comments:

> diff --git a/AUTHORS b/AUTHORS
> index 007b35a..f304a63 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -1,3 +1,5 @@
> + Rudra Saraswat <rs2009 at ubuntu.com>
> + Khurshid Alam <khurshid.alam at linuxmail.org>

Please keep this list sorted alphabetically.

>   3v1n0 <mail at 3v1n0.net>
>   Adam Conrad <adconrad at 0c3.net>
>   agateau <aurelien.gateau at canonical.com>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 76ff07f..f6418c0 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -29,7 +29,7 @@ option(
>  option(
>    ENABLE_UNIT_TESTS
>    "Enable Unity Unit Tests"
> -  ON
> +  OFF

Why?

>  )
>  
>  # This is due to bug lp:668799 - qemu-arm segfaults executing msgmerge
> diff --git a/debian/rules b/debian/rules
> index 4b29c43..b0ee965 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -54,9 +54,10 @@ override_dh_shlibdeps:
>  	dh_shlibdeps -l$(LIBUNITY_PRIVATE) -O--parallel
>  
>  override_dh_auto_test:
> -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
> -	make -C obj-$(DEB_HOST_GNU_TYPE) check-headless
> -endif
> +#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
> +#	make -C obj-$(DEB_HOST_GNU_TYPE) check-headless

Don't do this please.

The best thing would be to fix the tests. As a second option, just replace "make" with "-make". This way tests will still run, but their result will be ignored.

> +#endif
> +	@true
>  
>  %:
>  	dh $@ --with translations,quilt,python3,migrations --parallel


-- 
https://code.launchpad.net/~rs2009/unity/+git/unity/+merge/429299
Your team Unity Team is subscribed to branch unity:master.