[Merge] ~kondor-dani/compiz:dbus-bool-fix into compiz:master

[Alberts Muktupāvels]

Diff comments:

> diff --git a/plugins/dbus/src/dbus.cpp b/plugins/dbus/src/dbus.cpp
> index fd322b2..2246e5e 100644
> --- a/plugins/dbus/src/dbus.cpp
> +++ b/plugins/dbus/src/dbus.cpp
> @@ -682,7 +682,7 @@ DbusScreen::getOptionValue (DBusMessageIter   *iter,
>  	break;
>      case CompOption::TypeBell:
>  	{
> -	    bool       bell;
> +	    dbus_bool_t       bell;

One space should be enough here. Make sure that after change both variables remain aligned.

>  	    CompAction action;
>  
>  	    success = tryGetValueWithType (iter, DBUS_TYPE_BOOLEAN, &bell);
> diff --git a/src/screen.cpp b/src/screen.cpp
> index c5e0adc..8323ec4 100644
> --- a/src/screen.cpp
> +++ b/src/screen.cpp
> @@ -366,8 +366,6 @@ cps::EventManager::removeWatchFd (CompWatchFdHandle handle)
>  	return;
>      }
>  
> -    w->destroy();

This should not be here I think!? Does not sound like something that should be prerequisite...

> -
>      watchFds.erase (it);
>  }
>  


-- 
https://code.launchpad.net/~kondor-dani/compiz/+git/compiz/+merge/384374
Your team Compiz Maintainers is requested to review the proposed merge of ~kondor-dani/compiz:dbus-bool-fix into compiz:master.