Merge lp:~dbarth/unity/disable-cache into lp:unity

[David Barth]

Env. variable quirk to disable effects caches for the panel and the launcher.

[Mikkel Kamstrup Erlandsen (kamstrup)]

See also lp:~unity-team/clutk/clutk.no-effects

=== modified file 'unity-private/Makefile.am'
--- unity-private/Makefile.am	2010-09-16 12:42:01 +0000
+++ unity-private/Makefile.am	2010-10-01 09:25:59 +0000
@@ -72,6 +72,7 @@
 private_sources = \
   application.vala \
   unity.vala \
+  unity-quirks.vala \
   utils.vala
 
 panel_sources = \

=== modified file 'unity-private/launcher/launcher.vala'
--- unity-private/launcher/launcher.vala	2010-08-02 09:16:36 +0000
+++ unity-private/launcher/launcher.vala	2010-10-01 09:25:59 +0000
@@ -32,8 +32,10 @@
 
       this.cache = new Ctk.EffectCache ();
       this.add_effect (this.cache);
-
       this.cache.update_texture_cache ();
+
+	  if (Unity.Quirks.effects_disabled ())
+		  this.remove_effect (cache);
     }
 
     construct

=== modified file 'unity-private/panel/panel-view.vala'
--- unity-private/panel/panel-view.vala	2010-09-13 15:46:12 +0000
+++ unity-private/panel/panel-view.vala	2010-10-01 09:25:59 +0000
@@ -92,6 +92,7 @@
       button_release_event.connect (on_button_release_event);
 
       cache = new Ctk.EffectCache ();
+
       add_effect (cache);
       cache.update_texture_cache ();
       hbox.queue_redraw.connect (() => {
@@ -99,6 +100,9 @@
         cache.update_texture_cache ();
       });
 
+	  if (Unity.Quirks.cache_disabled ())
+		  remove_effect (cache);
+
       END_FUNCTION ();
     }
 

=== added file 'unity-private/unity-quirks.vala'
--- unity-private/unity-quirks.vala	1970-01-01 00:00:00 +0000
+++ unity-private/unity-quirks.vala	2010-10-01 09:25:59 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by David Barth <[e-mail]>
+ *
+ */
+
+namespace Unity.Quirks
+{
+	public bool cache_disabled ()
+	{
+		string? cache = Environment.get_variable ("UNITY_DISABLE_CACHE");
+		return (cache != null) ? true : false;
+	}
+
+	public bool effects_disabled ()
+	{
+		string? effects = Environment.get_variable ("CLUTK_DISABLE_EFFECTS");
+		return (effects != null) ? true : false;
+	}
+}