r2588 - people/synrg/xjig

[Ben Armstrong]

Author: synrg
Date: 2007-04-22 17:34:51 +0000 (Sun, 22 Apr 2007)
New Revision: 2588

Modified:
   people/synrg/xjig/xjig-menu
Log:
kdeinit check and shutdown

Modified: people/synrg/xjig/xjig-menu
===================================================================
--- people/synrg/xjig/xjig-menu	2007-04-22 13:17:11 UTC (rev 2587)
+++ people/synrg/xjig/xjig-menu	2007-04-22 17:34:51 UTC (rev 2588)
@@ -126,9 +126,6 @@
 Cleanup ()
 {
    rm -f "$tmperr" "$tmpout"
-   if [ $kde_initialized -eq 1 ] ; then
-      kdeinit_shutdown
-   fi
 }
 
 Zenity ()
@@ -179,9 +176,13 @@
 SetupDialog ()
 {
    if [ "$dialog" = "kdialog" ] ; then 
-      dcopid="$(dcopserver --serverid 2>&1)"
-      if [ -z "$dcopid" ] ; then
-         kdeinit &>/dev/null
+      if [ -x "/usr/bin/kcheckrunning" ] ; then
+         krunning="$(kcheckrunning 2>&1)"
+      else
+         krunning="$(dcopserver --serverid 2>&1)"
+      fi
+      if [ -z "$krunning" ] ; then
+         kdeinit --suicide &>/dev/null
          export kde_initialized=1
       fi
    fi