summaryrefslogtreecommitdiffstats
path: root/move
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-15 10:29:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-15 10:29:18 +0000
commit2ace1ea3a747da72321c6b40feb8a48dfe334989 (patch)
treefe28561ee68c0b2c68e884cf978755766249795b /move
parent447d889a17de502a2f5488dab81d5243cf3c3f9d (diff)
downloaddrakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar.gz
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar.bz2
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar.xz
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.zip
kill kde desktop and kicker when mdk_totem is launched, then restore them
(kded pb still there?)
Diffstat (limited to 'move')
-rw-r--r--move/data/always.list5
-rwxr-xr-xmove/tree/mdk_behind_totem11
-rwxr-xr-xmove/tree/mdk_totem6
3 files changed, 12 insertions, 10 deletions
diff --git a/move/data/always.list b/move/data/always.list
index f5942443e..42d911cc4 100644
--- a/move/data/always.list
+++ b/move/data/always.list
@@ -78,8 +78,6 @@
/usr/lib/kde3/dcopserver.so
/usr/lib/kde3/kded.so
/usr/lib/kde3/kded_mountwatcher.so
-/usr/lib/kde3/kdesktop.so
-/usr/lib/kde3/kicker.so
/usr/lib/kde3/kio_devices.so
/usr/lib/kde3/kio_file.so
/usr/lib/kde3/klauncher.so
@@ -114,15 +112,12 @@
/usr/lib/libkdefx.so.4.2.0
/usr/lib/libkdeinit_dcopserver.so
/usr/lib/libkdeinit_kded.so
-/usr/lib/libkdeinit_kdesktop.so
-/usr/lib/libkdeinit_kicker.so
/usr/lib/libkdeinit_klauncher.so
/usr/lib/libkdeinit_kmix.so
/usr/lib/libkdeinit_ksmserver.so
/usr/lib/libkdeinit_kwin.so
/usr/lib/libkdesu.so.4.2.0
/usr/lib/libkdeui.so.4.2.0
-/usr/lib/libkickermain.so.1.0.0
/usr/lib/libkio.so.4.2.0
/usr/lib/libkmedia2_idl.so.1.0.0
/usr/lib/libkonq.so.4.2.0
diff --git a/move/tree/mdk_behind_totem b/move/tree/mdk_behind_totem
index 62618ea93..3cd68f788 100755
--- a/move/tree/mdk_behind_totem
+++ b/move/tree/mdk_behind_totem
@@ -19,6 +19,11 @@ while [ -n "$1" ]; do
shift
shift
;;
+ --user)
+ USER="$2"
+ shift
+ shift
+ ;;
*)
ok=''
shift
@@ -68,8 +73,10 @@ mount_cd() {
mdk_move_loop to_cdrom always always_i18n totem nvidia
- # tell kicker that it should refetch menu's icons
- dcop kicker ksycoca notifyDatabaseChanged '(' ')'
+ # restore killed kde apps
+ su -c kded $USER
+ su -c kicker $USER
+ su -c kdesktop $USER
}
while [ -e "/proc/$totem_pid" ]; do
diff --git a/move/tree/mdk_totem b/move/tree/mdk_totem
index ca172baa2..2c8888562 100755
--- a/move/tree/mdk_totem
+++ b/move/tree/mdk_totem
@@ -28,8 +28,7 @@ sub busy_pids_and_files() {
sub remove_simple_daemons {
my (@busy) = @_;
foreach (@busy) {
- $_->{to_restart} = 'kdeinit kicker' if $_->{cmdline} =~ m!\b(kicker)\b!;
- $_->{to_kill} = $_->{cmdline} =~ m!\b(kdesud|kded|kio_uiserver|klaptopdaemon|artsd|portmap)\b!;
+ $_->{to_kill} = $_->{cmdline} =~ m!\b(kdesud|kded|kdesktop|kicker|kio_uiserver|klaptopdaemon|artsd|portmap)\b!;
}
my @auto_killed = grep { $_->{to_restart} || $_->{to_kill} } @busy;
@@ -115,5 +114,6 @@ if (my $pid = fork()) {
exec 'sudo', 'mdk_behind_totem',
'--boot-loop', $file2loop{'live_tree_boot.clp'},
'--main-loop', $file2loop{'live_tree.clp'},
- '--totem-pid', $totem_pid;
+ '--totem-pid', $totem_pid,
+ '--user', $ENV{USER};
}