summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-02-04 17:25:30 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-02-04 17:25:30 +0000
commit4c8557055c7505d5d2510462cfcca10d89b87bc5 (patch)
treeb919f8b0b6ab6b2993a6575e0611162e065cc57d
parent2f43d436c8d11e2d5d4ff9d90441c95e628f4f16 (diff)
downloadmetacity-4c8557055c7505d5d2510462cfcca10d89b87bc5.tar.gz
metacity-4c8557055c7505d5d2510462cfcca10d89b87bc5.tar.bz2
remove workaround for a problem in GTK 1.3.9(!) which was causing
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. svn path=/trunk/; revision=3551
-rw-r--r--ChangeLog5
-rw-r--r--configure.in6
-rw-r--r--src/ui/ui.c5
3 files changed, 5 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 74b59df..21395da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
2008-01-28 Michael Meeks <michael.meeks@novell.com>
* src/core/display.c (meta_display_open),
diff --git a/configure.in b/configure.in
index ae5dc6a..693ef89 100644
--- a/configure.in
+++ b/configure.in
@@ -459,12 +459,6 @@ fi
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
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 9cf9c27..3790118 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -22,7 +22,6 @@
* 02111-1307, USA.
*/
-#include <config.h>
#include "prefs.h"
#include "ui.h"
#include "frames.h"
@@ -568,10 +567,6 @@ meta_ui_pop_delay_exposes (MetaUI *ui)
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)
{