-# Bazaar merge directive format 2 (Bazaar 0.90)

-# revision_id: serkan@gentoo.org-20090319042831-azrs6hi2bhyf1mfi

-# target_branch: ../mainline/

-# testament_sha1: 69eb7f6ad524eab24851ad0e52b0d23a4b57daaa

-# timestamp: 2009-03-19 06:33:22 +0200

-# source_branch: ../i18n-javadoc.patch

-# base_revision_id: andrew@operationaldynamics.com-20090308112053-\

-# v18zrak1zwyzkdyh

-#

-# Begin patch

-=== modified file 'build/faster'

---- build/faster 2008-12-20 12:47:05 +0000

-+++ build/faster 2009-03-19 04:28:31 +0000

-@@ -655,6 +655,7 @@

- cmd += "-exclude org.freedesktop.bindings "

- cmd += "src/bindings/org/freedesktop/bindings/Time.java "

- cmd += "src/bindings/org/freedesktop/bindings/Version.java "

-+ cmd += "src/bindings/org/freedesktop/bindings/Internationalization.java "

- if not verbose:

- cmd += " >/dev/null"

-

-

-# Begin bundle

-IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYXy8nYAAd1fgCAwUWv//3/v

-f/C////wUASekZKMVNV7sA4aaiBJ5NTyDUZkmTJoaDDSek0aPUaeUNqMgSkgp6jwynqZT1P0UPU9

-Q0NGh6gBoA9QGjQOGmmRiMJpgIYBNMIwTEyGmRoaAZSjI0ZGgAaaAAANDCAAANBKEEAI00noaAIn

-qaZTzSaan6p6jTJhBo2kmEdVkys2gm+j/gltnnP5zJIKjl4SNTLWkRCoexnkmzVFjywFxrzsCHiI

-JodSjcy4AcJEGFblsaAuVGJ333qF8IVNLVuBHwQ65QsDTitU1ZbzDxyrjgN++iKktrQCuYFJwkVx

-EDyTgm8/zTpJ+AKBbcBwNpfo8Lw8L5V0/ZQpn7RDEdBD5ydWqb3RUNlHQ1WUpEZfHJbBhgDdG91h

-xM3QYAhFogsg5UUzAyCfgoIbSqk5SF+v15OfBkMSlMfFATdhcq2igwgyJEejyPkE9dSiSUY9XpVU

-lP6EU4ExHEozPlRQZpbobAOIJnVgDnA0UjhT6kvMyawIV1vSKGBeBYYQJyzhUWmOsGBpQGAkCyrC

-XMaaxi6k6thJIpMUgVtoH17VNZdIvwzk+SS1+uQW+DSUkSKwYLz81WFVjRiOPtsKRCmUmwnCywCr

-LJlGSxUMz4LqnQ9Jygn0ZihCmIE6Q/BONoMoyUKEj222FAI4B85EuKcCJEuKTu30EeyzE8fUlhQm

-sIVVkUI7ijkYlE/VT4dV1hKN2Y2UWdhpdXxM2BbKg2VLWEEgHXtjq06tgs6aH4RxglDLOK0B8IeL

-vYrmqctuqZ3th2rW41M88PtPphMV2bfHYKWRn55YnFmuGg+aiBBqaS5Hd9w1J+wuAPY2hWubxNF3

-XpuhVZ083bDNqpXnyKBQGix/esnnwghzP0Mgcz5c/mTdVNp422GM5oGQTkpKoLfRAxg2pEHUTXPS

-jdgEB1P5NdqkAMqsiKvGCrHJtZEgD3eJL0DLwmD966CcoCY3EbIwqHHtu1TL/uMO5wXZ1+qW4E6V

-OBiQR92I+hXOayVLnjBdtCtDdfmc3E1i8UUF2SGf1NMxYKia8hpa8qCBCOMkXojsKOx5VwSCHsRh

-K6cbY8An8lEHnveHKTYTFRIuKlA1Chp3RDQotJQLClN548LSwaRgfGJdUryG5wXENAJlxomcQxVx

-T709P8cjPv0wZCKWdgHJ/IDOF6KGz5doD7y2mBJfIUFsLNFYpCpnIXMZQ9H7CUNUREBCAUA5CAvo

-0hk427F6QYgJ5abqIM4F1BO+M2hWwFMiPAESFSXxkylXtBUtindqmKwHhol73dZFnnJRGEOm783i

-Go7QxGEs4ChHU7WqL/bjWKgj1E40uD1yiHsaBT3GdCQQN/EQgp4AwZ5noeoQy6nhV5RSxNM32mJt

-msIEgE2+MRaiBovXrZHIZA6XIfH1UXHXOiVdpbYqO0hWCUyqiDAp0OtDEgPgoqneyNv1Ao2ACzCt

-4OyHDR91tS3mjZXmXIRbclSiPrKgnYJphFkt9Npb2xIe803D3DVQMaSF9I4lAgIdhKgwkFC2Dhxh

-sTWSU4R0BTZlqqSKORE+teoMnpATuhXtGZcOIHnSBmDxMA0L+UFrCEDb5w/xdyRThQkIXy8nYA==

---- configure.old 2008-09-27 01:43:55.000000000 -0400

-+++ configure 2008-09-27 01:44:12.000000000 -0400

-@@ -1840,7 +1840,7 @@

- print CONFIG "CCACHE=$ccache\n";

- }

-

-- print CONFIG "CC=$cc -g -Wall -fPIC $jni_include -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -Werror-implicit-function-declaration -Wfatal-errors\n";

-+ print CONFIG "CC=$cc -g -Wall -fPIC $jni_include -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -Werror-implicit-function-declaration -Wfatal-errors\n";

- print CONFIG "CC_CMD=GCC \n";

- print CONFIG "LINK=$cc -g -shared -Wall -fPIC\n";

- print CONFIG "LINK_CMD=LINK \n";

---- build/faster.old 2008-08-17 00:16:23.000000000 -0400

-+++ build/faster 2008-08-17 00:16:29.000000000 -0400

-@@ -656,7 +656,6 @@

-

- def generateDocumentation():

- compileDocumentation()

-- takeSnapshots()

-

- #

- # Final miscallaneous execution targets, taking advantage of the fact that

-=== modified file 'src/bindings/org/gnome/gtk/GtkWindowOverride.c'

---- src/bindings/org/gnome/gtk/GtkWindowOverride.c 2007-11-13 05:08:42 +0000

-+++ src/bindings/org/gnome/gtk/GtkWindowOverride.c 2008-12-27 04:02:05 +0000

-@@ -59,7 +59,7 @@

- )

- {

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: delete caught for\t\t%ld\n", (long) object);

-+ g_printerr("mem: delete caught for\t\t%s\n", bindings_java_memory_pointerToString(object));

- }

- gtk_widget_hide(object);

-

-@@ -102,7 +102,7 @@

- )

- {

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: hide caught for\t\t%ld\n", (long) widget);

-+ g_printerr("mem: hide caught for\t\t%s\n", bindings_java_memory_pointerToString(widget));

- }

- gdk_threads_add_timeout_full(G_PRIORITY_LOW, 100, window_hide_deref, widget, NULL);

- }

-@@ -123,7 +123,7 @@

- )

- {

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: show caught for\t\t%ld\n", (long) widget);

-+ g_printerr("mem: show caught for\t\t%s\n", bindings_java_memory_pointerToString(widget));

- }

- g_object_ref(widget);

- }

-

-=== modified file 'src/jni/bindings_java_memory.c'

---- src/jni/bindings_java_memory.c 2008-04-06 08:23:22 +0000

-+++ src/jni/bindings_java_memory.c 2008-12-27 04:02:05 +0000

-@@ -65,7 +65,7 @@

- * GObject, and remove strong Java reference

- */

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: toggle Java ref to WEAK\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: toggle Java ref to WEAK\t%s\n", bindings_java_memory_pointerToString(object));

- }

- weak = (*env)->NewWeakGlobalRef(env, ref);

- g_object_set_data(object, REFERENCE, weak);

-@@ -77,7 +77,7 @@

- * replaced it with a strong one.

- */

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: toggle Java ref to STRONG\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: toggle Java ref to STRONG\t%s\n", bindings_java_memory_pointerToString(object));

- }

-

- strong = (*env)->NewGlobalRef(env, ref);

-@@ -109,7 +109,7 @@

-

-

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: drop GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: drop GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));

- }

- g_object_unref(object);

- return FALSE;

-@@ -145,7 +145,7 @@

- */

-

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: add STRONG Java ref\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: add STRONG Java ref\t%s\n", bindings_java_memory_pointerToString(object));

- }

- strong = (*env)->NewGlobalRef(env, target);

- g_object_set_data(object, REFERENCE, strong);

-@@ -189,12 +189,23 @@

- )

- {

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: remove toggle ref for\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: remove toggle ref for\t%s\n", bindings_java_memory_pointerToString(object));

- }

-

- g_object_remove_toggle_ref(object, bindings_java_toggle, NULL);

- }

-

-+/**

-+ * Ensure we properly own a GObject.

-+ *

-+ * This is really important. The aggregate result ensures that we own one Ref

-+ * count to the object - no more, no less - which we can then turn into a

-+ * ToggleRef. It needs to be called anywhere we are preparing to create a

-+ * Proxy.

-+ */

-+/*

-+ * TODO This needs a better name

-+ */

- void

- bindings_java_memory_cleanup

- (

-@@ -217,7 +228,7 @@

- if (owner) {

- if (G_IS_INITIALLY_UNOWNED(object) && g_object_is_floating(object)) {

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: sink GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: sink GObject ref\t\t%s\n", bindings_java_memory_pointerToString(object));

- }

- g_object_ref_sink(object);

- }

-@@ -227,7 +238,7 @@

- * Object constructor assumes we actually own the object.

- */

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: added extra ref for\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: added extra ref for\t%s\n", bindings_java_memory_pointerToString(object));

- }

- g_object_ref(object);

- }

-@@ -240,7 +251,7 @@

- */

- if (owner) {

- if (DEBUG_MEMORY_MANAGEMENT) {

-- g_print("mem: remove ref for\t%s\n", bindings_java_memory_pointerToString(object));

-+ g_printerr("mem: remove ref for\t%s\n", bindings_java_memory_pointerToString(object));

- }

- g_object_unref(object);

- }

-

-=== modified file 'src/jni/bindings_java_signal.c'

---- src/jni/bindings_java_signal.c 2008-08-05 04:11:54 +0000

-+++ src/jni/bindings_java_signal.c 2008-12-27 03:13:14 +0000

-@@ -97,13 +97,14 @@

-

- jstring _str;

- gchar* str;

-+ GObject* obj;

-

- /*

- * Begin marshaller by downcasting the GClosure we got.

- */

-

- bjc = (BindingsJavaClosure*) closure;

--

-+

- /*

- * Get the JNIEnv interface pointer

- */

-@@ -131,12 +132,12 @@

- */

-

- jargs = g_newa(jvalue, n_param_values + 1);

--

-+

- jargs[0].l = bjc->handler;

--

-+

- for(i = 0; i < n_param_values; i++) {

-- type = G_VALUE_TYPE(&param_values[i]);

-- switch(G_TYPE_FUNDAMENTAL(type)) {

-+ type = G_VALUE_TYPE(&param_values[i]);

-+ switch(G_TYPE_FUNDAMENTAL(type)) {

- case G_TYPE_CHAR:

- jargs[i+1].c = g_value_get_char(&param_values[i]);

- break;

-@@ -193,8 +194,10 @@

- * address across the boundary to be looked up and

- * either an existing Proxy returned or a new Proxy

- * created.

-- */

-- jargs[i+1].j = (jlong) g_value_get_object(&param_values[i]);

-+ */

-+ obj = g_value_get_object(&param_values[i]);

-+ bindings_java_memory_cleanup(obj, FALSE);

-+ jargs[i+1].j = (jlong) obj;

- break;

-

- case G_TYPE_BOXED:

-

-# Bazaar merge directive format 2 (Bazaar 0.90)

-# revision_id: serkan@gentoo.org-20081005045146-jspegmo5ljm2less

-# target_branch: ../mainline/

-# testament_sha1: aad4b35143ec69622f6af833be1c41e8ba3c742a

-# timestamp: 2008-10-05 07:54:22 +0300

-# base_revision_id: andrew@operationaldynamics.com-20081004065325-\

-# grsoaun9jq879ia2

-#

-# Begin patch

-=== modified file 'src/bindings/org/gnome/gdk/CrossingMode.java'

---- src/bindings/org/gnome/gdk/CrossingMode.java 2008-03-27 05:45:36 +0000

-+++ src/bindings/org/gnome/gdk/CrossingMode.java 2008-10-05 04:51:46 +0000

-@@ -46,4 +46,19 @@

- * Event occurred because an ungrab happened.

- */

- public static final CrossingMode UNGRAB = new CrossingMode(GdkCrossingMode.UNGRAB, "UNGRAB");

-+

-+ /**

-+ * Event occurred because a GTK+ grab happened.

-+ */

-+ public static final CrossingMode GTK_GRAB = new CrossingMode(GdkCrossingMode.GTK_GRAB, "GTK_GRAB");

-+

-+ /**

-+ * Event occurred because a GTK+ ungrab happened.

-+ */

-+ public static final CrossingMode GTK_UNGRAB = new CrossingMode(GdkCrossingMode.GTK_UNGRAB, "GTK_UNGRAB");

-+

-+ /**

-+ * Event occurred because a GTK+ widget changed state.

-+ */

-+ public static final CrossingMode STATE_CHANGED = new CrossingMode(GdkCrossingMode.STATE_CHANGED, "STATE_CHANGED");

- }

-

-=== modified file 'src/defs/GdkCrossingMode.defs'

---- src/defs/GdkCrossingMode.defs 2007-04-14 23:21:13 +0000

-+++ src/defs/GdkCrossingMode.defs 2008-10-05 04:51:46 +0000

-@@ -6,6 +6,9 @@

- '("normal" "GDK_CROSSING_NORMAL")

- '("grab" "GDK_CROSSING_GRAB")

- '("ungrab" "GDK_CROSSING_UNGRAB")

-+ '("gtk-grab" "GDK_CROSSING_GTK_GRAB")

-+ '("gtk-ungrab" "GDK_CROSSING_GTK_UNGRAB")

-+ '("state-changed" "GDK_CROSSING_STATE_CHANGED")

- )

- )

-

-

-# Begin bundle

-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