Author: beatle
Date: 2006-10-13 16:01:24 -0400 (Fri, 13 Oct 2006)
New Revision: 3753
Added:
trunk/app/compiz/debian/patches/013_dont-fail-if-theme-not-found.patch
Modified:
trunk/app/compiz/debian/changelog
trunk/app/compiz/debian/patches/series
Log:
Add a patch that will make compiz use its default theme if the metacity theme
cannot be loaded.
Modified: trunk/app/compiz/debian/changelog
===================================================================
--- trunk/app/compiz/debian/changelog 2006-10-13 19:36:36 UTC (rev 3752)
+++ trunk/app/compiz/debian/changelog 2006-10-13 20:01:24 UTC (rev 3753)
@@ -11,8 +11,6 @@
unstable.
* Install a schemas file for the Gtk window decorator which is used to
enable the use of metacity themes.
- * List copyright holders and contributors in the copyright file.
- Closes: #392422.
* Suggest nvidia-glx (>= 1.0.9625-1). (Closes: #390326).
* Add code to the compiz wrapper to handle the NVIDIA GLX implementation
Closes: #390814.
@@ -26,15 +24,17 @@
* Check if the gconf plugin is installed before trying to load it in the
wrapper.
* Enable building the gconf-dump plugin.
- * Update 010_snap-by-default patch to also include the corresponding schema
- diff.
* Add a README file to the compiz-core package.
+ * List copyright holders and contributors in the copyright file.
+ Closes: #392422.
+ * Add 013_dont-fail-if-theme-not-found.patch which will make compiz use its
+ default theme if the metacity theme cannot be found.
[ David Nusinow ]
* Tighten up all the X library build-depends by explicitly using current
versions. Thanks aj.
- -- Thierry Reding <[EMAIL PROTECTED]> Fri, 13 Oct 2006 17:27:42 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]> Fri, 13 Oct 2006 21:58:37 +0200
compiz (0.0.13+git20060928-2) unstable; urgency=low
Added: trunk/app/compiz/debian/patches/013_dont-fail-if-theme-not-found.patch
===================================================================
--- trunk/app/compiz/debian/patches/013_dont-fail-if-theme-not-found.patch
(rev 0)
+++ trunk/app/compiz/debian/patches/013_dont-fail-if-theme-not-found.patch
2006-10-13 20:01:24 UTC (rev 3753)
@@ -0,0 +1,13 @@
+Index: gtk/window-decorator/gtk-window-decorator.c
+===================================================================
+--- a/gtk/window-decorator/gtk-window-decorator.c
++++ b/gtk/window-decorator/gtk-window-decorator.c
+@@ -5846,6 +5846,8 @@
+ if (theme)
+ {
+ meta_theme_set_current (theme, TRUE);
++ if (!meta_theme_get_current())
++ use_meta_theme = FALSE;
+
+ g_free (theme);
+ }
Modified: trunk/app/compiz/debian/patches/series
===================================================================
--- trunk/app/compiz/debian/patches/series 2006-10-13 19:36:36 UTC (rev
3752)
+++ trunk/app/compiz/debian/patches/series 2006-10-13 20:01:24 UTC (rev
3753)
@@ -3,3 +3,4 @@
010_snap-inverted.patch
011_snap-by-default.patch
012_metacity-theme-support.patch
+013_dont-fail-if-theme-not-found.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
