Attachment #851 for bug #2213

View | Details | Raw Unified | Return to bug 2213
Collapse All | Expand All




#include <glade/glade.h>
#include <gtk/gtk.h>
#include <jg_jnu.h>
#include <gtk_java.h>

#define LIBGLADE_DOMAIN "libglade"


    len = (*env)->GetArrayLength(env, buffer);
    buf = (*env)->GetByteArrayElements(env, buffer, NULL);
    if (buf == NULL)
	return NULL;

    rootname = root ? (char *)(*env)->GetStringUTFChars(env, root, 0) : NULL;


    (*env)->ReleaseByteArrayElements(env, buffer, buf, 0);

    if ((*env)->ExceptionCheck(env))
	return NULL;
	
    //(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));
    return getGObjectHandle(env, (GObject *) xml);

    remove_log_handler(handler_id);

    if ((*env)->ExceptionCheck(env))
       return NULL;
       
    //(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));
    return getGObjectHandle(env, (GObject *) xml);

Return to bug 2213

Lines 18-23 Link Here

(-)src/jni/org_gnu_glade_LibGlade.c (-3 / +4 lines)
18	#include <glade/glade.h>	18	#include <glade/glade.h>
19	#include <gtk/gtk.h>	19	#include <gtk/gtk.h>
20	#include <jg_jnu.h>	20	#include <jg_jnu.h>
		21	#include <gtk_java.h>
21		22
22	#define LIBGLADE_DOMAIN "libglade"	23	#define LIBGLADE_DOMAIN "libglade"
23		24
Lines 148-154 Java_org_gnu_glade_LibGlade_glade_1xml_1 Link Here
148	len = (*env)->GetArrayLength(env, buffer);	149	len = (*env)->GetArrayLength(env, buffer);
149	buf = (*env)->GetByteArrayElements(env, buffer, NULL);	150	buf = (*env)->GetByteArrayElements(env, buffer, NULL);
150	if (buf == NULL)	151	if (buf == NULL)
151	return;	152	return NULL;
152		153
153	rootname = root ? (char )(env)->GetStringUTFChars(env, root, 0) : NULL;	154	rootname = root ? (char )(env)->GetStringUTFChars(env, root, 0) : NULL;
154		155
Lines 159-165 Java_org_gnu_glade_LibGlade_glade_1xml_1 Link Here
159	(*env)->ReleaseByteArrayElements(env, buffer, buf, 0);	160	(*env)->ReleaseByteArrayElements(env, buffer, buf, 0);
160		161
161	if ((*env)->ExceptionCheck(env))	162	if ((*env)->ExceptionCheck(env))
162	return;	163	return NULL;
163		164
164	//(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));	165	//(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));
165	return getGObjectHandle(env, (GObject *) xml);	166	return getGObjectHandle(env, (GObject *) xml);
Lines 190-196 Java_org_gnu_glade_LibGlade_glade_1xml_1 Link Here
190	remove_log_handler(handler_id);	191	remove_log_handler(handler_id);
191		192
192	if ((*env)->ExceptionCheck(env))	193	if ((*env)->ExceptionCheck(env))
193	return;	194	return NULL;
194		195
195	//(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));	196	//(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml));
196	return getGObjectHandle(env, (GObject *) xml);	197	return getGObjectHandle(env, (GObject *) xml);