isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove workaround for a problem in GTK 1.3.9(!) which was causing

Browse Source 
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
This commit is contained in:
Thomas Thurman 2008-02-04 17:25:30 +00:00 committed by Thomas James Alexander Thurman
parent 2f43d436c8
commit 4c8557055c
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2008-01-28 Michael Meeks <michael.meeks@novell.com>
* src/core/display.c (meta_display_open), * src/core/display.c (meta_display_open),

6
configure.in
View File

@ -459,12 +459,6 @@ fi
AC_SUBST(GDK_PIXBUF_CSOURCE) 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 if test x$enable_gconf = xyes; then
AC_PATH_PROG(GCONFTOOL, gconftool-2, no) AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
if test x"$GCONFTOOL" = xno; then if test x"$GCONFTOOL" = xno; then

5
src/ui/ui.c
View File

@ -22,7 +22,6 @@
* 02111-1307, USA. * 02111-1307, USA.
*/ */
#include <config.h>
#include "prefs.h" #include "prefs.h"
#include "ui.h" #include "ui.h"
#include "frames.h" #include "frames.h"
@ -568,10 +567,6 @@ meta_ui_pop_delay_exposes (MetaUI *ui)
meta_frames_pop_delay_exposes (ui->frames); 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* GdkPixbuf*
meta_ui_get_default_window_icon (MetaUI *ui) meta_ui_get_default_window_icon (MetaUI *ui)
{ {