SOURCES: vte-branch.diff (NEW) - fix many vte bugs (#417301, #41765...
megabajt
megabajt at pld-linux.org
Sat Mar 17 19:32:38 CET 2007
Author: megabajt Date: Sat Mar 17 18:32:38 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix many vte bugs (#417301,#417652,#418588,#416635,#416634,#418910,#418073,#415381)
---- Files affected:
SOURCES:
vte-branch.diff (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/vte-branch.diff
diff -u /dev/null SOURCES/vte-branch.diff:1.1
--- /dev/null Sat Mar 17 19:32:38 2007
+++ SOURCES/vte-branch.diff Sat Mar 17 19:32:33 2007
@@ -0,0 +1,2961 @@
+diff -urN vte-0.16.0/ChangeLog vte-svn/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:
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Need to trigger update timeout rather than process timeout
++ otherwise the background is not updated.
++
++ * src/vte.c (vte_terminal_queue_adjustment_changed),
++ (vte_terminal_queue_adjustment_value_changed):
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ * src/vtexft.c (_vte_xft_create), (_vte_xft_destroy),
++ (_vte_xft_start), (_vte_xft_end), (_vte_xft_clip),
++ (_vte_xft_clear): Avoid some allocations.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Bug 418073 – Opacity ignored for vtexft
++
++ * src/vte.c:
++ * src/vtedraw.c (_vte_draw_requires_clear):
++ * src/vtedraw.h:
++ * src/vteft2.c (_vte_ft2_set_background_image):
++ * src/vtegl.c (_vte_gl_create), (_vte_gl_set_background_image):
++ * src/vtepango.c (_vte_pango_set_background_image):
++ * src/vtepangox.c (_vte_pango_x_set_background_image):
++ * src/vtexft.c (_vte_xft_set_background_color),
++ (_vte_xft_set_background_image):
++ Flood fill the backing pixmap if we need to change it's
++ opacity as well.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Bug 418910 – Asymmetric scrolling with mouse wheel
++
++ * configure.in:
++ * src/vte.c: Round-up the delta before applying to ensure consistency
++ between up and down.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ * src/vte.c (vte_terminal_catch_child_exited), (vte_terminal_eof),
++ (vte_terminal_process_incoming): Refactor some common code.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Bug 416634 – Rendering glitch as autowrapped chars are outside invalidated bbox
++
++ * src/vte.c (_vte_terminal_insert_char),
++ (vte_terminal_process_incoming): Correctly update bbox after
++ autowrapping.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Bug 416635 – Rendering glitch: double draw of line below exposed region
++
++ * src/vte.c (vte_terminal_expand_region),
++ (vte_terminal_paint_area): Kill a couple of off-by-ones.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Bug 418588 – Invalid read when drawing preedit cursor
++
++ * src/vte.c (vte_terminal_paint):
++ No need to read what is drawn and furthermore isn't allocated.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Bug 417652 – Scrolling bug exposed by nvi
++
++ * src/vte.c (vte_terminal_insert_rows), (_vte_terminal_ensure_row),
++ (vte_terminal_ensure_cursor), (_vte_terminal_update_insert_delta):
++ Ensure the rows before updating the insert delta and refactor
++ the common code.
++
++2007-03-16 Chris Wilson <chris at chris-wilson.co.uk>
++
++ Bug 417301 – Terminal widgets don't respond to DPI changes
++
++ * src/vte.c (vte_terminal_fc_settings_changed): Force a font reload
++ after XFT settings have changed.
++
+ 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
+--- 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
+@@ -0,0 +1,9 @@
++#!/usr/bin/python
++print '%s' % '(U'
++i = 128
++while (i < 256):
++ print "%c" % i,
++ if ((i % 32) == 31):
++ print ""
++ i = i + 1
++print '%s' % '(B)0*B+B'
+diff -urN vte-0.16.0/src/genwidths.py vte-svn/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
+@@ -0,0 +1,35 @@
++#!/usr/bin/python
++import os, re, string
++
++try:
++ unidata = open("EastAsianWidth.txt", "r")
++except:
++ os.system("wget --passive-ftp -c ftp://ftp.unicode.org/Public/UNIDATA/EastAsianWidth.txt")
++ unidata = open("EastAsianWidth.txt", "r")
++out = open("uniwidths", "w")
++ranges = []
++specifics = []
++rangere = re.compile("^([0123456789ABCDEF]+)\.\.([0123456789ABCDEF]+);A")
++specificre = re.compile("^([0123456789ABCDEF]+);A")
++for line in unidata.readlines():
++ match = re.match(specificre, line)
++ if match:
++ if match.groups().__len__() > 0:
++ specifics.append(match.groups()[0])
++ match = re.match(rangere, line)
++ if match:
++ if match.groups().__len__() > 1:
++ ranges.append((match.groups()[0], match.groups()[1]))
++
++print >> out, "static const struct {"
++print >> out, "\tgunichar start, end;"
++print >> out, "} _vte_iso2022_ambiguous_ranges[] = {"
++for range in ranges:
++ print >> out, "\t{0x%x, 0x%x}," % (string.atol(range[0], 16), string.atol(range[1], 16))
++print >> out, "};"
++
++print >> out, "static const gunichar _vte_iso2022_ambiguous_chars[] = {"
++for specific in specifics:
++ print >> out, "\t0x%x," % (string.atol(specific, 16))
++print >> out, "};"
++
+diff -urN vte-0.16.0/src/marshal.c vte-svn/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
+@@ -1,203 +0,0 @@
+-
+-#include <glib-object.h>
+-
+-
+-#ifdef G_ENABLE_DEBUG
+-#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
+-#define g_marshal_value_peek_char(v) g_value_get_char (v)
+-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
+-#define g_marshal_value_peek_int(v) g_value_get_int (v)
+-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
+-#define g_marshal_value_peek_long(v) g_value_get_long (v)
+-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
+-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
+-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
+-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
+-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
+-#define g_marshal_value_peek_float(v) g_value_get_float (v)
+-#define g_marshal_value_peek_double(v) g_value_get_double (v)
+-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
+-#define g_marshal_value_peek_param(v) g_value_get_param (v)
+-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
+-#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
+-#define g_marshal_value_peek_object(v) g_value_get_object (v)
+-#else /* !G_ENABLE_DEBUG */
+-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+- * Do not access GValues directly in your code. Instead, use the
+- * g_value_get_*() functions
+- */
+-#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
+-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
+-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
+-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
+-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
+-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
+-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
+-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
+-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
+-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
+-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
+-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
+-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
+-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
+-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
+-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
+-#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
+-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
+-#endif /* !G_ENABLE_DEBUG */
+-
+-
+-/* VOID:VOID (marshal.list:1) */
+-
+-/* VOID:STRING (marshal.list:2) */
+-
+-/* VOID:STRING,UINT (marshal.list:3) */
+-void
+-_vte_marshal_VOID__STRING_UINT (GClosure *closure,
+- GValue *return_value,
+- guint n_param_values,
+- const GValue *param_values,
+- gpointer invocation_hint,
+- gpointer marshal_data)
+-{
+- typedef void (*GMarshalFunc_VOID__STRING_UINT) (gpointer data1,
+- gpointer arg_1,
+- guint arg_2,
+- gpointer data2);
+- register GMarshalFunc_VOID__STRING_UINT callback;
+- register GCClosure *cc = (GCClosure*) closure;
+- register gpointer data1, data2;
+-
+- g_return_if_fail (n_param_values == 3);
+-
+- if (G_CCLOSURE_SWAP_DATA (closure))
+- {
+- data1 = closure->data;
+- data2 = g_value_peek_pointer (param_values + 0);
+- }
+- else
+- {
+- data1 = g_value_peek_pointer (param_values + 0);
+- data2 = closure->data;
+- }
+- callback = (GMarshalFunc_VOID__STRING_UINT) (marshal_data ? marshal_data : cc->callback);
+-
+- callback (data1,
+- g_marshal_value_peek_string (param_values + 1),
+- g_marshal_value_peek_uint (param_values + 2),
+- data2);
+-}
+-
+-/* VOID:INT (marshal.list:4) */
+-
+-/* VOID:INT,INT (marshal.list:5) */
+-void
+-_vte_marshal_VOID__INT_INT (GClosure *closure,
+- GValue *return_value,
+- guint n_param_values,
+- const GValue *param_values,
+- gpointer invocation_hint,
+- gpointer marshal_data)
+-{
+- typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
+- gint arg_1,
+- gint arg_2,
+- gpointer data2);
+- register GMarshalFunc_VOID__INT_INT callback;
+- register GCClosure *cc = (GCClosure*) closure;
+- register gpointer data1, data2;
+-
+- g_return_if_fail (n_param_values == 3);
+-
+- if (G_CCLOSURE_SWAP_DATA (closure))
+- {
+- data1 = closure->data;
+- data2 = g_value_peek_pointer (param_values + 0);
+- }
+- else
+- {
+- data1 = g_value_peek_pointer (param_values + 0);
+- data2 = closure->data;
+- }
+- callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
+-
+- callback (data1,
+- g_marshal_value_peek_int (param_values + 1),
+- g_marshal_value_peek_int (param_values + 2),
+- data2);
+-}
+-
+-/* VOID:UINT,UINT (marshal.list:6) */
+-void
+-_vte_marshal_VOID__UINT_UINT (GClosure *closure,
+- GValue *return_value,
+- guint n_param_values,
+- const GValue *param_values,
+- gpointer invocation_hint,
+- gpointer marshal_data)
+-{
+- typedef void (*GMarshalFunc_VOID__UINT_UINT) (gpointer data1,
+- guint arg_1,
+- guint arg_2,
+- gpointer data2);
+- register GMarshalFunc_VOID__UINT_UINT callback;
+- register GCClosure *cc = (GCClosure*) closure;
+- register gpointer data1, data2;
+-
+- g_return_if_fail (n_param_values == 3);
+-
+- if (G_CCLOSURE_SWAP_DATA (closure))
+- {
+- data1 = closure->data;
+- data2 = g_value_peek_pointer (param_values + 0);
+- }
+- else
+- {
+- data1 = g_value_peek_pointer (param_values + 0);
+- data2 = closure->data;
+- }
+- callback = (GMarshalFunc_VOID__UINT_UINT) (marshal_data ? marshal_data : cc->callback);
+-
+- callback (data1,
+- g_marshal_value_peek_uint (param_values + 1),
+- g_marshal_value_peek_uint (param_values + 2),
+- data2);
+-}
+-
+-/* VOID:OBJECT,OBJECT (marshal.list:7) */
+-void
+-_vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
+- GValue *return_value,
+- guint n_param_values,
+- const GValue *param_values,
+- gpointer invocation_hint,
+- gpointer marshal_data)
+-{
+- typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
+- gpointer arg_1,
+- gpointer arg_2,
+- gpointer data2);
+- register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+- register GCClosure *cc = (GCClosure*) closure;
+- register gpointer data1, data2;
+-
+- g_return_if_fail (n_param_values == 3);
+-
+- if (G_CCLOSURE_SWAP_DATA (closure))
+- {
+- data1 = closure->data;
+- data2 = g_value_peek_pointer (param_values + 0);
+- }
+- else
+- {
+- data1 = g_value_peek_pointer (param_values + 0);
+- data2 = closure->data;
+- }
+- callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+-
+- callback (data1,
+- g_marshal_value_peek_object (param_values + 1),
+- g_marshal_value_peek_object (param_values + 2),
+- data2);
+-}
+-
+diff -urN vte-0.16.0/src/marshal.h vte-svn/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
+@@ -1,53 +0,0 @@
+-
+-#ifndef ___vte_marshal_MARSHAL_H__
+-#define ___vte_marshal_MARSHAL_H__
+-
+-#include <glib-object.h>
+-
+-G_BEGIN_DECLS
+-
+-/* VOID:VOID (marshal.list:1) */
+-#define _vte_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID
+-
+-/* VOID:STRING (marshal.list:2) */
+-#define _vte_marshal_VOID__STRING g_cclosure_marshal_VOID__STRING
+-
+-/* VOID:STRING,UINT (marshal.list:3) */
+-extern void _vte_marshal_VOID__STRING_UINT (GClosure *closure,
+- GValue *return_value,
+- guint n_param_values,
+- const GValue *param_values,
+- gpointer invocation_hint,
+- gpointer marshal_data);
+-
+-/* VOID:INT (marshal.list:4) */
+-#define _vte_marshal_VOID__INT g_cclosure_marshal_VOID__INT
+-
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list