From 1fa07961c671b0c7edf35f731b1ad9f6ab798228 Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Fri, 26 Sep 2008 06:46:53 +0000
Subject: Merge branch 'sucrose-0.82' of git+ssh://dev.laptop.org/git/projects/write into sucrose-0.82

---
diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index cd922d0..7112f35 100644
--- a/AbiWordActivity.py
+++ b/AbiWordActivity.py
@@ -284,6 +284,11 @@ class AbiWordActivity (Activity):
         logger.debug("_on_members_changed")
         for handle in removed:
             bus_name = self.participants.pop(handle, None)
+            if bus_name is None:
+                # FIXME: that shouldn't happen so probably hide another bug.
+                # Should be investigated
+                continue
+
             logger.debug('removed handle: %d, with dbus name: %s', handle,
                          bus_name)
             self.abiword_canvas.invoke_cmd('com.abisource.abiword.abicollab.olpc.buddyLeft', bus_name, 0, 0)
diff --git a/NEWS b/NEWS
index cddacbd..2a98f83 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,16 @@
+60
+
+* #8492 fix crash on buddy left (cassidy)
+
 59
 
+* Remove MANIFEST from git (erikos)
+* Add COPYING file (erikos)
+
 58
 
-* Fix 6021: Write crash on buddy left
-* Add license field to activity.info
+* Fix 6021: Write crash on buddy left (morgs)
+* Add license field to activity.info (uwog)
 
 57
 
diff --git a/activity/activity.info b/activity/activity.info
index 8ac0a49..ab94347 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,7 +3,7 @@ name = Write
 service_name = org.laptop.AbiWordActivity
 class = AbiWordActivity.AbiWordActivity
 icon = activity-write
-activity_version = 59
+activity_version = 60
 show_launcher = 1
 mime_types = text/rtf;text/plain;application/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/xhtml+xml;text/html;application/vnd.oasis.opendocument.text
 license = GPLv2+
--
cgit v0.9.1