unofficial mirror of guile-devel@gnu.org 
 help / color / mirror / Atom feed
From: David Pirotte <david@altosw.be>
To: guile-devel <guile-devel@gnu.org>
Subject: guile-gnome, devel: fix scm_c_gparam_construct
Date: Thu, 15 May 2014 11:47:42 -0300	[thread overview]
Message-ID: <20140515114742.1af03157@capac> (raw)

[-- Attachment #1: Type: text/plain, Size: 104 bytes --]

Hello,

	guile-gnome,
	  devel:
	    fix scm_c_gparam_construct

Patch review solicited.

Thanks,
David

[-- Attachment #2: 0006-fix-scm_c_gparam_construct.patch --]
[-- Type: text/x-patch, Size: 1456 bytes --]

From 1ded9f737d258afbb53f2f2fcfde6766da23bbb6 Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Thu, 15 May 2014 11:33:13 -0300
Subject: [PATCH 6/6] fix scm_c_gparam_construct

* glib/gnome/gobject/gparameter.c: argument 4 of g_param_spec_gtyped
  must be a GType, not a SCM type.
---
 glib/gnome/gobject/gparameter.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/glib/gnome/gobject/gparameter.c b/glib/gnome/gobject/gparameter.c
index 52d1700..d2a24ce 100644
--- a/glib/gnome/gobject/gparameter.c
+++ b/glib/gnome/gobject/gparameter.c
@@ -242,7 +242,7 @@ scm_c_gparam_construct (SCM instance, SCM initargs)
 {
     GParamSpec *pspec = NULL;
     GParamFlags flags;
-    GType param_type;
+    GType param_type, param_gtype;
     char *name, *nick, *blurb;
 
     param_type = scm_c_gtype_class_to_gtype (scm_class_of (instance));
@@ -402,8 +402,10 @@ scm_c_gparam_construct (SCM instance, SCM initargs)
     else if (param_type == G_TYPE_PARAM_GTYPE) {
         SCM type = REF (is_a_type);
         if (scm_is_true (type))
-            type = scm_c_gtype_class_to_gtype (type);
-        pspec = g_param_spec_gtype (name, nick, blurb, type, flags);
+	    param_gtype = scm_c_gtype_class_to_gtype (type);
+	else
+	    param_gtype = G_TYPE_NONE;
+        pspec = g_param_spec_gtype (name, nick, blurb, param_gtype, flags);
     }
     else {
         scm_c_gruntime_error ("%gparam-construct",
-- 
2.0.0.rc0


                 reply	other threads:[~2014-05-15 14:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/guile/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140515114742.1af03157@capac \
    --to=david@altosw.be \
    --cc=guile-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).