[Xfce4-commits] [apps/xfdashboard] 02/02: Merge branch 'master' of ssh://git.xfce.org/apps/xfdashboard

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

n   o   m   a   d       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfdashboard.

commit 054f0eeed0520a6319a9ed049eab7ae25c4c79af
Merge: 6b649f5 eab8eec
Author: Stephan Haller <nomad at froevel.de>
Date:   Fri Nov 15 14:13:14 2019 +0100

    Merge branch 'master' of ssh://git.xfce.org/apps/xfdashboard

 data/data/preferences.ui         | 36 +++++++++++++++++++++++++++++-------
 libxfdashboard/theme-animation.c | 19 +++++++++++++++++++
 settings/general.c               | 12 ++++++++++++
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --cc libxfdashboard/theme-animation.c
index 2d83426,1ac0fbd..be57b94
--- a/libxfdashboard/theme-animation.c
+++ b/libxfdashboard/theme-animation.c
@@@ -53,18 -53,11 +54,21 @@@ G_DEFINE_TYPE_WITH_PRIVATE(XfdashboardT
  
  
  /* IMPLEMENTATION: Private variables and methods */
+ #define ENABLE_ANIMATIONS_XFCONF_PROP		"/enable-animations"
+ #define DEFAULT_ENABLE_ANIMATIONS			TRUE
+ 
  enum
  {
 +	TAG_DOCUMENT,
 +	TAG_ANIMATIONS,
 +	TAG_TRIGGER,
 +	TAG_TIMELINE,
 +	TAG_APPLY,
 +	TAG_PROPERTY
 +};
 +
 +enum
 +{
  	XFDASHBOARD_THEME_ANIMATION_APPLY_TO_ORIGIN_SENDER=0,
  	XFDASHBOARD_THEME_ANIMATION_APPLY_TO_ORIGIN_STAGE=1
  };

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.