Mercurial > dwindows
comparison gtk3/dw.c @ 1097:8e9db23a8c31
Fixed icons from data by merging tmp and pixbuf together in GTK3.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 01 Jul 2011 02:48:20 +0000 |
parents | 5261439c7227 |
children | eb6b27d17fe7 |
comparison
equal
deleted
inserted
replaced
1096:5261439c7227 | 1097:8e9db23a8c31 |
---|---|
4273 DW_MUTEX_LOCK; | 4273 DW_MUTEX_LOCK; |
4274 if (id) | 4274 if (id) |
4275 tmp = _find_pixbuf((HICN)id, NULL, NULL); | 4275 tmp = _find_pixbuf((HICN)id, NULL, NULL); |
4276 else | 4276 else |
4277 { | 4277 { |
4278 GdkPixbuf *pixbuf; | |
4279 if (!data) | 4278 if (!data) |
4280 { | 4279 { |
4281 DW_MUTEX_UNLOCK; | 4280 DW_MUTEX_UNLOCK; |
4282 return; | 4281 return; |
4283 } | 4282 } |
4295 else | 4294 else |
4296 { | 4295 { |
4297 DW_MUTEX_UNLOCK; | 4296 DW_MUTEX_UNLOCK; |
4298 return; | 4297 return; |
4299 } | 4298 } |
4300 pixbuf = gdk_pixbuf_new_from_file(file, NULL ); | 4299 tmp = gdk_pixbuf_new_from_file(file, NULL ); |
4301 /* remove our temporary file */ | 4300 /* remove our temporary file */ |
4302 unlink (file ); | 4301 unlink (file ); |
4303 } | 4302 } |
4304 | 4303 |
4305 if(tmp) | 4304 if(tmp) |