nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'backport' into work

Browse source
This commit is contained in:
Dana Jansens 2008-02-14 15:14:55 -05:00
commit e1b4b9eb17
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/config.c
View file

@ -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);

8
render/image.c
View file

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