[Pkg-bazaar-commits] ./bzr-gtk/unstable r106: Merged Alexander Belchenko's bugfixes.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 106
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Wed 2006-10-25 15:35:36 +0200
message:
  Merged Alexander Belchenko's bugfixes.
modified:
  __init__.py
  olive/commit.py
    ------------------------------------------------------------
    revno: 93.1.8
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bzr-gtk.win32.bialix
    timestamp: Wed 2006-10-25 12:21:13 +0300
    message:
      Fix absolute import in gdiff command.
      
      Only gdiff use absolute import from bzrlib.plugins.gtk... 
      And this cause error when bzr-gtk not installed as plugin with 'gtk' name 
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 93.1.9
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bzr-gtk.win32.bialix
    timestamp: Wed 2006-10-25 12:56:13 +0300
    message:
      Fix bug 67927 (non-ascii commit message saved as utf-8 string)
    modified:
      olive/commit.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2006-10-25 09:00:02 +0000
+++ b/__init__.py	2006-10-25 09:21:13 +0000
@@ -71,7 +71,7 @@
             tree1 = wt
             tree2 = tree1.basis_tree()
 
-        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
+        from viz.diffwin import DiffWindow
         import gtk
         window = DiffWindow()
         window.connect("destroy", lambda w: gtk.main_quit())

=== modified file 'olive/commit.py'
--- a/olive/commit.py	2006-10-25 09:00:02 +0000
+++ b/olive/commit.py	2006-10-25 09:56:13 +0000
@@ -235,7 +235,7 @@
     def commit(self, widget):
         textbuffer = self.textview.get_buffer()
         start, end = textbuffer.get_bounds()
-        message = textbuffer.get_text(start, end)
+        message = textbuffer.get_text(start, end).decode('utf-8')
         
         checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
         checkbutton_force = self.glade.get_widget('checkbutton_commit_force')