Re: Let's tell we are using GTK+

[Terje Rosten <terjeros@phys.ntnu.no>]

* Lute Kamstra
| 
| Maybe the GTK version should be mentioned as well.

Updated patches with version information and the (annoying?) +
sign removed. emacs-version will now display something like this:

 GNU Emacs 21.3.50.1 (i686-pc-linux-gnu, GTK+ 2.2.1) of 2003-08-04 on 
 myhost.net


 - Terje


Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.590
diff -u -r1.590 xfns.c
--- src/xfns.c	31 Jul 2003 16:10:53 -0000	1.590
+++ src/xfns.c	4 Aug 2003 19:27:05 -0000
@@ -125,6 +125,14 @@
 
 #endif /* USE_X_TOOLKIT */
 
+#ifdef USE_GTK
+
+/* GTK+ version info */
+
+static Lisp_Object Vgtk_version_string;
+
+#endif /* USE_GTK */
+
 #ifdef HAVE_X11R4
 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
 #else
@@ -10885,6 +10893,19 @@
   Vmotif_version_string = build_string (XmVERSION_STRING);
 #endif /* USE_MOTIF */
 #endif /* USE_X_TOOLKIT */
+
+#ifdef USE_GTK
+  Fprovide (intern ("gtk-toolkit"), Qnil);
+
+  DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
+	       doc: /* Version info for GTK+.  */);
+  {
+    char gtk_version[8];
+    sprintf (gtk_version, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
+	     GTK_MICRO_VERSION);
+    Vgtk_version_string = build_string (gtk_version);
+  }
+#endif /* USE_GTK */
 
   /* X window properties.  */
   defsubr (&Sx_change_window_property);
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.3331
diff -u -r1.3331 ChangeLog
--- src/ChangeLog	31 Jul 2003 16:10:53 -0000	1.3331
+++ src/ChangeLog	4 Aug 2003 19:27:08 -0000
@@ -1,3 +1,7 @@
+2003-08-04  Terje Rosten <terjeros@phys.ntnu.no>
+
+	* xfns.c (syms_of_xfns): Add information about GTK+ version.
+
 2003-07-31  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.




Index: lisp/version.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/version.el,v
retrieving revision 2.32
diff -u -r2.32 version.el
--- lisp/version.el	4 Feb 2003 12:12:31 -0000	2.32
+++ lisp/version.el	4 Aug 2003 19:26:46 -0000
@@ -62,6 +62,8 @@
 		 (cond ((featurep 'motif)
 			(concat ", " (substring motif-version-string 4)))
 		       ((featurep 'x-toolkit) ", X toolkit")
+		       ((featurep 'gtk-toolkit)
+			(concat ", GTK+ " gtk-version-string))
 		       (t ""))
 		 (if (and (boundp 'x-toolkit-scroll-bars)
 			  (memq x-toolkit-scroll-bars '(xaw xaw3d)))
Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.5325
diff -u -r1.5325 ChangeLog
--- lisp/ChangeLog	3 Aug 2003 14:10:33 -0000	1.5325
+++ lisp/ChangeLog	4 Aug 2003 19:26:48 -0000
@@ -1,3 +1,7 @@
+2003-08-04 Terje Rosten <terjeros@phys.ntnu.no>
+
+	* version.el (emacs-version): Check for gtk-toolkit.
+
 2003-08-03  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
 	* calendar/calendar.el (diary-file, diary-file-name-prefix)