diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | dbus-installed-094.conf.in | 26 | ||||
-rw-r--r-- | dbus-installed.conf.in | 1 | ||||
-rw-r--r-- | dbus-uninstalled-094.conf | 25 | ||||
-rw-r--r-- | dbus-uninstalled.conf | 1 | ||||
-rwxr-xr-x | sugar-emulator | 5 | ||||
-rw-r--r-- | sugar/__installed__.py.in | 1 | ||||
-rw-r--r-- | sugar/__uninstalled__.py | 1 | ||||
-rw-r--r-- | sugar/env.py | 3 |
11 files changed, 66 insertions, 3 deletions
@@ -25,6 +25,7 @@ missing py-compile stamp-h1 dbus-installed.conf +dbus-installed-094.conf intltool-extract intltool-extract.in intltool-merge diff --git a/Makefile.am b/Makefile.am index adb34ab..58822d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = activities lib po shell sugar services tools ACLOCAL_AMFLAGS = -I m4 dbusconfdir = $(pkgdatadir) -dbusconf_DATA = dbus-installed.conf +dbusconf_DATA = dbus-installed.conf dbus-installed-094.conf bin_SCRIPTS = \ sugar-emulator \ diff --git a/configure.ac b/configure.ac index 0426c2d..e62cb43 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Sugar],[0.47],[],[sugar]) +AC_INIT([Sugar],[0.48],[],[sugar]) AC_PREREQ([2.59]) @@ -51,6 +51,7 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile dbus-installed.conf +dbus-installed-094.conf activities/Makefile activities/web/Makefile activities/chat/Makefile diff --git a/dbus-installed-094.conf.in b/dbus-installed-094.conf.in new file mode 100644 index 0000000..7b6d607 --- /dev/null +++ b/dbus-installed-094.conf.in @@ -0,0 +1,26 @@ +<!-- 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> diff --git a/dbus-installed.conf.in b/dbus-installed.conf.in index 7b6d607..4e81197 100644 --- a/dbus-installed.conf.in +++ b/dbus-installed.conf.in @@ -10,6 +10,7 @@ <listen>unix:tmpdir=/tmp</listen> + <standard_session_servicedirs /> <servicedir>@prefix@/share/sugar/activities</servicedir> <servicedir>@prefix@/share/sugar/services</servicedir> <servicedir>/tmp/sugar-services</servicedir> diff --git a/dbus-uninstalled-094.conf b/dbus-uninstalled-094.conf new file mode 100644 index 0000000..fbed2d6 --- /dev/null +++ b/dbus-uninstalled-094.conf @@ -0,0 +1,25 @@ +<!-- 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> diff --git a/dbus-uninstalled.conf b/dbus-uninstalled.conf index fbed2d6..ed3dc74 100644 --- a/dbus-uninstalled.conf +++ b/dbus-uninstalled.conf @@ -10,6 +10,7 @@ <listen>unix:tmpdir=/tmp</listen> + <standard_session_servicedirs /> <servicedir>/tmp/sugar</servicedir> <servicedir>/tmp/sugar-services</servicedir> diff --git a/sugar-emulator b/sugar-emulator index e9ba62c..6635a39 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -73,6 +73,9 @@ emulator.start() if env.get_dbus_version() < '0.95': 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', - '--config-file=%s' % env.get_dbus_config(), program) + '--config-file=%s' % dbus_config, program) diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index 832fca5..78489f4 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -4,4 +4,5 @@ sugar_activities_dir = '@prefix@/share/sugar/activities' sugar_activity_info_dir = '@prefix@/share/sugar/activities' sugar_services_dir = '@prefix@/share/sugar/services' 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' diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index e0bfc29..121e050 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -9,4 +9,5 @@ sugar_services_dir = os.path.join(_sourcedir, 'services') sugar_activity_info_dir = _tmpdir sugar_activities_dir = os.path.join(_sourcedir, 'activities') 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') diff --git a/sugar/env.py b/sugar/env.py index 3f958b2..209f346 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -54,6 +54,9 @@ def get_services_dir(): def get_dbus_config(): return sugar_dbus_config +def get_dbus_config_094(): + return sugar_dbus_config_094 + def get_shell_bin_dir(): return sugar_shell_bin_dir |