diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-08-11 15:27:18 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-08-20 13:02:28 (GMT) |
| commit | 2ceb241121d907f666c83928406f35f34f2f751f (patch) | |
| tree | e7832a1f6bfa026ea637314791a9f89386c5d0b8 | |
| parent | c2dbb8d7aa8f5753f9f12d11bf6ed551ac9ff5cb (diff) | |
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.
| -rw-r--r-- | bin/.gitignore | 1 | ||||
| -rw-r--r-- | bin/Makefile.am | 3 | ||||
| -rw-r--r-- | bin/sugar-dbus-launch-helper.in | 6 | ||||
| -rw-r--r-- | configure.ac | 1 |
4 files changed, 1 insertions, 10 deletions
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 |