vte r2226 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Sat Nov 29 07:56:50 2008
New Revision: 2226
URL: http://svn.gnome.org/viewvc/vte?rev=2226&view=rev

Log:
2008-11-29  Behdad Esfahbod  <behdad gnome org>

        Bug 107031 â device-control-string error

        * src/table.c (_vte_table_addi):
        * src/vte.c (vte_terminal_handle_sequence):
        * src/vteseq.c (vte_sequence_handler_decset_internal):
        Replace some g_warning's with vte debug output.



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

Modified: trunk/src/table.c
==============================================================================
--- trunk/src/table.c	(original)
+++ trunk/src/table.c	Sat Nov 29 07:56:50 2008
@@ -209,11 +209,11 @@
 
 	/* If this is the terminal node, set the result. */
 	if (length == 0) {
-		_VTE_DEBUG_IF(VTE_DEBUG_PARSE) {
-			if (table->result != NULL)
-				g_warning("`%s' and `%s' are indistinguishable",
-						table->result, result);
-		}
+		if (table->result != NULL)
+			_vte_debug_print (VTE_DEBUG_PARSE, 
+					  "`%s' and `%s' are indistinguishable.\n",
+					  table->result, result);
+
 		table->resultq = g_quark_from_string(result);
 		table->result = g_quark_to_string(table->resultq);
 		if (table->original != NULL) {

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Sat Nov 29 07:56:50 2008
@@ -3154,18 +3154,9 @@
 		/* Let the handler handle it. */
 		ret = handler(terminal, match_s, match, params);
 	} else {
-#ifdef VTE_DEBUG
-		g_warning(_("No handler for control sequence `%s' defined."),
-				match_s);
-#else
-		/* suppress multiple warnings for each widget */
-		if (!g_object_get_qdata(G_OBJECT (terminal), match)) {
-			g_warning(_("No handler for control sequence `%s' defined."),
-					match_s);
-			g_object_set_qdata(G_OBJECT (terminal),
-					match, (gpointer)0x1);
-		}
-#endif
+		_vte_debug_print (VTE_DEBUG_MISC,
+				  "No handler for control sequence `%s' defined.\n",
+				  match_s);
 		ret = FALSE;
 	}
 

Modified: trunk/src/vteseq.c
==============================================================================
--- trunk/src/vteseq.c	(original)
+++ trunk/src/vteseq.c	Sat Nov 29 07:56:50 2008
@@ -799,12 +799,13 @@
 	default:
 		break;
 	}
-#ifdef VTE_DEBUG
+
 	if (!recognized) {
-		g_warning("DECSET/DECRESET mode %d not recognized, ignoring.\n",
-			  setting);
+		_vte_debug_print (VTE_DEBUG_MISC,
+				  "DECSET/DECRESET mode %d not recognized, ignoring.\n",
+				  setting);
 	}
-#endif
+
 	return again;
 }