[Emacs-diffs] emacs/src ChangeLog emacs-icon.h

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/24 14:27:48

Modified files:
        src            : ChangeLog emacs-icon.h 

Log message:
        * emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7599&r2=1.7600
http://cvs.savannah.gnu.org/viewcvs/emacs/src/emacs-icon.h?cvsroot=emacs&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7599
retrieving revision 1.7600
diff -u -b -r1.7599 -r1.7600
--- ChangeLog   24 Jun 2009 04:24:18 -0000      1.7599
+++ ChangeLog   24 Jun 2009 14:27:47 -0000      1.7600
@@ -1,3 +1,7 @@
+2009-06-24  Chong Yidong  <address@hidden>
+
+       * emacs-icon.h: Always define gnu_xpm_bits on GTK (bug#3671).
+
 2009-06-24  Kenichi Handa  <address@hidden>
 
        * fontset.c (fontset_get_font_group): Return 0 if no font-group is

Index: emacs-icon.h
===================================================================
RCS file: /sources/emacs/emacs/src/emacs-icon.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- emacs-icon.h        8 Jan 2009 03:15:34 -0000       1.4
+++ emacs-icon.h        24 Jun 2009 14:27:48 -0000      1.5
@@ -20,8 +20,9 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+/* 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 char * gnu_xpm_bits[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 255 2",
@@ -314,7 +315,7 @@
 "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