diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-07 17:26:01 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-06-07 17:26:01 (GMT) |
| commit | 8ae9f4354061591bc0284cc53546ac481f6c1f5a (patch) | |
| tree | 6bb3633ed31f367578446c0641f60033f83d7ecd /sugar | |
| parent | a0ed2fa232f54a93199c94f8efff169d52556667 (diff) | |
ugly workaround for a dbus < 0.61 bug
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/shell/activity.py | 2 | ||||
| -rwxr-xr-x | sugar/shell/shell.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sugar/shell/activity.py b/sugar/shell/activity.py index 2518444..47506d0 100644 --- a/sugar/shell/activity.py +++ b/sugar/shell/activity.py @@ -246,7 +246,7 @@ class Activity(object): """Marks this Activity as having changes. This usually means that this Activity's tab turns a red color or something else to notify the user that this Activity needs attention.""" - if not self.has_focus() and has_changes: + if not self.get_has_focus() and has_changes: self._activity_object.set_has_changes(True) else: self._activity_object.set_has_changes(False) diff --git a/sugar/shell/shell.py b/sugar/shell/shell.py index 7c703c5..2567491 100755 --- a/sugar/shell/shell.py +++ b/sugar/shell/shell.py @@ -152,6 +152,9 @@ class ActivityHost(dbus.service.Object): #print " data = ", data pixstr = "" for c in data: + # Work around for a bug in dbus < 0.61 where integers + # are not correctly marshalled + if c < 0: c += 256 pixstr += chr(c) pixbuf = gtk.gdk.pixbuf_new_from_data(pixstr, colorspace, has_alpha, bits_per_sample, width, height, rowstride) |