From 07b72560c7c9b4947ab709b1cae62b4f781f7f88 Mon Sep 17 00:00:00 2001
From: Santiago Collazo <scollazo@activitycentral.com>
Date: Sat, 22 Dec 2012 16:40:21 +0000
Subject: Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel

---
diff --git a/configure.ac b/configure.ac
index 97fcf0f..df4e851 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT([Sugar],[0.98.2],[],[sugar])
+AC_INIT([Sugar],[0.98.3],[],[sugar])
 
 AC_PREREQ([2.59])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([configure.ac])
 
-SUCROSE_VERSION="0.98.2"
+SUCROSE_VERSION="0.98.3"
 AC_SUBST(SUCROSE_VERSION)
 
 AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
diff --git a/src/jarabe/frame/clipboardicon.py b/src/jarabe/frame/clipboardicon.py
index b3fdccc..26af595 100644
--- a/src/jarabe/frame/clipboardicon.py
+++ b/src/jarabe/frame/clipboardicon.py
@@ -99,12 +99,15 @@ class ClipboardIcon(RadioToolButton):
                 self.owns_clipboard = True
 
     def _clipboard_data_get_cb(self, x_clipboard, selection, info, targets):
-        if not selection.target in [target[0] for target in targets]:
+        selection_target = selection.get_target()
+        entries_targets = [entry.target for entry in targets]
+        if not str(selection_target) in entries_targets:
             logging.warning('ClipboardIcon._clipboard_data_get_cb: asked %s' \
-                            ' but only have %r.', selection.target, targets)
+                            ' but only have %r.', selection_target,
+                            entries_targets)
             return
-        data = self._cb_object.get_formats()[selection.target].get_data()
-        selection.set(selection.target, 8, data)
+        data = self._cb_object.get_formats()[str(selection_target)].get_data()
+        selection.set(selection_target, 8, data)
 
     def _clipboard_clear_cb(self, x_clipboard, targets):
         logging.debug('ClipboardIcon._clipboard_clear_cb')
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
index bef007b..e6766fb 100644
--- a/src/jarabe/frame/clipboardmenu.py
+++ b/src/jarabe/frame/clipboardmenu.py
@@ -51,8 +51,6 @@ class ClipboardMenu(Palette):
         cb_service.connect('object-state-changed',
                            self._object_state_changed_cb)
 
-        self._progress_bar = None
-
         self._remove_item = MenuItem(pgettext('Clipboard', 'Remove'),
                                      'list-remove')
         self._remove_item.connect('activate', self._remove_item_activate_cb)
@@ -128,8 +126,6 @@ class ClipboardMenu(Palette):
             self._open_item.props.sensitive = False
             self._journal_item.props.sensitive = False
 
-        self._update_progress_bar()
-
     def _get_activities(self):
         mime_type = self._cb_object.get_mime_type()
         if not mime_type:
@@ -142,21 +138,6 @@ class ClipboardMenu(Palette):
         else:
             return ''
 
-    def _update_progress_bar(self):
-        percent = self._cb_object.get_percent()
-        if percent == 100.0:
-            if self._progress_bar:
-                self._progress_bar = None
-                self.set_content(None)
-        else:
-            if self._progress_bar is None:
-                self._progress_bar = Gtk.ProgressBar()
-                self._progress_bar.show()
-                self.set_content(self._progress_bar)
-
-            self._progress_bar.props.fraction = percent / 100.0
-            self._progress_bar.props.text = '%.2f %%' % percent
-
     def _object_state_changed_cb(self, cb_service, cb_object):
         if cb_object != self._cb_object:
             return
@@ -168,7 +149,6 @@ class ClipboardMenu(Palette):
         preview = self._cb_object.get_preview()
         if preview:
             self.props.secondary_text = GLib.markup_escape_text(preview)
-        self._update_progress_bar()
         self._update_items_visibility()
         self._update_open_submenu()
 
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 7891dc3..a1ffba7 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -937,7 +937,7 @@ class ClipboardMenu(BaseCopyMenuItem):
             return False
 
         clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
-        clipboard.set_with_data([('text/uri-list', 0, 0)],
+        clipboard.set_with_data([Gtk.TargetEntry.new('text/uri-list', 0, 0)],
                                 self.__clipboard_get_func_cb,
                                 self.__clipboard_clear_func_cb,
                                 metadata)
diff --git a/src/jarabe/view/virtualkeyboard.py b/src/jarabe/view/virtualkeyboard.py
index fc76dff..b8b9fd6 100644
--- a/src/jarabe/view/virtualkeyboard.py
+++ b/src/jarabe/view/virtualkeyboard.py
@@ -1277,17 +1277,17 @@ class Teclado:
         box_hablar = Gtk.VBox(False, 10)
         box_hablar.set_border_width(20)
 
-        button = Gtk.RadioButton(None, "HABLAR AL BARRER BOTONES.")
+        button = Gtk.RadioButton.new_with_label(None, "HABLAR AL BARRER BOTONES.")
         button.connect("toggled", self.set_opciones_hablar, "BARRER")
         if (self.get_opciones_hablar()=="BARRER"):
             button.set_active(True)
         box_hablar.pack_start(button, True, True, 0)
-        button = Gtk.RadioButton(button, "HABLAR AL ESCRIBIR.")
+        button = Gtk.RadioButton.new_with_label_from_widget(button, "HABLAR AL ESCRIBIR.")
         button.connect("toggled", self.set_opciones_hablar, "ESCRIBIR")
         if (self.get_opciones_hablar()=="ESCRIBIR"):
             button.set_active(True)
         box_hablar.pack_start(button, True, True, 0)
-        button = Gtk.RadioButton(button, "NO HABLAR.")
+        button = Gtk.RadioButton.new_with_label_from_widget(button, "NO HABLAR.")
         button.connect("toggled", self.set_opciones_hablar, "NUNCA")
         if (self.get_opciones_hablar()=="NUNCA"):
             button.set_active(True)
--
cgit v0.9.1