seed r346 - trunk/libseed



Author: racarr
Date: Tue Nov 25 06:32:55 2008
New Revision: 346
URL: http://svn.gnome.org/viewvc/seed?rev=346&view=rev

Log:
Remove global context from anything related to exception<->gerror


Modified:
   trunk/libseed/seed-engine.c
   trunk/libseed/seed-exceptions.c
   trunk/libseed/seed-exceptions.h

Modified: trunk/libseed/seed-engine.c
==============================================================================
--- trunk/libseed/seed-engine.c	(original)
+++ trunk/libseed/seed-engine.c	Tue Nov 25 06:32:55 2008
@@ -381,7 +381,7 @@
 	}
 	else
 	{
-		seed_make_exception_from_gerror(exception, error);
+		seed_make_exception_from_gerror(ctx, exception, error);
 
 		g_free(in_args);
 		g_free(out_args);
@@ -866,7 +866,7 @@
 	if (!g_irepository_require(g_irepository_get_default(), namespace,
 							   version, 0, &e))
 	{
-		seed_make_exception_from_gerror(exception, e);
+		seed_make_exception_from_gerror(ctx, exception, e);
 		return JSValueMakeNull(ctx);
 	}
 

Modified: trunk/libseed/seed-exceptions.c
==============================================================================
--- trunk/libseed/seed-exceptions.c	(original)
+++ trunk/libseed/seed-exceptions.c	Tue Nov 25 06:32:55 2008
@@ -56,7 +56,9 @@
 	JSStringRelease(js_message);
 }
 
-void seed_make_exception_from_gerror(JSValueRef * exception, GError * error)
+void seed_make_exception_from_gerror(JSContextRef ctx, 
+									 JSValueRef * exception, 
+									 GError * error)
 {
 	const gchar *domain = g_quark_to_string(error->domain);
 	GString *string = g_string_new(domain);
@@ -74,7 +76,7 @@
 			g_string_truncate(string, i - 1);
 
 	}
-	seed_make_exception(eng->context, 
+	seed_make_exception(ctx, 
 						exception,
 						string->str,
 						error->message);

Modified: trunk/libseed/seed-exceptions.h
==============================================================================
--- trunk/libseed/seed-exceptions.h	(original)
+++ trunk/libseed/seed-exceptions.h	Tue Nov 25 06:32:55 2008
@@ -26,7 +26,8 @@
 void seed_make_exception(JSContextRef ctx, JSValueRef * exception,
 						 const gchar * name, const gchar * message);
 
-void seed_make_exception_from_gerror(JSValueRef * exception, GError * e);
+void seed_make_exception_from_gerror(JSContextRef ctx,
+									 JSValueRef * exception, GError * e);
 
 gchar *seed_exception_get_name(JSValueRef e);
 gchar *seed_exception_get_message(JSValueRef e);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]