Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Shirk <travis@pobox.com>2006-01-07 23:47:06 +0300
committerTravis Shirk <travis@pobox.com>2006-01-07 23:47:06 +0300
commit5c53bdbee605da2510aa8180f7239e876a95181a (patch)
tree6fb6e65525d4c55060cf263a0d3880cb695d78ed /src/cell_renderer_image.py
parentf66c5c5b957b3f9c1d798245afa0da5ae6f369bd (diff)
Merged revisions 5030-5031,5033-5038 via svnmerge from
svn://svn.gajim.org/gajim/trunk ........ r5030 | asterix | 2006-01-07 10:04:18 -0700 (Sat, 07 Jan 2006) | 2 lines when we add a bookmark, we add our nick by default ........ r5031 | nicfit | 2006-01-07 10:24:50 -0700 (Sat, 07 Jan 2006) | 2 lines Grammatical fix ........ r5033 | asterix | 2006-01-07 11:36:56 -0700 (Sat, 07 Jan 2006) | 2 lines cell_renderer_image now take in argument the index of the column and the index in the model ........ r5034 | asterix | 2006-01-07 11:37:28 -0700 (Sat, 07 Jan 2006) | 2 lines typo ........ r5035 | asterix | 2006-01-07 11:38:18 -0700 (Sat, 07 Jan 2006) | 2 lines don't show header in emoticonManager so that cellrenderer correctly compute the area to redraw ........ r5036 | asterix | 2006-01-07 11:39:41 -0700 (Sat, 07 Jan 2006) | 2 lines prevent a TB ........ r5037 | nicfit | 2006-01-07 13:26:08 -0700 (Sat, 07 Jan 2006) | 2 lines Increment later ........ r5038 | nicfit | 2006-01-07 13:29:05 -0700 (Sat, 07 Jan 2006) | 2 lines Fixed syntax error ........
Diffstat (limited to 'src/cell_renderer_image.py')
-rw-r--r--src/cell_renderer_image.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/cell_renderer_image.py b/src/cell_renderer_image.py
index 2af7fd551..f09dfa7ac 100644
--- a/src/cell_renderer_image.py
+++ b/src/cell_renderer_image.py
@@ -33,9 +33,11 @@ class CellRendererImage(gtk.GenericCellRenderer):
'Image', gobject.PARAM_READWRITE),
}
- def __init__(self):
+ def __init__(self, col_index, tv_index):
self.__gobject_init__()
self.image = None
+ self.col_index = col_index
+ self.tv_index = tv_index
self.iters = {}
def do_set_property(self, pspec, value):
@@ -45,10 +47,12 @@ class CellRendererImage(gtk.GenericCellRenderer):
return getattr(self, pspec.name)
def func(self, model, path, iter, (image, tree)):
- if model.get_value(iter, 0) != image:
+ if model.get_value(iter, self.tv_index) != image:
return
self.redraw = 1
- cell_area = tree.get_cell_area(path, tree.get_column(0))
+ col = tree.get_column(self.col_index)
+ cell_area = tree.get_cell_area(path, col)
+
tree.queue_draw_area(cell_area.x, cell_area.y,
cell_area.width, cell_area.height)
@@ -59,7 +63,8 @@ class CellRendererImage(gtk.GenericCellRenderer):
iter = self.iters[image]
iter.advance()
model = tree.get_model()
- model.foreach(self.func, (image, tree))
+ if model:
+ model.foreach(self.func, (image, tree))
if self.redraw:
gobject.timeout_add(iter.get_delay_time(),
self.animation_timeout, tree, image)