summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2004-04-19 14:53:14 +0000
committerMark McLoughlin <markmc@src.gnome.org>2004-04-19 14:53:14 +0000
commit5c017988843901124d18383ed78118049753bb4b (patch)
treecae3ad028e8b9fc3d17eeaeb61c0df52971b4384
parent09c929ce3fe088a5b31b481b907061663c5120f2 (diff)
downloadmetacity-5c017988843901124d18383ed78118049753bb4b.tar.gz
Syncing across this change from libwnck. Patch from Neil Muller
2004-04-19 Mark McLoughlin <mark@skynet.ie> Syncing across this change from libwnck. Patch from Neil Muller <neil@dip.sun.ac.za> in bug #133979. * src/iconcache.c: (find_largest_sizes), (find_best_size): Don't down-size nitems from a gulong to an int. Fixes a crash with enlightenment, apparently.
-rw-r--r--ChangeLog9
-rw-r--r--src/iconcache.c4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f593d84..51a33956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-19 Mark McLoughlin <mark@skynet.ie>
+
+ Syncing across this change from libwnck.
+ Patch from Neil Muller <neil@dip.sun.ac.za> in bug #133979.
+
+ * src/iconcache.c: (find_largest_sizes), (find_best_size):
+ Don't down-size nitems from a gulong to an int. Fixes a
+ crash with enlightenment, apparently.
+
2004-04-16 Iñaki Larrañaga <dooteo@euskalgnu.org>
* configure.in: Added "eu" (Basque) to ALL_LINGUAS.
diff --git a/src/iconcache.c b/src/iconcache.c
index ead3de48..b6e4aff1 100644
--- a/src/iconcache.c
+++ b/src/iconcache.c
@@ -46,7 +46,7 @@ get_fallback_icons (MetaScreen *screen,
static gboolean
find_largest_sizes (gulong *data,
- int nitems,
+ gulong nitems,
int *width,
int *height)
{
@@ -81,7 +81,7 @@ find_largest_sizes (gulong *data,
static gboolean
find_best_size (gulong *data,
- int nitems,
+ gulong nitems,
int ideal_width,
int ideal_height,
int *width,