X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/341dd15a7bd9d0b4adff846e94289b3e1877eed1..4d89ee379aae4a0d087fa6734524e59e37b9cbc5:/src/emacs-icon.h

diff --git a/src/emacs-icon.h b/src/emacs-icon.h
index a727003fe7..60d1487e19 100644
--- a/src/emacs-icon.h
+++ b/src/emacs-icon.h
@@ -1,16 +1,16 @@
 /* XPM */
 /* Emacs icon
 
-Copyright (C) 2008  Free Software Foundation, Inc.
+Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
 Author:  Kentaro Ohkouchi <nanasess@fsm.ne.jp>
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,15 +18,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-Commentary:
-
-*/
-#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
-static char * gnu_xpm_bits[] = {
+/* Note that the GTK port uses gdk to display the icon, so Emacs need
+   not have XPM support compiled in.  */
+#if (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK)
+static const char * gnu_xpm_bits[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 255 2",
 /* colors */
@@ -318,7 +315,7 @@ static char * gnu_xpm_bits[] = {
 "OPOPOPOPOPOPOPOPILILBIILPKCBJAAHJFBPILILOBOBAIOPOPOPOPOPOPOPOPOP",
 "OPOPOPOPOPOPOPOPOPOPILMIGECABCPKGHAIILOBOBOPOPOPOPOPOPOPOPOPOPOP",
 "OPOPOPOPOPOPOPOPOPOPOPOPOPCAOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOPOP"};
-#endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
+#endif /* (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK) */
 
 #define gnu_xbm_width 50
 #define gnu_xbm_height 50
@@ -354,5 +351,3 @@ static unsigned char gnu_xbm_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00};
 
-/* arch-tag: b57020c7-c937-4d77-8ca6-3875178d9828
-   (do not change this comment) */