Re: Use of `gtk_window_set_icon_from_file' in src/xfns.c

[Lute Kamstra]

Lute Kamstra <address@hidden> writes:

> "Jan D." <address@hidden> writes:
>
>> Neveer mind, I rewrote the function so it works with both GTK 2.0
>> and 2.2.  Please try it.
>
> It works with GTK 2.0.

Shall I apply the following patch then?

  Lute


Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.352
diff -c -r1.352 configure.in
*** configure.in        7 Aug 2003 16:00:31 -0000       1.352
--- configure.in        18 Aug 2003 12:59:57 -0000
***************
*** 1900,1906 ****
      AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with 
--with-x-toolkit=${with_x_toolkit}]);
    fi
    GLIB_REQUIRED=2.0.1
!   GTK_REQUIRED=2.2
    GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
  
    dnl Check if --with-pkg-config-prog has been given.
--- 1900,1906 ----
      AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with 
--with-x-toolkit=${with_x_toolkit}]);
    fi
    GLIB_REQUIRED=2.0.1
!   GTK_REQUIRED=2.0.1
    GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
  
    dnl Check if --with-pkg-config-prog has been given.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/ChangeLog,v
retrieving revision 1.341
diff -c -r1.341 ChangeLog
*** ChangeLog   7 Aug 2003 16:00:31 -0000       1.341
--- ChangeLog   18 Aug 2003 12:59:57 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-08-18  Lute Kamstra  <address@hidden>
+ 
+       * configure.in: Revert the change of 2003-07-29 as GTK+ 2.2 is not
+       required anymore.
+ 
  2003-08-07  Andrew Choi  <address@hidden>
  
        * configure.in [powerpc-apple-darwin*]: Use the -no-cpp-precomp