SF.net SVN: geany:[2848] trunk

[eht16 at users.sourceforge.net]

Revision: 2848
          http://geany.svn.sourceforge.net/geany/?rev=2848&view=rev
Author:   eht16
Date:     2008-08-01 15:54:21 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Revert r2843 because it messed it Ctrl-C/SIGINT in the VTE.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/vte.c
    trunk/src/vte.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-01 15:53:12 UTC (rev 2847)
+++ trunk/ChangeLog	2008-08-01 15:54:21 UTC (rev 2848)
@@ -1,3 +1,9 @@
+2008-08-01  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/callbacks.c, src/vte.c, src/vte.h:
+   Revert r2843 because it messed it Ctrl-C/SIGINT in the VTE.
+
+
 2008-07-30  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/notebook.c:

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2008-08-01 15:53:12 UTC (rev 2847)
+++ trunk/src/callbacks.c	2008-08-01 15:54:21 UTC (rev 2848)
@@ -328,12 +328,7 @@
 	else
 	if (IS_SCINTILLA(focusw) && doc != NULL)
 		sci_copy(doc->editor->sci);
-#ifdef HAVE_VTE
 	else
-	if (vte_info.load_vte && vc != NULL && vc->vte == focusw)
-		vte_copy_clipboard();
-#endif
-	else
 	if (GTK_IS_TEXT_VIEW(focusw))
 	{
 		GtkTextBuffer *buffer = gtk_text_view_get_buffer(
@@ -357,12 +352,7 @@
 	{
 		sci_paste(doc->editor->sci);
 	}
-#ifdef HAVE_VTE
 	else
-	if (vte_info.load_vte && vc != NULL && vc->vte == focusw)
-		vte_paste_clipboard();
-#endif
-	else
 	if (GTK_IS_TEXT_VIEW(focusw))
 	{
 		GtkTextBuffer *buffer = gtk_text_view_get_buffer(

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2008-08-01 15:53:12 UTC (rev 2847)
+++ trunk/src/vte.c	2008-08-01 15:54:21 UTC (rev 2848)
@@ -203,18 +203,6 @@
 }
 
 
-void vte_copy_clipboard(void)
-{
-	vf->vte_terminal_copy_clipboard(VTE_TERMINAL(vc->vte));
-}
-
-
-void vte_paste_clipboard(void)
-{
-	vf->vte_terminal_paste_clipboard(VTE_TERMINAL(vc->vte));
-}
-
-
 void vte_init(void)
 {
 	if (vte_info.have_vte == FALSE)

Modified: trunk/src/vte.h
===================================================================
--- trunk/src/vte.h	2008-08-01 15:53:12 UTC (rev 2847)
+++ trunk/src/vte.h	2008-08-01 15:54:21 UTC (rev 2848)
@@ -73,10 +73,6 @@
 
 void vte_apply_user_settings(void);
 
-void vte_copy_clipboard(void);
-
-void vte_paste_clipboard(void);
-
 gboolean vte_send_cmd(const gchar *cmd);
 
 const gchar* vte_get_working_directory(void);


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