[olpc-software] sugar - patch

[Marcin Wojdyr]

I had to make a few minor changes in sugar--devel code to make it run 
on my computer (Ubuntu Dapper + xulrunner and gecko-embed from source).
Patch (against hg tip) is attached. 

Another error I see now:

File "/home/wojdyr/olpc/local/lib/python2.4/
site-packages/sugar/shell/activity.py", 
line 249, in set_has_changes
    if not self.get_has_focus() and has_changes:
AttributeError: 'GroupChat' object has no attribute 'get_has_focus'

s/get_has_focus/has_focus/ helps.

There are more errors, I guess you already fixed most of them,
but not committed to the repository yet.

Is this list the right channel for things like these above?
I'd prefer to write it using sugar :), but don't know when it 
will be possible.

BTW, may I know how many people are working on this app?

Marcin

-- 
Marcin Wojdyr  |  http://www.unipress.waw.pl/~wojdyr/
-------------- next part --------------
diff -r 47b2de6636cb sugar/browser/Makefile.am
--- a/sugar/browser/Makefile.am	Tue Jun  6 16:43:26 2006
+++ b/sugar/browser/Makefile.am	Wed Jun  7 15:35:28 2006
@@ -2,7 +2,12 @@
 sugar_PYTHON =			\
 	__init__.py		\
 	browser.py		\
-	NotificationBar.py	
+	NotificationBar.py	\
+	BrowserShell.py         \
+	WebActivity.py          \
+	AddressItem.py          \
+	BrowserActivity.py      \
+	NavigationToolbar.py
 
 icondir = $(pkgdatadir)
 icon_DATA =		\
diff -r 47b2de6636cb sugar/p2p/presence.py
--- a/sugar/p2p/presence.py	Tue Jun  6 16:43:26 2006
+++ b/sugar/p2p/presence.py	Wed Jun  7 15:35:28 2006
@@ -1,6 +1,6 @@
 # -*- tab-width: 4; indent-tabs-mode: t -*- 
 
-import avahi, dbus, dbus.glib, dbus_bindings
+import avahi, dbus, dbus.glib, dbus.dbus_bindings
 
 ACTION_SERVICE_NEW = 'new'
 ACTION_SERVICE_REMOVED = 'removed'
@@ -97,7 +97,7 @@
 					"", "", # domain, host (let the system figure it out)
 					dbus.UInt16(rs_port), info,)
 			g.Commit()
-		except dbus_bindings.DBusException, exc:
+		except dbus.dbus_bindings.DBusException, exc:
 			# FIXME: ignore local name collisions, since that means
 			# the zeroconf service is already registered.  Ideally we
 			# should un-register it an re-register with the correct info
diff -r 47b2de6636cb sugar/shell/Makefile.am
--- a/sugar/shell/Makefile.am	Tue Jun  6 16:43:26 2006
+++ b/sugar/shell/Makefile.am	Wed Jun  7 15:35:28 2006
@@ -2,4 +2,5 @@
 sugar_PYTHON =		\
 	__init__.py	\
 	activity.py	\
-	shell.py
+	shell.py        \
+	PresenceWindow.py
diff -r 47b2de6636cb sugar/shell/shell.py
--- a/sugar/shell/shell.py	Tue Jun  6 16:43:26 2006
+++ b/sugar/shell/shell.py	Wed Jun  7 15:35:28 2006
@@ -152,6 +152,7 @@
 		#print "  data = ", data
 		pixstr = ""
 		for c in data:
+                        if c < 0: c += 256 #I have nagative values here (MW)
 			pixstr += chr(c)
 
 		pixbuf = gtk.gdk.pixbuf_new_from_data(pixstr, colorspace, has_alpha, bits_per_sample, width, height, rowstride)