diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-14 15:14:55 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-14 15:14:55 -0500 |
| commit | e1b4b9eb17b3ea145dbdce28dbf278437e349be1 (patch) | |
| tree | 5357a81615cf404429106ffcf6ba0b9965b033a6 | |
| parent | b01dd0b20fedb27681ceda53deb8c7f2f83eabc3 (diff) | |
| parent | cec5480108e2d4158ba5086223e07cc34587dff5 (diff) | |
Merge branch 'backport' into work
| -rw-r--r-- | openbox/config.c | 2 | ||||
| -rw-r--r-- | render/image.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openbox/config.c b/openbox/config.c index b5b4ef4e..0696806b 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -124,7 +124,7 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src, g_assert(src != NULL); g_assert(dst != NULL); - copy_if(type, -1); + copy_if(type, (ObClientType)-1); copy_if(decor, -1); copy_if(shade, -1); copy_if(focus, -1); diff --git a/render/image.c b/render/image.c index c7452fce..6fbd8a8e 100644 --- a/render/image.c +++ b/render/image.c @@ -75,7 +75,7 @@ static void AddPicture(RrImage *self, RrImagePic ***list, gint *len, #ifdef DEBUG g_message("Adding %s picture to the cache:\n " - "Image 0x%x, w %d h %d Hash %u\n", + "Image 0x%x, w %d h %d Hash %u", (*list == self->original ? "ORIGINAL" : "RESIZED"), (guint)self, pic->width, pic->height, RrImagePicHash(pic)); #endif @@ -90,7 +90,7 @@ static void RemovePicture(RrImage *self, RrImagePic ***list, #ifdef DEBUG g_message("Removing %s picture from the cache:\n " - "Image 0x%x, w %d h %d Hash %u\n", + "Image 0x%x, w %d h %d Hash %u", (*list == self->original ? "ORIGINAL" : "RESIZED"), (guint)self, (*list)[i]->width, (*list)[i]->height, RrImagePicHash((*list)[i])); @@ -324,7 +324,7 @@ void RrImageUnref(RrImage *self) if (self && --self->ref == 0) { #ifdef DEBUG g_message("Refcount to 0, removing ALL pictures from the cache:\n " - "Image 0x%x\n", (guint)self); + "Image 0x%x", (guint)self); #endif while (self->n_original > 0) RemovePicture(self, &self->original, 0, &self->n_original); @@ -347,7 +347,7 @@ void RrImageAddPicture(RrImage *self, RrPixel32 *data, gint w, gint h) if (self->original[i]->width == w && self->original[i]->height == h) { #ifdef DEBUG g_message("Found duplicate ORIGINAL image:\n " - "Image 0x%x, w %d h %d\n", (guint)self, w, h); + "Image 0x%x, w %d h %d", (guint)self, w, h); #endif return; } |