metacity r3551 - in trunk: . src/ui

[tthurman svn gnome org]

Author: tthurman
Date: Mon Feb  4 17:25:30 2008
New Revision: 3551
URL: http://svn.gnome.org/viewvc/metacity?rev=3551&view=rev

Log:
2008-02-04  Thomas Thurman  <tthurman gnome org>

        * configure.in, src/ui/ui.c: remove workaround for a problem
          in GTK 1.3.9(!) which was causing problems. Closes #513737.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/ui/ui.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Feb  4 17:25:30 2008
@@ -459,12 +459,6 @@
 
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 
-## hack to work with old GTK versions for now 
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$METACITY_LIBS $LDFLAGS"
-AC_CHECK_FUNCS(gdk_pixbuf_new_from_stream)
-LDFLAGS=$save_LDFLAGS
-
 if test x$enable_gconf = xyes; then 
    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
    if test x"$GCONFTOOL" = xno; then

Modified: trunk/src/ui/ui.c
==============================================================================
--- trunk/src/ui/ui.c	(original)
+++ trunk/src/ui/ui.c	Mon Feb  4 17:25:30 2008
@@ -22,7 +22,6 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
 #include "prefs.h"
 #include "ui.h"
 #include "frames.h"
@@ -568,10 +567,6 @@
   meta_frames_pop_delay_exposes (ui->frames);
 }
 
-#ifdef HAVE_GDK_PIXBUF_NEW_FROM_STREAM
-#define gdk_pixbuf_new_from_inline gdk_pixbuf_new_from_stream
-#endif
-
 GdkPixbuf*
 meta_ui_get_default_window_icon (MetaUI *ui)
 {