sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of dbus 0.94 compatibility, since we build dbus in jhbuild now. Yay!

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-11-16 11:07:30 +01:00
parent b51b2917d0
commit 9a7518f230
10 changed files with 3 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,7 +25,6 @@ missing
py-compile py-compile
stamp-h1 stamp-h1
dbus-installed.conf dbus-installed.conf
dbus-installed-094.conf
intltool-extract intltool-extract
intltool-extract.in intltool-extract.in
intltool-merge intltool-merge

2
Makefile.am
View File

@ -3,7 +3,7 @@ SUBDIRS = activities lib po shell sugar services tools
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
dbusconfdir = $(pkgdatadir) dbusconfdir = $(pkgdatadir)
dbusconf_DATA = dbus-installed.conf dbus-installed-094.conf dbusconf_DATA = dbus-installed.conf
bin_SCRIPTS = \ bin_SCRIPTS = \
sugar-emulator \ sugar-emulator \

1
configure.ac
View File

@ -51,7 +51,6 @@ AM_GLIB_GNU_GETTEXT
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
dbus-installed.conf dbus-installed.conf
dbus-installed-094.conf
activities/Makefile activities/Makefile
activities/web/Makefile activities/web/Makefile
activities/chat/Makefile activities/chat/Makefile

26
dbus-installed-094.conf.in
View File

@ -1,26 +0,0 @@
<!-- This configuration file controls the per-user-login-session message bus.
Add a session-local.conf and edit that rather than changing this
file directly. -->
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<!-- Our well-known bus type, don't change this -->
<type>session</type>
<listen>unix:tmpdir=/tmp</listen>
<servicedir>@prefix@/share/sugar/activities</servicedir>
<servicedir>@prefix@/share/sugar/services</servicedir>
<servicedir>/tmp/sugar-services</servicedir>
<policy context="default">
<!-- Allow everything to be sent -->
<allow send_destination="*"/>
<!-- Allow everything to be received -->
<allow eavesdrop="true"/>
<!-- Allow anyone to own anything -->
<allow own="*"/>
</policy>
</busconfig>

25
dbus-uninstalled-094.conf
View File

@ -1,25 +0,0 @@
<!-- This configuration file controls the per-user-login-session message bus.
Add a session-local.conf and edit that rather than changing this
file directly. -->
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<!-- Our well-known bus type, don't change this -->
<type>session</type>
<listen>unix:tmpdir=/tmp</listen>
<servicedir>/tmp/sugar</servicedir>
<servicedir>/tmp/sugar-services</servicedir>
<policy context="default">
<!-- Allow everything to be sent -->
<allow send_destination="*"/>
<!-- Allow everything to be received -->
<allow eavesdrop="true"/>
<!-- Allow anyone to own anything -->
<allow own="*"/>
</policy>
</busconfig>

7
sugar-emulator
View File

@ -76,12 +76,7 @@ for i in range(1, len(sys.argv)):
emulator = Emulator(fullscreen) emulator = Emulator(fullscreen)
emulator.start() emulator.start()
if env.get_dbus_version() < '0.95': dbus_config = env.get_dbus_config()
if not os.path.isdir('/tmp/sugar-services'):
os.mkdir('/tmp/sugar-services')
dbus_config = env.get_dbus_config_094()
else:
dbus_config = env.get_dbus_config()
os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session',
'--config-file=%s' % dbus_config, program) '--config-file=%s' % dbus_config, program)

1
sugar/__installed__.py.in
View File

@ -4,5 +4,4 @@ sugar_activities_dir = '@prefix@/share/sugar/activities'
sugar_activity_info_dir = '@prefix@/share/sugar/activities' sugar_activity_info_dir = '@prefix@/share/sugar/activities'
sugar_services_dir = '@prefix@/share/sugar/services' sugar_services_dir = '@prefix@/share/sugar/services'
sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed-094.conf'
sugar_shell_bin_dir = '@prefix@/bin' sugar_shell_bin_dir = '@prefix@/bin'

1
sugar/__uninstalled__.py
View File

@ -9,5 +9,4 @@ sugar_services_dir = os.path.join(_sourcedir, 'services')
sugar_activity_info_dir = _tmpdir sugar_activity_info_dir = _tmpdir
sugar_activities_dir = os.path.join(_sourcedir, 'activities') sugar_activities_dir = os.path.join(_sourcedir, 'activities')
sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf') sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf')
sugar_dbus_config_094 = os.path.join(_sourcedir, 'dbus-uninstalled-094.conf')
sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell') sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell')

6
sugar/activity/bundleregistry.py
View File

@ -10,11 +10,7 @@ class _ServiceParser(ConfigParser):
class _ServiceManager(object): class _ServiceManager(object):
def __init__(self): def __init__(self):
if env.get_dbus_version() < '0.95': self._path = os.path.expanduser('~/.local/share/dbus-1/services')
self._path = '/tmp/sugar-services'
else:
self._path = os.path.expanduser('~/.local/share/dbus-1/services')
if not os.path.isdir(self._path): if not os.path.isdir(self._path):
os.makedirs(self._path) os.makedirs(self._path)

3
sugar/env.py
View File

@ -54,9 +54,6 @@ def get_services_dir():
def get_dbus_config(): def get_dbus_config():
return sugar_dbus_config return sugar_dbus_config
def get_dbus_config_094():
return sugar_dbus_config_094
def get_shell_bin_dir(): def get_shell_bin_dir():
return sugar_shell_bin_dir return sugar_shell_bin_dir