diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-22 14:40:08 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-22 14:40:08 (GMT) |
| commit | 778b26c1538e8b41fe921bd1d5b0a12d039e0d1d (patch) | |
| tree | 0725508412c07710b10ea7161e03cffb898717ba | |
| parent | fbacc3011c105dac6120a47655855389ae88dbac (diff) | |
| parent | 71ef1f71d463b571d4264258b8a22b266111fa50 (diff) | |
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/transitionbox.py | 8 | ||||
| -rw-r--r-- | src/jarabe/model/session.py | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 85dd92e..87cac82 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT([Sugar],[0.98.4],[],[sugar]) +AC_INIT([Sugar],[0.98.6],[],[sugar]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([configure.ac]) -SUCROSE_VERSION="0.98.4" +SUCROSE_VERSION="0.98.6" AC_SUBST(SUCROSE_VERSION) AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) diff --git a/src/jarabe/desktop/transitionbox.py b/src/jarabe/desktop/transitionbox.py index b124b14..3f8650a 100644 --- a/src/jarabe/desktop/transitionbox.py +++ b/src/jarabe/desktop/transitionbox.py @@ -18,9 +18,9 @@ from gi.repository import GObject from sugar3.graphics import style from sugar3.graphics import animator +from sugar3.graphics.icon import Icon from jarabe.model.buddy import get_owner_instance -from jarabe.view.buddyicon import BuddyIcon from jarabe.desktop.viewcontainer import ViewContainer from jarabe.desktop.favoriteslayout import SpreadLayout @@ -49,8 +49,10 @@ class TransitionBox(ViewContainer): layout = SpreadLayout() # Round off icon size to an even number to ensure that the icon - self._owner_icon = BuddyIcon(buddy=get_owner_instance(), - pixel_size=style.XLARGE_ICON_SIZE & ~1) + owner = get_owner_instance() + self._owner_icon = Icon(icon_name='computer-xo', + xo_color=owner.get_color(), + pixel_size=style.XLARGE_ICON_SIZE & ~1) ViewContainer.__init__(self, layout, self._owner_icon) self._animator = animator.Animator(0.3) diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index a5cd4a4..7394ef0 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -29,7 +29,7 @@ _session_manager = None def have_systemd(): - return os.access("/sys/fs/cgroup/systemd", 0) >= 0 + return os.access("/run/systemd/seats", 0) >= 0 class SessionManager(session.SessionManager): |