SF.net SVN: geany: [360] trunk

[ntrel at users.sourceforge.net]

Revision: 360
Author:   ntrel
Date:     2006-05-23 13:26:23 -0700 (Tue, 23 May 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=360&view=rev

Log Message:
-----------
remove vte middle click override to allow X paste and update popup preferences item for Terminal tab number

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/vte.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-05-23 19:31:09 UTC (rev 359)
+++ trunk/ChangeLog	2006-05-23 20:26:23 UTC (rev 360)
@@ -4,7 +4,9 @@
                 utils_goto_workspace_tag
  * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade:
    created Search menubar item with Find items from Edit menu, added
-   Find Previous and Go to line commands.
+   Find Previous and Go to line commands
+ * src/vte.c: remove vte middle click override to allow X paste and
+              update popup preferences item for Terminal tab number
 
 
 2006-05-22  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2006-05-23 19:31:09 UTC (rev 359)
+++ trunk/src/vte.c	2006-05-23 20:26:23 UTC (rev 360)
@@ -235,16 +235,8 @@
 
 static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-	if (event->button == 2)
+	if (event->button == 3)
 	{
-		/* this behaviour(pasting at mouse button 2) seems to be default, but don't know
-		 * if it is always the same, so I implement it by myself to be sure and
-		 * return TRUE to prevent the default behaviour */
-		vf->vte_terminal_paste_clipboard(VTE_TERMINAL(widget));
-		return TRUE;
-	}
-	else if (event->button == 3)
-	{
 		gtk_menu_popup(GTK_MENU(vc->menu), NULL, NULL, NULL, NULL, event->button, event->time);
 	}
 
@@ -335,7 +327,7 @@
 		case 2:
 		{
 			on_preferences1_activate(menuitem, NULL);
-			gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 4);
+			gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 5);
 			break;
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.