[meld] Avoid tracebacks when not properly instantiated (e.g., from Glade)
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Avoid tracebacks when not properly instantiated (e.g., from Glade)
- Date: Fri, 2 Aug 2013 21:38:33 +0000 (UTC)
commit 45dbf7b631eac8268c91ab7e2802986ee4a81157
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Jul 27 07:38:16 2013 +1000
Avoid tracebacks when not properly instantiated (e.g., from Glade)
meld/linkmap.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/meld/linkmap.py b/meld/linkmap.py
index 427999e..5ba6aad 100644
--- a/meld/linkmap.py
+++ b/meld/linkmap.py
@@ -41,6 +41,7 @@ class LinkMap(gtk.DrawingArea):
def __init__(self):
self.mode = MODE_REPLACE
+ self._setup = False
def associate(self, filediff, left_view, right_view):
self.filediff = filediff
@@ -79,6 +80,7 @@ class LinkMap(gtk.DrawingArea):
self.button_height = pixbuf_apply0.get_height()
filediff.connect("action-mode-changed", self.on_container_mode_changed)
+ self._setup = True
def set_color_scheme(self, color_map):
self.fill_colors, self.line_colors = color_map
@@ -154,6 +156,9 @@ class LinkMap(gtk.DrawingArea):
return left_act, right_act
def do_expose_event(self, event):
+ if not self._setup:
+ return
+
context = self.window.cairo_create()
context.rectangle(event.area.x, event.area.y, event.area.width, \
event.area.height)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]