all repos — openbox @ e1b4b9eb17b3ea145dbdce28dbf278437e349be1

openbox fork - make it a bit more like ryudo

Merge branch 'backport' into work
Dana Jansens danakj@orodu.net
commit

e1b4b9eb17b3ea145dbdce28dbf278437e349be1

parent

b01dd0b20fedb27681ceda53deb8c7f2f83eabc3

2 files changed, 5 insertions(+), 5 deletions(-)

jump to
M openbox/config.copenbox/config.c

@@ -124,7 +124,7 @@ {

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);
M render/image.crender/image.c

@@ -75,7 +75,7 @@ g_hash_table_insert(self->cache->table, (*list)[0], self);

#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 @@ gint j;

#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 @@ {

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 @@ for (i = 0; i < self->n_original; ++i)

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; }