From 2ceb241121d907f666c83928406f35f34f2f751f Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Wed, 11 Aug 2010 15:27:18 +0000
Subject: Revert "Start of channel handling"

This reverts commit b6a8569bc3152e07f3f5423000db391983e57975.

Reverts only the addition of sugar-dbus-launch-helper as activities
are not activated by dbus yet.
---
diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index 9b5ad73..0000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-sugar-dbus-launch-helper
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 8a699dd..05a9215 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -9,7 +9,6 @@ python_scripts =		\
 
 bin_SCRIPTS = 			\
 	sugar			\
-	sugar-dbus-launch-helper	\
 	$(python_scripts)
 
-EXTRA_DIST = $(python_scripts) sugar.in sugar-dbus-launch-helper.in
+EXTRA_DIST = $(python_scripts) sugar.in
diff --git a/bin/sugar-dbus-launch-helper.in b/bin/sugar-dbus-launch-helper.in
deleted file mode 100644
index 4edd547..0000000
--- a/bin/sugar-dbus-launch-helper.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export SUGAR_SCALING=72
-export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
-
-exec $@ &> $HOME/.sugar/$SUGAR_PROFILE/logs/$2.log
diff --git a/configure.ac b/configure.ac
index f846ef6..238aacd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ AM_GCONF_SOURCE_2
 AC_CONFIG_FILES([
 bin/Makefile
 bin/sugar
-bin/sugar-dbus-launch-helper
 data/icons/Makefile
 data/Makefile
 data/sugar-emulator.desktop
--
cgit v0.9.1