Merge commit 'refs/top-bases/t/set-window-icon' into t/set-window-icon

7 files changed, 61 insertions, 34 deletions

diff --git a/configure.ac b/configure.ac
index ca4d32c..41798ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-toolkit],[0.89.5],[],[sugar-toolkit])
+AC_INIT([sugar-toolkit],[0.90.1],[],[sugar-toolkit])
 
 AC_PREREQ([2.59])
 
diff --git a/po/de.po b/po/de.po
index 5ee3a4d..63f1032 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,13 +13,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # Markus Schlager <m.slg@gmx.de>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: sugar-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-01-20 13:10-0500\n"
-"PO-Revision-Date: 2010-03-26 20:39+0200\n"
+"PO-Revision-Date: 2010-09-20 18:17+0200\n"
 "Last-Translator: Markus <m.slg@gmx.de>\n"
 "Language-Team: OLPC-German <LL@li.org>\n"
 "Language: de\n"
@@ -40,7 +44,7 @@ msgstr "Fehler beim Speichern"
 
 #: ../src/sugar/activity/activity.py:739
 msgid "Keep error: all changes will be lost"
-msgstr "Fehler beim Speichern: Alle Änderungen gehen verloren"
+msgstr "Fehler beim Speichern: Alle Änderungen gehen verloren."
 
 #: ../src/sugar/activity/activity.py:742
 msgid "Don't stop"
@@ -114,7 +118,7 @@ msgstr "Ok"
 
 #: ../src/sugar/graphics/alert.py:375
 msgid "Continue"
-msgstr "Weitermachen"
+msgstr "Fortsetzen"
 
 #: ../src/sugar/graphics/colorbutton.py:52
 msgid "Choose a color"
diff --git a/po/es.po b/po/es.po
index 183a54e..22d6798 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,42 +2,50 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 13:10-0500\n"
-"PO-Revision-Date: 2010-03-11 23:18+0200\n"
-"Last-Translator: Roger Orellana <rjorellana@gmail.com>\n"
+"POT-Creation-Date: 2010-09-28 06:08-0400\n"
+"PO-Revision-Date: 2010-09-28 13:10+0200\n"
+"Last-Translator: Tomeu Vizoso <tomeu@tomeuvizoso.net>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.3\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: .\n"
 
-#: ../src/sugar/activity/activity.py:338
+#: ../src/sugar/activity/activity.py:336
 #, python-format
 msgid "%s Activity"
 msgstr "Actividad %s"
 
-#: ../src/sugar/activity/activity.py:738
+#: ../src/sugar/activity/activity.py:791
 msgid "Keep error"
 msgstr "Error al guardar"
 
-#: ../src/sugar/activity/activity.py:739
+#: ../src/sugar/activity/activity.py:792
 msgid "Keep error: all changes will be lost"
 msgstr "Error al guardar: todos los cambios se perderán"
 
-#: ../src/sugar/activity/activity.py:742
+#: ../src/sugar/activity/activity.py:795
 msgid "Don't stop"
 msgstr "No detener"
 
-#: ../src/sugar/activity/activity.py:745
+#: ../src/sugar/activity/activity.py:798
 msgid "Stop anyway"
 msgstr "Detener de todas formas"
 
@@ -50,9 +58,9 @@ msgstr "Nombre esta entrada"
 # self._stop_item.connect('activate', self._stop_item_activate_cb)
 # self.append_menu_item(self._stop_item)
 #: ../src/sugar/activity/namingalert.py:87
-#: ../src/sugar/activity/widgets.py:166
+#: ../src/sugar/activity/widgets.py:169
 msgid "Keep"
-msgstr "Guardar"
+msgstr "Guardar copia"
 
 #: ../src/sugar/activity/namingalert.py:283
 msgid "Untitled"
@@ -82,31 +90,32 @@ msgstr "Rehacer"
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/sugar/activity/widgets.py:117
+#: ../src/sugar/activity/widgets.py:118
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../src/sugar/activity/widgets.py:127
+#: ../src/sugar/activity/widgets.py:129
 msgid "Private"
 msgstr "Privado"
 
-#: ../src/sugar/activity/widgets.py:134
+#: ../src/sugar/activity/widgets.py:136
 msgid "My Neighborhood"
 msgstr "Mi Vecindario"
 
-#: ../src/sugar/activity/widgets.py:345
+#: ../src/sugar/activity/widgets.py:349
 msgid "Activity"
 msgstr "Actividad"
 
-#: ../src/sugar/graphics/alert.py:286 ../src/sugar/graphics/alert.py:365
+#: ../src/sugar/graphics/alert.py:287 ../src/sugar/graphics/alert.py:410
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/sugar/graphics/alert.py:290 ../src/sugar/graphics/alert.py:424
+#: ../src/sugar/graphics/alert.py:291 ../src/sugar/graphics/alert.py:336
+#: ../src/sugar/graphics/alert.py:469
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../src/sugar/graphics/alert.py:375
+#: ../src/sugar/graphics/alert.py:420
 msgid "Continue"
 msgstr "Continuar"
 
diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py
index 3a3950d..c04257a 100644
--- a/src/sugar/activity/main.py
+++ b/src/sugar/activity/main.py
@@ -56,7 +56,7 @@ class SingleProcess(dbus.service.Object):
         object_path = get_single_process_path(name_service)
         dbus.service.Object.__init__(self, bus_name, object_path)
 
-    @dbus.service.method("org.laptop.SingleProcess", in_signature="a{ss}")
+    @dbus.service.method("org.laptop.SingleProcess", in_signature="a{sv}")
     def create(self, handle_dict):
         handle = activityhandle.create_from_dict(handle_dict)
         create_activity_instance(self.constructor, handle)
@@ -76,7 +76,7 @@ def main():
                       action='store_true',
                       help='start all the instances in the same process')
     parser.add_option('-i', '--invited', dest='invited',
-                      action='store_true',
+                      action='store_true', default=False,
                       help='the activity is being launched for handling an '
                            'invite from the network')
     (options, args) = parser.parse_args()
@@ -146,7 +146,8 @@ def main():
             SingleProcess(service_name, activity_constructor)
         else:
             single_process = sessionbus.get_object(service_name, service_path)
-            single_process.create(activity_handle.get_dict())
+            single_process.create(activity_handle.get_dict(),
+                                  dbus_interface='org.laptop.SingleProcess')
 
             print 'Created %s in a single process.' % service_name
             sys.exit(0)
diff --git a/src/sugar/graphics/icon.py b/src/sugar/graphics/icon.py
index 4a94479..100f05a 100644
--- a/src/sugar/graphics/icon.py
+++ b/src/sugar/graphics/icon.py
@@ -142,7 +142,7 @@ class _IconBuffer(object):
             if self.width != None:
                 size = self.width
 
-            info = theme.lookup_icon(self.icon_name, size, 0)
+            info = theme.lookup_icon(self.icon_name, int(size), 0)
             if info:
                 attach_x, attach_y = self._get_attach_points(info, size)
 
@@ -159,7 +159,7 @@ class _IconBuffer(object):
 
     def _draw_badge(self, context, size, sensitive, widget):
         theme = gtk.icon_theme_get_default()
-        badge_info = theme.lookup_icon(self.badge_name, size, 0)
+        badge_info = theme.lookup_icon(self.badge_name, int(size), 0)
         if badge_info:
             badge_file_name = badge_info.get_filename()
             if badge_file_name.endswith('.svg'):
@@ -276,10 +276,12 @@ class _IconBuffer(object):
         padding = badge_info.icon_padding
         width, height = self._get_size(icon_width, icon_height, padding)
         if self.background_color is None:
-            surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
+            surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, int(width),
+                                         int(height))
             context = cairo.Context(surface)
         else:
-            surface = cairo.ImageSurface(cairo.FORMAT_RGB24, width, height)
+            surface = cairo.ImageSurface(cairo.FORMAT_RGB24, int(width),
+                                         int(height))
             context = cairo.Context(surface)
             context = gtk.gdk.CairoContext(context)
             context.set_source_color(self.background_color)
diff --git a/src/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py
index 862d6d0..51d8625 100644
--- a/src/sugar/presence/presenceservice.py
+++ b/src/sugar/presence/presenceservice.py
@@ -42,6 +42,8 @@ _logger = logging.getLogger('sugar.presence.presenceservice')
 ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
 ACCOUNT_MANAGER_PATH = '/org/freedesktop/Telepathy/AccountManager'
 
+CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'
+
 class PresenceService(gobject.GObject):
     """Provides simplified access to the Telepathy framework to activities"""
     __gsignals__ = {
@@ -80,7 +82,9 @@ class PresenceService(gobject.GObject):
                     continue
                 logging.debug("Calling GetActivity on %s", account_path)
                 try:
-                    room_handle = connection.connection.GetActivity(activity_id)
+                    room_handle = connection.connection.GetActivity(
+                            activity_id,
+                            dbus_interface=CONN_INTERFACE_ACTIVITY_PROPERTIES)
                 except dbus.exceptions.DBusException, e:
                     name = 'org.freedesktop.Telepathy.Error.NotAvailable'
                     if e.get_dbus_name() == name:
diff --git a/src/sugar/util.py b/src/sugar/util.py
index b947c0a..3625f21 100644
--- a/src/sugar/util.py
+++ b/src/sugar/util.py
@@ -271,10 +271,17 @@ def timestamp_to_elapsed_string(timestamp, max_levels=2):
             if key in _i18n_timestamps_cache:
                 time_period += _i18n_timestamps_cache[key]
             else:
-                translation = gettext.dngettext('sugar-toolkit',
-                                                name_singular,
-                                                name_plural,
-                                                elapsed_units) % elapsed_units
+                tmp = gettext.dngettext('sugar-toolkit',
+                                        name_singular,
+                                        name_plural,
+                                        elapsed_units)
+                # FIXME: This is a hack so we don't crash when a translation
+                # doesn't contain the expected number of placeholders (#2354)
+                try:
+                    translation = tmp % elapsed_units
+                except TypeError:
+                    translation = tmp
+
                 _i18n_timestamps_cache[key] = translation
                 time_period += translation