summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-10-13 04:15:25 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-10-13 04:15:25 +0000
commite8bc8e95e225df3265829f897ad2df92d2f3cd0a (patch)
tree8fea11db0ffe7d024d66467189651eadaf989b0a
parentcfd3cdd64e72f7293249074ef477cb7018bd26f6 (diff)
downloadmetacity-e8bc8e95e225df3265829f897ad2df92d2f3cd0a.tar.gz
metacity-e8bc8e95e225df3265829f897ad2df92d2f3cd0a.tar.bz2
add bad hack to work with GTK 1.3.9.90 RPMs from gnomehide for now
2001-10-13 Havoc Pennington <hp@redhat.com> * configure.in: add bad hack to work with GTK 1.3.9.90 RPMs from gnomehide for now * src/ui.c: another piece of bad hack in here
-rw-r--r--ChangeLog7
-rw-r--r--README25
-rw-r--r--configure.in8
-rw-r--r--src/ui.c5
4 files changed, 29 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index f9a7a99..c4f2871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2001-10-13 Havoc Pennington <hp@redhat.com>
+ * configure.in: add bad hack to work with GTK 1.3.9.90 RPMs from
+ gnomehide for now
+
+ * src/ui.c: another piece of bad hack in here
+
+2001-10-13 Havoc Pennington <hp@redhat.com>
+
* configure.in: bump version
2001-10-13 Havoc Pennington <hp@pobox.com>
diff --git a/README b/README
index c907dd1..75cd16b 100644
--- a/README
+++ b/README
@@ -9,24 +9,24 @@ your petty hangups about version numbers.
COMPILING METACITY
===
-You need GTK+ 1.3.x (to become 2.0), at least version 1.3.7. At the
+You need GTK+ 1.3.x (to become 2.0), at least version 1.3.9. At the
moment CVS HEAD works, but that can change. Metacity is a fairly
trivial 6000-line C program, so once you get GTK+ built it should be
no problem to build Metacity.
-There are SRPMs on the ftp site (there were also binaries for a bit,
-but I am taking them down because they only worked with Rawhide, so it
-was sort of pointless). Just "rpm --rebuild metacity-whatever.src.rpm"
-after installing the GTK packages from ftp.gtk.org.
+There are SRPMs and sometimes RPMs on the ftp site, but you'd be
+pretty lucky to get them to work for now, since they are often out of
+sync with GTK. You might try with the GTK from ftp.gtk.org, and also
+the GTK from http://people.redhat.com/hp/gnomehide/.
REPORTING BUGS AND SUBMITTING PATCHES
===
-Report new bugs to hp@redhat.com for now. Will switch to Bugzilla
-sometime probably.
+Report new bugs on http://bugzilla.gnome.org.
Feel free to send patches too; Metacity is really small and simple, so
if you find a bug or want to add a feature it should be pretty easy.
+Send me mail, or put the patch in bugzilla.
See the HACKING file for some notes on hacking Metacity.
@@ -151,6 +151,8 @@ METACITY BUGS, NON-FEATURES, AND CAVEATS
clicking the minimize button is sort of a bad idea.
(If you had a WM-spec-compliant tasklist, it would work
for unminimization.)
+ (Update: you can use "test-wnck" from the libwnck CVS module to
+ unminimize, but it's not much of a UI ;-)
- Metacity uses the new window manager spec, but only random bits of
the old GNOME spec. It correctly advertises exactly which parts of
@@ -170,14 +172,7 @@ METACITY BUGS, NON-FEATURES, AND CAVEATS
instead of Alt as the main keybinding shortcut, if super/hyper
exist, and then keyboards with a windows key can use that for
WM functions and Alt for application shortcuts.
- We'd fall back to Alt if no other suitable modifier existed.
-
- - Cycling windows with Alt-Tab is flickery, AFAIK because
- Metacity passes the entire window stack to XRestackWindows()
- every time you restack. Instead it should probably only restack
- windows that have changed their stacking with respect to one
- another. (But sometimes I don't see the flicker, so
- I'm not sure.)
+ We'd fall back to Alt if no other suitable modifier existed.
- I haven't even read the ICCCM section about colormaps. So if you
have an 8-bit display you are basically screwed.
diff --git a/configure.in b/configure.in
index b3ae964..759d22f 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ ALL_LINGUAS="sv"
dnl AM_GNU_GETTEXT
## here we get the flags we'll actually use
-PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 1.3.7)
+PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 1.3.9)
CFLAGS="$METACITY_CFLAGS $CFLAGS"
@@ -75,6 +75,12 @@ 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
+
AC_OUTPUT([
Makefile
src/Makefile
diff --git a/src/ui.c b/src/ui.c
index bded29e..12693ca 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -19,6 +19,7 @@
* 02111-1307, USA.
*/
+#include <config.h>
#include "ui.h"
#include "frames.h"
#include "util.h"
@@ -430,6 +431,10 @@ 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)
{