--- a/lisp/gnuserv.el	Mon Aug 13 11:43:25 2007 +0200
+++ b/lisp/gnuserv.el	Mon Aug 13 11:44:37 2007 +0200
@@ -271,6 +271,7 @@
 (defun gnuserv-main-frame-function (type)
   "Return a sensible value for the main Emacs frame."
   (if (or (eq type 'x)
+	  (eq type 'gtk)
 	  (eq type 'mswindows))
       (car (frame-list))
     nil))
@@ -280,6 +281,7 @@
 This is meant in the X sense, so it will not return frames that are on another
 visual screen.  Totally visible frames are preferred.  If none found, return nil."
   (if (or (eq type 'x)
+	  (eq type 'gtk)
 	  (eq type 'mswindows))
       (cond ((car (filtered-frame-list 'frame-totally-visible-p
 				       (selected-device))))
@@ -428,6 +430,7 @@
 			 ((null dest-frame)
 			  (case (car type)
 			    (tty (apply 'make-tty-device (cdr type)))
+			    (gtk (make-gtk-device))
 			    (x   (make-x-device (cadr type)))
 			    (mswindows   (make-mswindows-device))
 			    (t   (error "Invalid device type"))))