[vte/vte-next: 205/223] Rename array

[Christian Persch <chpe src gnome org>]

commit ef9a7a868bc9354824fe7529254ba1e5c273f1dd
Author: Christian Persch <chpe gnome org>
Date:   Sun Jun 19 22:45:19 2011 +0200

    Rename array

 src/caps.c    |   10 +++++-----
 src/caps.h    |    2 +-
 src/matcher.c |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/caps.c b/src/caps.c
index 3477cca..1cdb905 100644
--- a/src/caps.c
+++ b/src/caps.c
@@ -41,7 +41,7 @@
 
 /* This list combined from the Linux termcap(5) man page, and
  * termcap_&_terminfo by Strang, Mui, and O'Reilly. */
-struct _vte_capability_quark _vte_terminal_capability_strings[] = {
+struct _vte_capability_quark _vte_capability_strings[] = {
 	{"!1", TRUE, 0},
 	{"!2", TRUE, 0},
 	{"!3", TRUE, 0},
@@ -568,7 +568,7 @@ struct _vte_capability_string _vte_xterm_capability_strings[] = {
 /**
  * vte_capability_init:
  *
- * Initializes the vte_terminal_capability_strings and
+ * Initializes the vte_capability_strings and
  * vte_xterm_capability_strings structures used by the terminal.  Can
  * be called multiple times without ill effect.
  *
@@ -579,12 +579,12 @@ void
 _vte_capability_init(void)
 {
 	unsigned int i;
-	for (i = 0; _vte_terminal_capability_strings[i].capability[0]; i++) {
+	for (i = 0; _vte_capability_strings[i].capability[0]; i++) {
 		const char *tmp;
 		GQuark quark;
-		tmp = _vte_terminal_capability_strings[i].capability;
+		tmp = _vte_capability_strings[i].capability;
 		quark = g_quark_from_static_string(tmp);
-		_vte_terminal_capability_strings[i].quark = quark;
+		_vte_capability_strings[i].quark = quark;
 	}
 	for (i = 0; i < G_N_ELEMENTS(_vte_xterm_capability_strings); i++) {
 		const char *tmp;
diff --git a/src/caps.h b/src/caps.h
index 7eafbd9..8bd1354 100644
--- a/src/caps.h
+++ b/src/caps.h
@@ -49,7 +49,7 @@ struct _vte_capability_string {
 };
 
 /* The known capability strings in termcap entries, terminated by NULLs. */
-extern struct _vte_capability_quark _vte_terminal_capability_strings[];
+extern struct _vte_capability_quark _vte_capability_strings[];
 
 /* The xterm-specific terminal control strings, terminated by NULLs. */
 extern struct _vte_capability_string _vte_xterm_capability_strings[];
diff --git a/src/matcher.c b/src/matcher.c
index dc86eab..3f2c1e9 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -68,12 +68,12 @@ _vte_matcher_init(struct _vte_matcher *matcher, const char *emulation,
 		/* Load the known capability strings from the termcap
 		 * structure into the table for recognition. */
 		for (i = 0;
-				_vte_terminal_capability_strings[i].capability[0];
+				_vte_capability_strings[i].capability[0];
 				i++) {
-			if (_vte_terminal_capability_strings[i].key) {
+			if (_vte_capability_strings[i].key) {
 				continue;
 			}
-			code = _vte_terminal_capability_strings[i].capability;
+			code = _vte_capability_strings[i].capability;
 			stripped = _vte_termcap_find_string_length(termcap,
 					emulation,
 					code,