Merge ~gusnan/sakura:fix_primary_clipboard into sakura:master

[Andreas Rönnquist]

This should fix

LP: #1948479
https://bugs.launchpad.net/sakura/+bug/1948479

(see the test in that bug).

However, this undos some earlier commits:

I am not the author of the patch - I am just forwarding
(I have modified the git commit author).

Here what he says:

----------------------------

The bug is introduced in the commit 3f11e123;
the title says it all: "Make copy on select to clipboard the default
and only behavior".

Commit d8a6e2c0 "add config support for button behavior"
introduces the option 'copy_on_select' that "automatically copy
selected text", this option defaults to 'false'.

Commit 4981d2c6 "Solve problem with duplicates when pasting
with middle button" changes the default to 'true' (!)
and unifies PRIMARY and CLIPBOARD selections.

Commit 3f11e123 "Make copy on select to clipboard
the default and only behavior" removes the option
'copy_on_select' but leaves everything else as is.

So my patch sort of reverse 3f11e123; I have never
experienced the bug solved by 4981d2c6 and I do not
see it now, so I do not know if the modifications of
this 3 patches are still needed.

----------------------------

And also to me this patch fixes the problem.

diff --git a/src/sakura.c b/src/sakura.c
index 553b728..d960b3f 100644
--- a/src/sakura.c
+++ b/src/sakura.c
@@ -891,9 +891,6 @@ sakura_term_buttonreleased_cb (GtkWidget *widget, GdkEventButton *button_event, 
 	if (button_event->type != GDK_BUTTON_RELEASE)
 		return FALSE;
 
-	if (button_event->button == 1)
-		sakura_copy();
-
 	return FALSE;
 }
 
@@ -923,14 +920,6 @@ sakura_term_buttonpressed_cb (GtkWidget *widget, GdkEventButton *button_event, g
 		return TRUE;
 	}
 
-	/* Paste when paste button is pressed */
-	if (button_event->button == sakura.paste_button) {
-		sakura_paste();
-
-		/* Do not propagate. vte has his own copy-on-select and we'll end with duplicates pastes */
-		return TRUE;
-	}
-
 	/* Show the popup menu when menu button is pressed */
 	if (button_event->button == sakura.menu_button) {
 		GtkMenu *menu;