vte r2266 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Mon Dec  1 09:19:34 2008
New Revision: 2266
URL: http://svn.gnome.org/viewvc/vte?rev=2266&view=rev

Log:
2008-12-01  Behdad Esfahbod  <behdad gnome org>

        * src/vteseq.c: Rip out vte_sequence_handler_invoke.



Modified:
   trunk/ChangeLog
   trunk/src/vteseq.c

Modified: trunk/src/vteseq.c
==============================================================================
--- trunk/src/vteseq.c	(original)
+++ trunk/src/vteseq.c	Mon Dec  1 09:19:34 2008
@@ -554,11 +554,8 @@
 	static VTE_SEQUENCE_HANDLER_SIGNATURE (name)
 
 
-/* The type of sequence handler handle. */
-
+/* Typedef the handle type */
 typedef VTE_SEQUENCE_HANDLER_SIGNATURE((*VteTerminalSequenceHandler));
-#define vte_sequence_handler_invoke(handler, terminal, params) (handler) ((terminal), (params))
-
 
 /* Prototype all handlers... */
 #define VTE_SEQUENCE_HANDLER(name) VTE_SEQUENCE_HANDLER_PROTO (name);
@@ -588,7 +585,7 @@
 			g_value_set_long(value, val);
 		}
 	}
-	vte_sequence_handler_invoke (handler, terminal, params);
+	handler (terminal, params);
 }
 
 /* Call another function a given number of times, or once. */
@@ -609,7 +606,7 @@
 		}
 	}
 	for (i = 0; i < val; i++)
-		vte_sequence_handler_invoke (handler, terminal, NULL);
+		handler (terminal, NULL);
 }
 
 
@@ -828,7 +825,7 @@
 					"Setting %d to %s.\n",
 					setting, set ? "set" : "unset");
 			if (settings[i].set && set) {
-				vte_sequence_handler_invoke (settings[i].set, terminal, NULL);
+				settings[i].set (terminal, NULL);
 			}
 			if (settings[i].bvalue) {
 				*(settings[i].bvalue) = set;
@@ -844,7 +841,7 @@
 					settings[i].fvalue;
 			}
 			if (settings[i].reset && !set) {
-				vte_sequence_handler_invoke (settings[i].reset, terminal, NULL);
+				settings[i].reset (terminal, NULL);
 			}
 		}
 	}
@@ -3330,7 +3327,7 @@
 
 	if (handler != NULL) {
 		/* Let the handler handle it. */
-		vte_sequence_handler_invoke (handler, terminal2, params2);
+		handler (terminal2, params2);
 	} else {
 		_vte_debug_print (VTE_DEBUG_MISC,
 				  "No handler for control sequence `%s' defined.\n",