X-Git-Url: http://git.maemo.org/git/?p=vicar;a=blobdiff_plain;f=qtc_packaging%2Fdebian_harmattan%2Fprerm;h=d4b71f20b69ba41dbd3114493513e9a4954b32c8;hp=e650ab5246c45b9c872b322cddca376af39d6c88;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hpb=f8710fc521c8941fc417018999806695ace8a2cb

diff --git a/qtc_packaging/debian_harmattan/prerm b/qtc_packaging/debian_harmattan/prerm
index e650ab5..d4b71f2 100755
--- a/qtc_packaging/debian_harmattan/prerm
+++ b/qtc_packaging/debian_harmattan/prerm
@@ -20,6 +20,7 @@ set -e
 case "$1" in
     remove|deconfigure)
 
+<<<<<<< HEAD
         echo "Deleting Vicar Telepathy account ..."
         [[ -x /opt/vicar/bin/vicar-utils ]] && /opt/vicar/bin/vicar-utils REMOVE
 
@@ -28,6 +29,17 @@ case "$1" in
 
         #echo "Deleting Vicar Profiles database ..."
         #[[ -d /home/user/.vicar ]] && rm -rf /home/user/.vicar/
+=======
+	eval $(dbus-launch --sh-syntax)
+	export DBUS_SESSION_BUS_ADDRESS
+	export DBUS_SESSION_BUS_PID
+
+        echo "Deleting Vicar Telepathy account ..."
+        #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils REMOVE"
+
+        echo "Deleting Vicar Profiles database ..."
+        #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils DROPDB"
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 
 	# Kill any running instances of the daemon (only used on Linux based systems)
 	killall -q vicar-daemon || true