[seed] Fix some more seed_make_exception format strings



commit ef96263eb5f2d75f665afe356ba2dcb6cbea3b08
Author: Robert Carr <racarr svn gnome org>
Date:   Wed Apr 29 17:40:02 2009 -0400

    Fix some more seed_make_exception format strings
---
 libseed/seed-exceptions.c |    2 +-
 libseed/seed-signals.c    |   34 ++++++++++++++++------------------
 libseed/seed-types.c      |    7 ++-----
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/libseed/seed-exceptions.c b/libseed/seed-exceptions.c
index c4084d3..a36b829 100644
--- a/libseed/seed-exceptions.c
+++ b/libseed/seed-exceptions.c
@@ -104,7 +104,7 @@ seed_make_exception_from_gerror (JSContextRef ctx,
 	g_string_truncate (string, i - 1);
 
     }
-  seed_make_exception (ctx, exception, string->str, error->message);
+  seed_make_exception (ctx, exception, string->str, error->message, NULL);
 
   g_string_free (string, TRUE);
 }
diff --git a/libseed/seed-signals.c b/libseed/seed-signals.c
index 8ab346e..47c203d 100644
--- a/libseed/seed-signals.c
+++ b/libseed/seed-signals.c
@@ -125,12 +125,11 @@ seed_gobject_signal_connect_by_name (JSContextRef ctx,
 
   if (argumentCount < 2 || argumentCount > 3)
     {
-      gchar *mes = g_strdup_printf ("Signal connection expected"
-				    " 2 or 3 arguments. Got " "%Zd",
-				    argumentCount);
-      seed_make_exception (ctx, exception, "ArgumentError", mes);
+      seed_make_exception (ctx, exception, "ArgumentError", 
+			   "Signal connection expected"
+			   " 2 or 3 arguments. Got " "%Zd",
+			   argumentCount);
 
-      g_free (mes);
       return JSValueMakeNull (ctx);
     }
 
@@ -265,14 +264,14 @@ seed_gobject_signal_emit (JSContextRef ctx,
 
   if (argumentCount != query.n_params)
     {
-      gchar *mes = g_strdup_printf ("Signal: %s for type %s expected %u "
-				    "arguments, got %Zd",
-				    query.signal_name,
-				    g_type_name (query.itype),
-				    query.n_params,
-				    argumentCount);
-      seed_make_exception (ctx, exception, "ArgumentError", mes);
-      g_free (mes);
+      seed_make_exception (ctx, exception, "ArgumentError", 
+			   "Signal: %s for type %s expected %u "
+			   "arguments, got %Zd",
+			   query.signal_name,
+			   g_type_name (query.itype),
+			   query.n_params,
+			   argumentCount);
+
       return JSValueMakeNull (ctx);
     }
 
@@ -323,12 +322,11 @@ seed_gobject_signal_connect_on_property (JSContextRef ctx,
 
   if ((argumentCount > 2) || (argumentCount == 0))
     {
-      gchar *mes = g_strdup_printf ("Signal connection expected"
-				    " 1, or 2 arguments. Got "
-				    "%Zd", argumentCount);
-      seed_make_exception (ctx, exception, "ArgumentError", mes);
+      seed_make_exception (ctx, exception, "ArgumentError",
+			   "Signal connection expected"
+			   " 1, or 2 arguments. Got "
+			   "%Zd", argumentCount);
 
-      g_free (mes);
       return JSValueMakeNull (ctx);
     }
 
diff --git a/libseed/seed-types.c b/libseed/seed-types.c
index 4dc0ad2..dafa482 100644
--- a/libseed/seed-types.c
+++ b/libseed/seed-types.c
@@ -555,12 +555,9 @@ seed_gi_make_argument (JSContextRef ctx,
 	    arg->v_long = seed_value_to_long (ctx, value, exception);
 	    if (!(interface_type == GI_INFO_TYPE_FLAGS) && !seed_validate_enum ((GIEnumInfo *)interface, arg->v_long))
 	      {
-		gchar *message = 
-		  g_strdup_printf ("Enum value: %ld is out of range", 
-				   arg->v_long);
-		
 		seed_make_exception (ctx, exception, "EnumRange",
-				     message);
+				     "Enum value: %ld is out of range", 
+				     arg->v_long);
 		g_base_info_unref (interface);
 		
 		return FALSE;



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