summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-13 06:57:43 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-13 07:01:36 +0100
commite2119a1055fa656802191253c7526284c1016198 (patch)
tree47711823a9b844aea39353f106a2e44d05c24139 /perl-install/install
parent29d9934ca3d8493b249efc6b883590fdbc08408a (diff)
downloaddrakx-e2119a1055fa656802191253c7526284c1016198.tar
drakx-e2119a1055fa656802191253c7526284c1016198.tar.gz
drakx-e2119a1055fa656802191253c7526284c1016198.tar.bz2
drakx-e2119a1055fa656802191253c7526284c1016198.tar.xz
drakx-e2119a1055fa656802191253c7526284c1016198.zip
revert back to matchbox instead of mutter
rationale: it doesn't fix diskdrake issues (mga#11977) whereas it doesn't draw window decorations w/o any window manager (mga#12218) basically reverting commit 19a11905a998a1e62fb8f32aeb749f1b5a9bafd6
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/share/list.xml7
-rw-r--r--perl-install/install/steps_gtk.pm2
3 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 24d8fbd6f..bc00fb9d8 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,8 @@
- partitioning:
o do not propose check bad blocks for btrfs (Manuel Hiebel, mga#10116)
+- revert back to matchbox instead of mutter as it doesn't fix
+ diskdrake issues (mga#11977)
+ (thus fixing missing window decorations (mga#12218))
Version 16.20 - 6 January 2014
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 1ca4f80cf..094f59ce7 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -240,7 +240,8 @@
/sbin/mount.ntfs-3g <!-- cannot be expanded as binary, not executable for all users -->
/sbin/blkid
- /usr/bin/mutter
+ /usr/bin/drakx-matchbox-window-manager
+ /usr/share/matchbox/mbnoapp.xpm
/usr/share/icons/gnome/scalable/status/dialog-warning-symbolic.svg
@@ -297,6 +298,10 @@
</if>
<from expand="glob">
+ <!-- needed by matchbox -->
+ <from spaces_in_filename="1">
+ /usr/share/themes/Ia Ora*/matchbox/*
+ </from>
/usr/share/themes/oxygen-gtk*
/usr/LIB/gdk-pixbuf-2.0/*/loaders.cache
/usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index caeaf997c..166bb7770 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -46,7 +46,7 @@ sub new($$) {
run_program::run('xset', 'm', '1/8', '1');
}
any::disable_x_screensaver();
- run_program::raw({ detach => 1 }, 'mutter');
+ run_program::raw({ detach => 1 }, 'drakx-matchbox-window-manager');
install::gtk::init_gtk($o);
install::gtk::init_sizes($o);
install::gtk::install_theme($o);