This patch fixes a traceback when the progress bar is to be displayed
when clicking on the log button.
The bzr-gtk version of ui should have been imported instead of the
bzrlib version.
This however requires that ui_factory be assigned to the GtkUIFactory class.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# testament_sha1: e0972df23db3b1f90c82eb74066acb6509e9e7a0
# timestamp: 2008-07-14 14:22:57 -0400
# source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'branchview/treeview.py'
--- branchview/treeview.py 2008-06-30 20:11:24 +0000
+++ branchview/treeview.py 2008-07-14 18:20:02 +0000
@@ -13,7 +13,7 @@
import pango
import re
import treemodel
-from bzrlib import ui
+from bzrlib.plugins.gtk import ui
from bzrlib.plugins.gtk import _i18n
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
=== modified file 'ui.py'
--- ui.py 2008-06-30 20:32:25 +0000
+++ ui.py 2008-07-14 18:20:02 +0000
@@ -230,3 +230,7 @@
It has no sense when talking about GTK."""
pass
+
+ui_factory = GtkUIFactory()
+"""IMPORTANT: never import this symbol directly. ONLY ever access it as
+ui.ui_factory."""
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZOhD8YAAhNfgEASUWP//3uv
1mC////wUASYvAaPcwUAASimUGp6njVPU/VMQ008p+qB6nqA0GmmRp5QBzTEyZNGEwTE0wCYBDBG
BGAanpNAp6TE9UabSAAAAAaDNQANNSTIZNABoBoA00NMg0AAASSIGRoJinqYBU96UxTBqYgBptQZ
qNo63SyjxPtQaBdDBbSLIMLKyUXI5zmMFwfGxYZC+c6PTtvQN+KtNngNYEEk6NQB6vwpiIQtRHIv
7Vu4/O6eXNmN9t/oovx2TVaqZ4V4pNHHLCJqhGcjvigEXOhJwIaSjN7JTZUwkVcrJyyEUJMtMWZA
vUua0ElqmWvo3cirRHSH14IiBTlcZebzQBlOb7KzGi3VHfd0TDZKMOR70YE4ixrZCEzZ8FeUAeGW
Y1IUDFhOqCopmcnjnATDxKAT5gX1FfuJKpgk9VIJE3V6D6fYCq8acZb6N0LLKp1WfIJtypAt2FF6
scOnMTIefdSB2dGrV51Lxw8rMSkvxegkBgIHBQxxIhEqpwJszDYvYpyRthWQRXIwI2NAosedXj7s
5yYsGVI1hMRa2FJCI9xnPAIDIMCc9YUG1ViiQgJFbgtYLOQxBExWIssGqlSEYJPZF5NpoIBxYsR4
8cRjF0xYVCiMVmRqp60bBkKorK8AwGNQLBby8kPObxGN9khKgcA7IoMllRgFNZoMWZyydHUapnkD
h/2oGJ2AecMlZowMsgfWkxAvmDyYCiQEXW/ZYDYUTXEp4KCxJd2JTdWXUGCpkeFBQHzTX1UFPVTU
4u2sOy986sFtrb91vhsuzo/Gj0RcdbTfUdYg0SozFZ/QTBnh3H0sY6cghREhQm40d1bGsSt/qdj4
VnkSNhePKEXVF5aTaliPUKP1l7x5tPkMe2YcZHkMw3xPt+PwNxwk22p+D3hJ2FJAytKysJESoMyg
nkL09tO8idOS2ftkuBONs/V5tNobqvF1JvPyAy9R0Vhxx6sXEyL4mPGUnBuJ6OiJtyYTHS+29EDu
oUg4jlbQRbdlkpkFIVoom0WwuMWJj0R5KYkkD3Khxp0UMRvAezXoWJFBEhtiEMX7rnNYGKyAu0fy
F6ce4ZZet1xxEVO0QyJqXLSw3u04CpOgXquoRUKc3i70Srt8+c1GQKFj++1A7XbRSXbdD3MXmrLk
Z5pprR/q0RD/PoOBiFoUc+4XA53HER154I8jrpZjdFQR8mVCMOl5wqo2qYHphkHFTD0Pe4fx5D8A
ZhMuV2qv8Ip24zdzgC9j0QR4IrWgPSWF5VjIzzzCZX1B40ynVm7zrrGiqRbuoD7gKjkbTe4OwYeP
YWCO0cPyzWr0vHDw7DFk+tEaq+ZgrihS7N1Tggp0wzDJXXwbkd04FERmoPzQ3EK1DkmAcUBI2QXt
8k5EBTa3xatduTydBhzC9rohSyNkRxFfpq+CHRZMTgeO9nqpgucezopcywqg3Mfrtu7yVq7Sk9Ll
pMCvGDYdTovj2nQCVKMwNDc1QzB2uN4Ezso8IqOof+LuSKcKEhJ0IfjA
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
