fixing terminator in g_object_set

4 files changed, 19 insertions, 19 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 14217f6d4b..cf60b3c5c5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -484,29 +484,29 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1object_1ref)
 }
 #endif
 
-#ifndef NO_g_1object_1set__I_3BF
-JNIEXPORT void JNICALL OS_NATIVE(g_1object_1set__I_3BF)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jfloat arg2)
+#ifndef NO_g_1object_1set__I_3BFI
+JNIEXPORT void JNICALL OS_NATIVE(g_1object_1set__I_3BFI)
+	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jfloat arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
-	NATIVE_ENTER(env, that, "g_1object_1set__I_3BF\n")
+	NATIVE_ENTER(env, that, "g_1object_1set__I_3BFI\n")
 	if (arg1) lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL);
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2);
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
 	if (arg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	NATIVE_EXIT(env, that, "g_1object_1set__I_3BF\n")
+	NATIVE_EXIT(env, that, "g_1object_1set__I_3BFI\n")
 }
 #endif
 
-#ifndef NO_g_1object_1set__I_3BI
-JNIEXPORT void JNICALL OS_NATIVE(g_1object_1set__I_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#ifndef NO_g_1object_1set__I_3BII
+JNIEXPORT void JNICALL OS_NATIVE(g_1object_1set__I_3BII)
+	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
-	NATIVE_ENTER(env, that, "g_1object_1set__I_3BI\n")
+	NATIVE_ENTER(env, that, "g_1object_1set__I_3BII\n")
 	if (arg1) lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL);
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2);
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
 	if (arg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	NATIVE_EXIT(env, that, "g_1object_1set__I_3BI\n")
+	NATIVE_EXIT(env, that, "g_1object_1set__I_3BII\n")
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 313f63f06b..4153ee7abd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -341,8 +341,8 @@ public static final synchronized native int g_log_set_handler(byte[] log_domain,
 public static final synchronized native int g_malloc(int size);
 public static final synchronized native int g_object_get_qdata(int object, int quark);
 public static final synchronized native int g_object_ref(int object);
-public static final synchronized native void g_object_set(int object, byte[] first_property_name, int data);
-public static final synchronized native void g_object_set(int object, byte[] first_property_name, float data);
+public static final synchronized native void g_object_set(int object, byte[] first_property_name, int data, int terminator);
+public static final synchronized native void g_object_set(int object, byte[] first_property_name, float data, int terminator);
 public static final synchronized native void g_object_set_qdata(int object, int quark, int data);
 public static final synchronized native void g_object_unref(int object);
 public static final synchronized native int g_quark_from_string(byte[] string);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index 6df2ec1c58..d5d0a2f356 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -270,18 +270,18 @@ void createRenderers (int columnHandle, int modelIndex, boolean check, int colum
 	* to be activatable.
 	*/
 	if ((style & SWT.CHECK) != 0 && check) {
-		OS.g_object_set (pixbufRenderer, OS.mode, OS.GTK_CELL_RENDERER_MODE_ACTIVATABLE);
+		OS.g_object_set (pixbufRenderer, OS.mode, OS.GTK_CELL_RENDERER_MODE_ACTIVATABLE, 0);
 	}
 
 	/* Set alignment */
 	if ((columnStyle & SWT.RIGHT) != 0) {
-		OS.g_object_set (textRenderer, OS.xalign, 1f);
-		OS.g_object_set (pixbufRenderer, OS.xalign, 1f);
+		OS.g_object_set (textRenderer, OS.xalign, 1f, 0);
+		OS.g_object_set (pixbufRenderer, OS.xalign, 1f, 0);
 		OS.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, true);
 		OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, false);
 		OS.gtk_tree_view_column_set_alignment (columnHandle, 1f);
 	} else if ((columnStyle & SWT.CENTER) != 0) {
-		OS.g_object_set (pixbufRenderer, OS.xalign, 1f);
+		OS.g_object_set (pixbufRenderer, OS.xalign, 1f, 0);
 		OS.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, true);
 		OS.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
 		OS.gtk_tree_view_column_set_alignment (columnHandle, 0.5f);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 0b57a74f5c..bd79b4716d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -220,7 +220,7 @@ void createHandle (int index) {
 	* to be activatable.
 	*/
 	if ((style & SWT.CHECK) != 0) {
-		OS.g_object_set (pixbufRenderer, OS.mode, OS.GTK_CELL_RENDERER_MODE_ACTIVATABLE);
+		OS.g_object_set (pixbufRenderer, OS.mode, OS.GTK_CELL_RENDERER_MODE_ACTIVATABLE, 0);
 	}
 	int textRenderer = OS.gtk_cell_renderer_text_new ();
 	if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);