SOURCES: vte-branch.diff - reverted to revision 1846; further chan...

Sun Mar 18 13:57:28 CET 2007

Author: megabajt                     Date: Sun Mar 18 12:57:28 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted to revision 1846; further changes break gnome-terminal, so #415381 vte bug is still open

---- Files affected:
SOURCES:
   vte-branch.diff (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/vte-branch.diff
diff -u SOURCES/vte-branch.diff:1.1 SOURCES/vte-branch.diff:1.2

--- SOURCES/vte-branch.diff:1.1	Sat Mar 17 19:32:33 2007
+++ SOURCES/vte-branch.diff	Sun Mar 18 13:57:23 2007
@@ -1,46 +1,7 @@
-diff -urN vte-0.16.0/ChangeLog vte-svn/ChangeLog
+diff -urN vte-0.16.0/ChangeLog vte-1846/ChangeLog
 --- vte-0.16.0/ChangeLog	2007-03-13 00:18:36.000000000 +0100
-+++ vte-svn/ChangeLog	2007-03-17 19:21:20.000000000 +0100
-@@ -1,3 +1,123 @@
-+2007-03-16  Chris Wilson  <chris at chris-wilson.co.uk>
-+
-+	* src/vteseq.c (vte_sequence_handler_cursor_character_absolute):
-+		Remove a chunk of code that was tried as a mutt band-aid
-+		long ago and was completely wrong.
-+
-+2007-03-16  Chris Wilson  <chris at chris-wilson.co.uk>
-+
-+	Bug 415381 – Improve performance of vte_terminal_insert_char()
-+
-+	The bulk of the work to remove redundant reads and conditionals
-+	from the code. In particular, gcc was emitting bit-by-bit copies
-+	for transferring the bitfield since we modified a member immediately
-+	afterwards - overcome this by using an explicit memcpy of the
-+	bitfields.
-+
-+	* src/vte-private.h:
-+	* src/vte.c (vte_g_array_fill), (vte_terminal_ensure_cursor),
-+	(_vte_terminal_insert_char), (vte_terminal_process_incoming),
-+	(vte_terminal_send):
-+	* src/vteseq.c (vte_sequence_handler_ic):
-+
-+2007-03-16  Chris Wilson  <chris at chris-wilson.co.uk>
-+
-+	cf Bug 415381 – Improve performance of vte_terminal_insert_char()
-+
-+	* src/vte-private.h: Use a simple boolean rather than counter for
-+	text changed style flags.
-+	* src/vte.c: And update users.
-+	* src/vteseq.c:
-+
-+2007-03-16  Chris Wilson  <chris at chris-wilson.co.uk>
-+
-+	cf Bug 415381 – Improve performance of vte_terminal_insert_char()
-+
-+	* src/vte-private.h: Embed bitfield into struct
-+	* src/vte.c:  And update users.
-+	* src/vteseq.c:
-+
++++ vte-1846/ChangeLog	2007-03-18 13:22:43.000000000 +0100
+@@ -1,3 +1,84 @@
 +2007-03-16  Chris Wilson  <chris at chris-wilson.co.uk>
 +
 +	Need to trigger update timeout rather than process timeout
@@ -125,185 +86,234 @@
  2007-03-12  Behdad Esfahbod  <behdad at gnome.org>
  
  	Released vte-0.16.0.
-diff -urN vte-0.16.0/po/ChangeLog vte-svn/po/ChangeLog
---- vte-0.16.0/po/ChangeLog	2007-03-13 00:11:59.000000000 +0100
-+++ vte-svn/po/ChangeLog	2007-03-17 19:21:19.000000000 +0100
-@@ -1,3 +1,7 @@
-+2007-03-16  Laurent Dhima  <laurenti at alblinux.net>
-+
-+	* sq.po: Updated Albanian translation.
-+
- 2007-03-12  Luca Ferretti  <elle.uca at libero.it>
- 
- 	* it.po: Updated Italian translation by Francesco Marletta.
-diff -urN vte-0.16.0/po/sq.po vte-svn/po/sq.po
---- vte-0.16.0/po/sq.po	2007-02-26 22:05:19.000000000 +0100
-+++ vte-svn/po/sq.po	2007-03-17 19:21:19.000000000 +0100
-@@ -1,116 +1,121 @@
--# Albanian translation for vte
-+# Përkthimi i vte në shqip.
- # This file is distributed under the same license as the vte package.
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--# Damnus <damnus at libero.it>, 2003.
--# Laurent Dhima <laurenti at alblinux.net>, 2003, 2004.
-+# Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
- #
-+# Damnus <damnus at libero.it>, 2003.
-+# Laurent Dhima <laurenti at alblinux.net>, 2003, 2004, 2007.
- msgid ""
- msgstr ""
--"Project-Id-Version: vte.HEAD\n"
-+"Project-Id-Version: vte HEAD\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-03-13 00:22-0500\n"
--"PO-Revision-Date: 2004-02-23 10:30+0100\n"
-+"POT-Creation-Date: 2007-03-16 19:03+0100\n"
-+"PO-Revision-Date: 2007-03-16 19:06+0100\n"
- "Last-Translator: Laurent Dhima <laurenti at alblinux.net>\n"
--"Language-Team: Albanian <gnome-albanian-perkthyesit at lists.sourceforge.net>\n"
-+"Language-Team: albanian <gnome-albanian-perkthyesit at lists.sourceforge.net>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- 
--#: src/iso2022.c:792 src/iso2022.c:803 src/iso2022.c:852 src/vte.c:1590
-+#: ../src/iso2022.c:784 ../src/iso2022.c:792 ../src/iso2022.c:823
-+#: ../src/vte.c:1790
- #, c-format
- msgid "Unable to convert characters from %s to %s."
- msgstr "I pamundur konvertimi i simboleve nga %s në %s."
- 
--#: src/iso2022.c:1582
-+#: ../src/iso2022.c:1532
- #, c-format
- msgid "Attempt to set invalid NRC map '%c'."
- msgstr "Përpjekje për të vendosur një hartë '%c' NRC të pavlefshme."
- 
- #. Application signalled an "identified coding system" we haven't heard of.  See ECMA-35 for gory details.
--#: src/iso2022.c:1623
-+#: ../src/iso2022.c:1562
- msgid "Unrecognized identified coding system."
- msgstr "U identifikua një sistem kodifikimi i pavlefshëm."
- 
--#: src/iso2022.c:1672 src/iso2022.c:1698
-+#: ../src/iso2022.c:1621 ../src/iso2022.c:1648
- #, c-format
- msgid "Attempt to set invalid wide NRC map '%c'."
--msgstr ""
--"Përpjekje për të vendosur një hartë NRC të zgjeruar të pavlefshme '%c'."
--
--#: src/pty.c:329
--#, c-format
--msgid "Error adding `%s' to environment, continuing."
--msgstr "Gabim duke i shtuar `%s' ambientit, po vazhdoj."
-+msgstr "Përpjekje për të vendosur një hartë NRC të zgjeruar të pavlefshme '%c'."
- 
- #. Give the user some clue as to why session logging is not
- #. * going to work (assuming we can open a pty using some other
- #. * method).
--#: src/pty.c:914
-+#: ../src/pty.c:837
- #, c-format
- msgid "can not run %s"
- msgstr "I pamundur ekzekutimi i %s"
- 
--#: src/reaper.c:156
-+#: ../src/reaper.c:136
- msgid "Error creating signal pipe."
- msgstr "Gabim gjatë krijimit të pipe të sinjalit."
- 
--#: src/trie.c:412
-+#: ../src/trie.c:414
- #, c-format
- msgid "Duplicate (%s/%s)!"
- msgstr "Duplikim (%s/%s)!"
- 
--#: src/vte.c:1016
-+#: ../src/vte.c:1178
- #, c-format
- msgid "Error compiling regular expression \"%s\"."
- msgstr "Gabim gjatë kompilimit të shprehjes së rregullt \"%s\"."
- 
--#: src/vte.c:2472
-+#: ../src/vte.c:2646 ../src/vte.c:2651
- #, c-format
- msgid "No handler for control sequence `%s' defined."
- msgstr "Asnjë trajtues i prezgjedhur për sekuencën e kontrollit `%s'."
- 
- #. Translators: %s is replaced with error message returned by strerror().
--#: src/vte.c:3315
-+#: ../src/vte.c:3616
- #, c-format
- msgid "Error reading from child: %s."
- msgstr "Gabim gjatë leximit nga proçesi bir: %s"
- 
--#: src/vte.c:3437 src/vte.c:4331
-+#: ../src/vte.c:3732
-+msgid "Unable to send data to child, invalid charset convertor"
-+msgstr "I pamundur dërgimi i të dhënave birit, konvertues i pavlefshëm simbolesh"
-+
-+#: ../src/vte.c:3743 ../src/vte.c:4659
- #, c-format
- msgid "Error (%s) converting data for child, dropping."
--msgstr ""
--"Gabim (%s) duke konvertuar të dhënat për proçesin bir, do të lihen si ishin."
-+msgstr "Gabim (%s) duke konvertuar të dhënat për proçesin bir, do të lihen si ishin."
- 
--#: src/vte.c:6284
-+#: ../src/vte.c:6888
- #, c-format
- msgid "Error reading PTY size, using defaults: %s."
--msgstr ""
--"Gabim gjatë leximit të madhësisë PTY, do të përdoret vlera e prezgjedhur: %s."
-+msgstr "Gabim gjatë leximit të madhësisë PTY, do të përdoret vlera e prezgjedhur: %s."
- 
--#: src/vte.c:6320
-+#: ../src/vte.c:6917
- #, c-format
- msgid "Error setting PTY size: %s."
- msgstr "Gabim gjatë vendosjes së madhësisë PTY: %s."
- 
- #. Aaargh.  We're screwed.
--#: src/vte.c:10629
-+#: ../src/vte.c:11335
- msgid "_vte_conv_open() failed setting word characters"
- msgstr "_vte_conv_open() dështoi në vendosjen e gërmave të fjalës"
- 
-+#: ../src/vteseq.c:3926
-+#, c-format
-+msgid "Got unexpected (key?) sequence `%s'."
-+msgstr "U mor një sekuencë ( kyç?) i papritur `%s'."
-+
- #. Bail back to normal mode.
--#: src/vteapp.c:736
-+#: ../src/vteapp.c:774
- msgid "Could not open console.\n"
- msgstr "E pamundur hapja e konsolës.\n"
- 
--#: src/vteglyph.c:579
-+#: ../src/vteapp.c:838
-+msgid "Could not parse the geometry spec passed to --geometry"
-+msgstr "I pamundur analizimi i specifikimeve gjeometrike kaluar tek --geometry"
-+
-+#: ../src/vteglyph.c:562
- #, c-format
- msgid "Unknown pixel mode %d.\n"
- msgstr "Metodë pixel %d e panjohur.\n"
- 
--#: src/vtexft.c:714
-+#: ../src/vtexft.c:264
- #, c-format
--msgid "Can not draw character U+%04x.\n"
--msgstr "I pamundur vizatimi i simbolit U+%04x.\n"
-+msgid "Can not find appropiate font for character U+%04x.\n"
-+msgstr "E pamundur gjetja e një gërme të përshtatshme për simbolin U+%04x.\n"
- 
--#~ msgid "Got unexpected (key?) sequence `%s'."
--#~ msgstr "U mor një sekuencë ( kyç?) i papritur `%s'."
-diff -urN vte-0.16.0/src/cp437.py vte-svn/src/cp437.py
+diff -urN vte-0.16.0/po/Makefile.in.in vte-1846/po/Makefile.in.in
+--- vte-0.16.0/po/Makefile.in.in	2007-02-26 22:05:39.000000000 +0100
++++ vte-1846/po/Makefile.in.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,221 +0,0 @@
+-# Makefile for program source directory in GNU NLS utilities package.
+-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+-#
+-# This file file be copied and used freely without restrictions.  It can
+-# be used in projects which are not available under the GNU Public License
+-# but which still want to provide support for the GNU gettext functionality.
+-# Please note that the actual code is *not* freely available.
+-#
+-# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+-#
+-# - Modified by jacob berkman <jacob at ximian.com> to install
+-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+-#
+-# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
+-#
+-# We have the following line for use by intltoolize:
+-# INTLTOOL_MAKEFILE
+-
+-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+-PACKAGE = @PACKAGE@
+-VERSION = @VERSION@
+-
+-SHELL = /bin/sh
+-
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+-top_builddir = ..
+-VPATH = @srcdir@
+-
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-datadir = @datadir@
+-datarootdir = @datarootdir@
+-libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po
+-install_sh = @install_sh@
+-# Automake >= 1.8 provides @mkdir_p at .
+-# Until it can be supposed, use the safe fallback:
+-mkdir_p = $(install_sh) -d
+-
+-INSTALL = @INSTALL@
+-INSTALL_DATA = @INSTALL_DATA@
+-
+-GMSGFMT = @GMSGFMT@
+-MSGFMT = @MSGFMT@
+-XGETTEXT = @XGETTEXT@
+-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+-
+-ALL_LINGUAS = @ALL_LINGUAS@
+-
+-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+-
+-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+-
+-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+-
+-POTFILES = \
+-#This Gets Replace for some reason
+-
+-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+-
+-.SUFFIXES:
+-.SUFFIXES: .po .pox .gmo .mo .msg .cat
+-
+-.po.pox:
+-	$(MAKE) $(GETTEXT_PACKAGE).pot
+-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+-
+-.po.mo:
+-	$(MSGFMT) -o $@ $<
+-
+-.po.gmo:
+-	file=`echo $* | sed 's,.*/,,'`.gmo \
+-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+-
+-.po.cat:
+-	sed -f ../intl/po2msg.sed < $< > $*.msg \
+-	  && rm -f $@ && gencat $@ $*.msg
+-
+-
+-all: all- at USE_NLS@
+-
+-all-yes: $(CATALOGS)
+-all-no:
+-
+-$(GETTEXT_PACKAGE).pot: $(POTFILES)
+-	$(GENPOT)
+-
+-install: install-data
+-install-data: install-data- at USE_NLS@
+-install-data-no: all
+-install-data-yes: all
+-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
+-	if test -n "$(PO_LINGUAS)"; then \
+-	  linguas="$(PO_LINGUAS)"; \
+-	else \
+-	  linguas="$(ALL_LINGUAS)"; \
+-	fi; \
+-	for lang in $$linguas; do \
+-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+-	  $(mkdir_p) $$dir; \
+-	  if test -r $$lang.gmo; then \
+-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+-	  else \
+-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+-	    echo "installing $(srcdir)/$$lang.gmo as" \
+-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+-	  fi; \
+-	  if test -r $$lang.gmo.m; then \
+-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+-	  else \
+-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+-	    else \
+-	      true; \
+-	    fi; \
+-	  fi; \
+-	done
+-
+-# Empty stubs to satisfy archaic automake needs
+-dvi info tags TAGS ID:
+-
+-# Define this as empty until I found a useful application.
+-installcheck:
+-
+-uninstall:
+-	if test -n "$(PO_LINGUAS)"; then \
+-	  linguas="$(PO_LINGUAS)"; \
+-	else \
+-	  linguas="$(ALL_LINGUAS)"; \
+-	fi; \
+-	for lang in $$linguas; do \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+-	done
+-
+-check: all $(GETTEXT_PACKAGE).pot
+-
+-mostlyclean:
+-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+-	rm -f .intltool-merge-cache
+-
+-clean: mostlyclean
+-
+-distclean: clean
+-	rm -f Makefile Makefile.in POTFILES stamp-it
+-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+-
+-maintainer-clean: distclean
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
+-	rm -f Makefile.in.in
+-
+-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+-dist distdir: $(DISTFILES)
+-	dists="$(DISTFILES)"; \
+-	extra_dists="$(EXTRA_DISTFILES)"; \
+-	for file in $$extra_dists; do \
+-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+-	done; \
+-	for file in $$dists; do \
+-	  test -f $$file || file="$(srcdir)/$$file"; \
+-	  ln $$file $(distdir) 2> /dev/null \
+-	    || cp -p $$file $(distdir); \
+-	done
+-
+-update-po: Makefile
+-	$(MAKE) $(GETTEXT_PACKAGE).pot
+-	tmpdir=`pwd`; \
+-	if test -n "$(PO_LINGUAS)"; then \
+-	  linguas="$(PO_LINGUAS)"; \
+-	else \
+-	  linguas="$(ALL_LINGUAS)"; \
+-	fi; \
+-	for lang in $$linguas; do \
+-	  echo "$$lang:"; \
+-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+-	  if $$result; then \
+-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+-	      rm -f $$tmpdir/$$lang.new.po; \
+-            else \
+-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+-	        :; \
+-	      else \
+-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+-	        rm -f $$tmpdir/$$lang.new.po; \
+-	        exit 1; \
+-	      fi; \
+-	    fi; \
+-	  else \
+-	    echo "msgmerge for $$lang.gmo failed!"; \
+-	    rm -f $$tmpdir/$$lang.new.po; \
+-	  fi; \
+-	done
+-
+-Makefile POTFILES: stamp-it
+-	@if test ! -f $@; then \
+-	  rm -f stamp-it; \
+-	  $(MAKE) stamp-it; \
+-	fi
+-
+-stamp-it: Makefile.in.in ../config.status POTFILES.in
+-	cd .. \
+-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+-	       $(SHELL) ./config.status
+-
+-# Tell versions [3.59,3.63) of GNU make not to export all variables.
+-# Otherwise a system limit (for SysV at least) may be exceeded.
+-.NOEXPORT:
+diff -urN vte-0.16.0/src/cp437.py vte-1846/src/cp437.py
 --- vte-0.16.0/src/cp437.py	1970-01-01 01:00:00.000000000 +0100
-+++ vte-svn/src/cp437.py	2007-03-17 18:22:53.000000000 +0100
++++ vte-1846/src/cp437.py	2007-03-18 13:22:32.000000000 +0100
 @@ -0,0 +1,9 @@
 +#!/usr/bin/python
 +print '%s' % '(U'
@@ -314,9 +324,9 @@
 +		print ""
 +	i = i + 1
 +print '%s' % '(B)0*B+B'
-diff -urN vte-0.16.0/src/genwidths.py vte-svn/src/genwidths.py
+diff -urN vte-0.16.0/src/genwidths.py vte-1846/src/genwidths.py
 --- vte-0.16.0/src/genwidths.py	1970-01-01 01:00:00.000000000 +0100
-+++ vte-svn/src/genwidths.py	2007-03-17 18:22:53.000000000 +0100
++++ vte-1846/src/genwidths.py	2007-03-18 13:22:32.000000000 +0100
 @@ -0,0 +1,35 @@
 +#!/usr/bin/python
 +import os, re, string
@@ -353,9 +363,9 @@
 +	print >> out, "\t0x%x," % (string.atol(specific, 16))
 +print >> out, "};"
 +
-diff -urN vte-0.16.0/src/marshal.c vte-svn/src/marshal.c
+diff -urN vte-0.16.0/src/marshal.c vte-1846/src/marshal.c
 --- vte-0.16.0/src/marshal.c	2007-02-26 22:06:36.000000000 +0100
-+++ vte-svn/src/marshal.c	1970-01-01 01:00:00.000000000 +0100
++++ vte-1846/src/marshal.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,203 +0,0 @@
 -
 -#include	<glib-object.h>
@@ -560,9 +570,9 @@
 -            data2);
 -}
 -
-diff -urN vte-0.16.0/src/marshal.h vte-svn/src/marshal.h
+diff -urN vte-0.16.0/src/marshal.h vte-1846/src/marshal.h
 --- vte-0.16.0/src/marshal.h	2007-02-26 22:06:36.000000000 +0100
-+++ vte-svn/src/marshal.h	1970-01-01 01:00:00.000000000 +0100
++++ vte-1846/src/marshal.h	1970-01-01 01:00:00.000000000 +0100
 @@ -1,53 +0,0 @@
 -
 -#ifndef ___vte_marshal_MARSHAL_H__
@@ -617,9 +627,9 @@
 -
 -#endif /* ___vte_marshal_MARSHAL_H__ */
 -
-diff -urN vte-0.16.0/src/vte.c vte-svn/src/vte.c
+diff -urN vte-0.16.0/src/vte.c vte-1846/src/vte.c
 --- vte-0.16.0/src/vte.c	2007-03-08 17:47:15.000000000 +0100
-+++ vte-svn/src/vte.c	2007-03-17 18:22:53.000000000 +0100
++++ vte-1846/src/vte.c	2007-03-18 13:22:32.000000000 +0100
 @@ -18,6 +18,8 @@
  
  #include "../config.h"
@@ -639,91 +649,7 @@
  static void vte_terminal_emit_pending_signals(VteTerminal *terminal);
  static inline gboolean vte_cell_is_selected(VteTerminal *terminal,
  				     glong col, glong row, gpointer data);
-@@ -245,7 +246,7 @@
- /* Append a single item to a GArray a given number of times. Centralizing all
-  * of the places we do this may let me do something more clever later. */
- static void
--vte_g_array_fill(GArray *array, gpointer item, guint final_size)
-+vte_g_array_fill(GArray *array, gconstpointer item, guint final_size)
- {
- 	if (array->len >= final_size) {
- 		return;
-@@ -318,22 +319,21 @@
- 	screen = terminal->pvt->screen;
- 
- 	screen->defaults.c = 0;
--	screen->defaults.columns = 1;
--	screen->defaults.fragment = 0;
--	screen->defaults.empty = 1;
--	screen->defaults.fore = VTE_DEF_FG;
--	screen->defaults.back = VTE_DEF_BG;
--	screen->defaults.reverse = 0;
--	screen->defaults.bold = 0;
--	screen->defaults.invisible = 0;
--	screen->defaults.protect = 0;
--	screen->defaults.standout = 0;
--	screen->defaults.underline = 0;
--	screen->defaults.strikethrough = 0;
--	screen->defaults.half = 0;
--	screen->defaults.blink = 0;
-+	screen->defaults.attr.columns = 1;
-+	screen->defaults.attr.fragment = 0;
-+	screen->defaults.attr.fore = VTE_DEF_FG;
-+	screen->defaults.attr.back = VTE_DEF_BG;
-+	screen->defaults.attr.reverse = 0;
-+	screen->defaults.attr.bold = 0;
-+	screen->defaults.attr.invisible = 0;
-+	screen->defaults.attr.protect = 0;
-+	screen->defaults.attr.standout = 0;
-+	screen->defaults.attr.underline = 0;
-+	screen->defaults.attr.strikethrough = 0;
-+	screen->defaults.attr.half = 0;
-+	screen->defaults.attr.blink = 0;
- 	/* Alternate charset isn't an attribute, though we treat it as one.
--	 * screen->defaults.alternate = 0; */
-+	 * screen->defaults.attr.alternate = 0; */
- 	screen->basic_defaults = screen->defaults;
- 	screen->color_defaults = screen->defaults;
- 	screen->fill_defaults = screen->defaults;
-@@ -612,13 +612,13 @@
- 		struct vte_charcell *cell;
- 		cell = _vte_row_data_find_charcell(row_data, col);
- 		if (cell != NULL) {
--			while (cell->fragment && col> 0) {
-+			while (cell->attr.fragment && col> 0) {
- 				cell = _vte_row_data_find_charcell(row_data, --col);
- 			}
--			columns = cell->columns;
-+			columns = cell->attr.columns;
- 			if (_vte_draw_get_char_width(terminal->pvt->draw,
- 						cell->c,
--						cell->columns) >
-+						cell->attr.columns) >
- 					terminal->char_width * columns) {
- 				columns++;
- 			}
-@@ -664,17 +664,17 @@
- 		cell = vte_terminal_find_charcell(terminal,
- 						  column,
- 						  screen->cursor_current.row);
--		while ((cell != NULL) && (cell->fragment) && (column > 0)) {
-+		while ((cell != NULL) && (cell->attr.fragment) && (column > 0)) {
- 			column--;
- 			cell = vte_terminal_find_charcell(terminal,
- 							  column,
- 							  row);
- 		}
- 		if (cell != NULL) {
--			columns = cell->columns;
-+			columns = cell->attr.columns;
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/vte-branch.diff?r1=1.1&r2=1.2&f=u

