From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 03:06:07 +0000 (-0700)
Subject: * xsmfns.c (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dde42981250a59d7374b927fafb78525c82be1eb;p=emacs.git

* xsmfns.c (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c48e1926f8..325c6ee8434 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* xsmfns.c (create_client_leader_window): Rename shadowing arg.
 	Remove unused var.
+	(gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.
 
 	* xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.
 
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 4a5d80b372a..c199036587f 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -41,7 +41,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "process.h"
 #include "keyboard.h"
 
-#ifndef HAVE_GTK3
+#if defined USE_GTK && !defined HAVE_GTK3
 #define gdk_x11_set_sm_client_id(w) gdk_set_sm_client_id (w)
 #endif