Merge lp:~niclasl/pantheon-terminal/handle-empty-clipboard into lp:~elementary-apps/pantheon-terminal/trunk

[Niclas Lockner]

Currently when a Terminal window is created and there's nothing in the clipboard to paste, GTK logs fatal errors.

In this branch, a non-null and non-empty Atom array is required in update_context_menu_cb before calling Gtk.targets_include_text/uri

Currently when a Terminal window is created and there's nothing in the clipboard to paste, GTK logs fatal errors.
In this branch, a non-null and non-empty Atom array is required in update_context_menu_cb before calling Gtk.targets_include_text/uri

[David Gomes (davidgomes)]

Nicely spotted! Can you just add an empty newline after diff line 13?

review: Needs Fixing

[lp:~niclasl/pantheon-terminal/handle-empty-clipboard]

562. By Niclas Lockner on 2014-04-15

Code-style fix

[David Gomes (davidgomes)]

review: Approve

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2014-04-14 14:00:48 +0000
+++ src/PantheonTerminalWindow.vala	2014-04-15 14:17:25 +0000
@@ -367,8 +367,11 @@
 
         private void update_context_menu_cb (Gtk.Clipboard clipboard_,
                                              Gdk.Atom[] atoms) {
-            bool can_paste;
-            can_paste = Gtk.targets_include_text (atoms) || Gtk.targets_include_uri (atoms);
+            bool can_paste = false;
+
+            if (atoms != null && atoms.length > 0)
+                can_paste = Gtk.targets_include_text (atoms) || Gtk.targets_include_uri (atoms);
+
             main_actions.get_action ("Paste").set_sensitive (can_paste);
         }