Re: Consolidation of image support in new image.c file.

[David PONCE <david.ponce@wanadoo.fr>]

Hi Kim,

Following your change to consolidate image support I had to apply this
patch to fix a link error when building Emacs "--with-gtk".

This is because in that case the function `xg_set_icon' in xfns.c
calls `x_find_image_file' which is now in image.c

Hope it helps.

Sincerely,
David

Index: src/dispextern.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v
retrieving revision 1.168
diff -c -r1.168 dispextern.h
*** src/dispextern.h	11 Mar 2004 22:42:47 -0000	1.168
--- src/dispextern.h	12 Mar 2004 10:29:46 -0000
***************
*** 2618,2624 ****
  #endif
  extern void x_destroy_all_bitmaps P_ ((Display_Info *));
  extern int x_create_bitmap_mask P_ ((struct frame * , int));
! 
  void x_kill_gs_process P_ ((Pixmap, struct frame *));
  struct image_cache *make_image_cache P_ ((void));
  void free_image_cache P_ ((struct frame *));
--- 2618,2624 ----
  #endif
  extern void x_destroy_all_bitmaps P_ ((Display_Info *));
  extern int x_create_bitmap_mask P_ ((struct frame * , int));
! extern Lisp_Object x_find_image_file P_ ((Lisp_Object));
  void x_kill_gs_process P_ ((Pixmap, struct frame *));
  struct image_cache *make_image_cache P_ ((void));
  void free_image_cache P_ ((struct frame *));
Index: src/image.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/image.c,v
retrieving revision 1.4
diff -c -r1.4 image.c
*** src/image.c	11 Mar 2004 22:43:06 -0000	1.4
--- src/image.c	12 Mar 2004 10:29:46 -0000
***************
*** 1998,2004 ****
  			      File Handling
   ***********************************************************************/
  
- static Lisp_Object x_find_image_file P_ ((Lisp_Object));
  static unsigned char *slurp_file P_ ((char *, int *));
  
  
--- 1998,2003 ----
***************
*** 2006,2012 ****
     x-bitmap-file-path.  Value is the full name of the file found, or
     nil if not found.  */
  
! static Lisp_Object
  x_find_image_file (file)
       Lisp_Object file;
  {
--- 2005,2011 ----
     x-bitmap-file-path.  Value is the full name of the file found, or
     nil if not found.  */
  
! Lisp_Object
  x_find_image_file (file)
       Lisp_Object file;
  {
Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.607
diff -c -r1.607 xfns.c
*** src/xfns.c	11 Mar 2004 00:25:38 -0000	1.607
--- src/xfns.c	12 Mar 2004 10:29:47 -0000
***************
*** 761,768 ****
  
  #ifdef USE_GTK
  
- static Lisp_Object x_find_image_file P_ ((Lisp_Object file));
- 
  /* Set icon from FILE for frame F.  By using GTK functions the icon
     may be any format that GdkPixbuf knows about, i.e. not just bitmaps.  */
  
--- 761,766 ----