From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11239 invoked by alias); 3 Apr 2003 22:10:38 -0000 Mailing-List: contact guile-gtk-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: guile-gtk-owner@sources.redhat.com Received: (qmail 11195 invoked from network); 3 Apr 2003 22:10:38 -0000 Received: from unknown (HELO snoopy.pacific.net.au) (61.8.0.36) by sources.redhat.com with SMTP; 3 Apr 2003 22:10:38 -0000 Received: from sunny.pacific.net.au (sunny.pacific.net.au [203.2.228.40]) by snoopy.pacific.net.au (8.12.3/8.12.3/Debian-5) with ESMTP id h33MAY5f002674 for ; Fri, 4 Apr 2003 08:10:34 +1000 Received: from wisma.pacific.net.au (wisma.pacific.net.au [210.23.129.72]) by sunny.pacific.net.au with ESMTP id h33MAYWL028472 for ; Fri, 4 Apr 2003 08:10:34 +1000 (EST) Received: from localhost (ppp109.dyn228.pacific.net.au [203.143.228.109]) by wisma.pacific.net.au (8.12.8/8.12.8) with ESMTP id h33MAWqn023338 for ; Fri, 4 Apr 2003 08:10:33 +1000 (EST) Received: from gg by localhost with local (Exim 3.35 #1 (Debian)) id 191CuQ-0000fq-00; Fri, 04 Apr 2003 08:10:10 +1000 To: guile-gtk@sources.redhat.com Subject: gtk version stuff From: Kevin Ryde Mail-Copies-To: never Date: Thu, 03 Apr 2003 22:10:00 -0000 Message-ID: <87llyrz0zi.fsf@zip.com.au> User-Agent: Gnus/5.090017 (Oort Gnus v0.17) Emacs/21.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-SW-Source: 2003-q2/txt/msg00006.txt.bz2 --=-=-= Content-length: 593 A bit of filling in the gaps for the gtk version numbers. I propose taking gtk-major-version and gtk-minor-version from the global variables rather having values in gtk.scm. Not that they'll be anything except 1 and 2, but just to ensure guile-gtk exactly reflects what libgtk says about itself. * gtk-support.c (sgtk_init_gtk_support): Add gtk_major_version, gtk_minor_version, gtk_micro_version, gtk_binary_age, gtk_interface_age. * gtk-1.2/gtk.scm (gtk-major-version, gtk-minor-version): Remove. * gtk-1.2.defs (gtk_check_version): New function. --=-=-= Content-Disposition: attachment; filename=gtk-support.c.versions.diff Content-length: 1083 CVS_RSH not defined /usr/bin/cvs -d :pserver:anoncvs@subversions.gnu.org:/cvsroot/guile-gtk diff -r1.4 -u gtk-support.c Index: gtk-support.c =================================================================== RCS file: /cvsroot/guile-gtk/guile-gtk-1.2/gtk-support.c,v retrieving revision 1.4 diff -u -u -r1.4 gtk-support.c --- gtk-support.c 30 Mar 2003 13:46:01 -0000 1.4 +++ gtk-support.c 3 Apr 2003 22:03:24 -0000 @@ -743,4 +743,12 @@ kw_type = scm_make_keyword_from_dash_symbol (sym_type); kw_flags = scm_make_keyword_from_dash_symbol (sym_flags); + + /* Use the library variables so as to indicate what we're running with, + not GTK_MAJOR_VERSION etc which would be what we compiled against. */ + scm_c_define ("gtk-major-version", scm_ulong2num (gtk_major_version)); + scm_c_define ("gtk-minor-version", scm_ulong2num (gtk_minor_version)); + scm_c_define ("gtk-micro-version", scm_ulong2num (gtk_micro_version)); + scm_c_define ("gtk-binary-age", scm_ulong2num (gtk_binary_age)); + scm_c_define ("gtk-interface-age", scm_ulong2num (gtk_interface_age)); } --=-=-= Content-Disposition: attachment; filename=gtk.scm.versions.diff Content-length: 357 --- gtk.scm.~1.2.~ 2003-01-31 19:11:03.000000000 +1000 +++ gtk.scm 2003-04-03 15:26:43.000000000 +1000 @@ -2,9 +2,6 @@ :use-module (gtk-1.2 dynlink) :use-module (gtk-1.2 gdk)) -(define-public gtk-major-version 1) -(define-public gtk-minor-version 2) - (merge-compiled-code "sgtk_init_gtk_gtk_glue" "libguilegtk-1.2") (define-public (gtk-update) --=-=-= Content-Disposition: attachment; filename=gtk-1.2.defs.versions.diff Content-length: 355 --- gtk-1.2.defs.~1.9.~ 2003-04-04 08:04:22.000000000 +1000 +++ gtk-1.2.defs 2003-04-04 08:07:41.000000000 +1000 @@ -4,6 +4,12 @@ (import "gdk-1.2.defs") +(define-func gtk_check_version + static_string + ((uint major) + (uint minor) + (uint micro))) + (define-enum GtkWindowType (toplevel GTK_WINDOW_TOPLEVEL) (dialog GTK_WINDOW_DIALOG) --=-=-=--