summaryrefslogtreecommitdiff
path: root/grc/gui
diff options
context:
space:
mode:
authorSebastian Koslowski <koslowski@kit.edu>2017-03-22 13:28:25 +0100
committerSebastian Koslowski <koslowski@kit.edu>2017-03-22 14:18:58 +0100
commit114b39a434c13a239f33ff65cebce10fcebd26ec (patch)
treeea804424598f114435e489cb92c99a127bed7cbf /grc/gui
parent6299451dc055424e644f389e0e0bc0b1682fe84b (diff)
grc: fix regressions from gtk3 merge
Diffstat (limited to 'grc/gui')
-rw-r--r--grc/gui/Actions.py8
-rw-r--r--grc/gui/canvas/connection.py3
2 files changed, 7 insertions, 4 deletions
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index 096584731e..97162065a6 100644
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -210,13 +210,13 @@ FLOW_GRAPH_SAVE_AS = Action(
)
FLOW_GRAPH_SAVE_A_COPY = Action(
label='Save A Copy',
- tooltip='Save the copy of current flowgraph',
+ tooltip='Save the copy of current flow graph',
)
FLOW_GRAPH_DUPLICATE = Action(
label='_Duplicate',
- tooltip='Create a duplicate of current flowgraph',
- stock_id=gtk.STOCK_COPY,
- keypresses=(gtk.keysyms.d, gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK),
+ tooltip='Create a duplicate of current flow graph',
+ stock_id=Gtk.STOCK_COPY,
+ keypresses=(Gdk.KEY_d, Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK),
)
FLOW_GRAPH_CLOSE = Action(
label='_Close',
diff --git a/grc/gui/canvas/connection.py b/grc/gui/canvas/connection.py
index 7de41a85b8..ff790503ef 100644
--- a/grc/gui/canvas/connection.py
+++ b/grc/gui/canvas/connection.py
@@ -204,6 +204,9 @@ class Connection(CoreConnection, Drawable):
x, y = [a - b for a, b in zip(coor, self.coordinate)]
cr = self._current_cr
+
+ if cr is None:
+ return
cr.save()
cr.new_path()
cr.append_path(self._line_path)