From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: guile-gnome, devel: fix scm_c_gparam_construct Date: Thu, 15 May 2014 11:47:42 -0300 Message-ID: <20140515114742.1af03157@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/=oMLcHUjYKFM_v.PC_fUOrO" X-Trace: ger.gmane.org 1400165319 19585 80.91.229.3 (15 May 2014 14:48:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 15 May 2014 14:48:39 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Thu May 15 16:48:32 2014 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WkwxT-0001K1-61 for guile-devel@m.gmane.org; Thu, 15 May 2014 16:48:31 +0200 Original-Received: from localhost ([::1]:58553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkwxS-0005f8-Je for guile-devel@m.gmane.org; Thu, 15 May 2014 10:48:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkwxL-0005ez-En for guile-devel@gnu.org; Thu, 15 May 2014 10:48:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkwxF-0006Ew-FK for guile-devel@gnu.org; Thu, 15 May 2014 10:48:23 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:36409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkwxF-00068z-8v for guile-devel@gnu.org; Thu, 15 May 2014 10:48:17 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id ED90FA04C159 for ; Thu, 15 May 2014 16:47:54 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id o-wDFJICzgrO for ; Thu, 15 May 2014 16:29:13 +0200 (CEST) Original-Received: from capac (unknown [189.60.2.251]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id 2DD7AA04C152 for ; Thu, 15 May 2014 16:47:44 +0200 (CEST) X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:17144 Archived-At: --MP_/=oMLcHUjYKFM_v.PC_fUOrO Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, guile-gnome, devel: fix scm_c_gparam_construct Patch review solicited. Thanks, David --MP_/=oMLcHUjYKFM_v.PC_fUOrO Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0006-fix-scm_c_gparam_construct.patch >From 1ded9f737d258afbb53f2f2fcfde6766da23bbb6 Mon Sep 17 00:00:00 2001 From: David PIROTTE 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 --MP_/=oMLcHUjYKFM_v.PC_fUOrO--