Mercurial > geeqie.yaz
comparison src/image-load.c @ 1043:5fc64d6252e7
Replaced gtk depreceated code.
author | bruclik |
---|---|
date | Sun, 07 Sep 2008 23:01:30 +0000 |
parents | ab24c46aa6e4 |
children | 0ab0deb0cfcc |
comparison
equal
deleted
inserted
replaced
1042:e59a9c96d290 | 1043:5fc64d6252e7 |
---|---|
170 while (g_source_remove_by_user_data(il->area_param_list->data)) {} | 170 while (g_source_remove_by_user_data(il->area_param_list->data)) {} |
171 g_free(il->area_param_list->data); | 171 g_free(il->area_param_list->data); |
172 il->area_param_list = g_list_delete_link(il->area_param_list, il->area_param_list); | 172 il->area_param_list = g_list_delete_link(il->area_param_list, il->area_param_list); |
173 } | 173 } |
174 | 174 |
175 if (il->pixbuf) gdk_pixbuf_unref(il->pixbuf); | 175 if (il->pixbuf) g_object_unref(il->pixbuf); |
176 | |
176 file_data_unref(il->fd); | 177 file_data_unref(il->fd); |
177 #ifdef HAVE_GTHREAD | 178 #ifdef HAVE_GTHREAD |
178 g_mutex_free(il->data_mutex); | 179 g_mutex_free(il->data_mutex); |
179 g_cond_free(il->can_destroy_cond); | 180 g_cond_free(il->can_destroy_cond); |
180 #endif | 181 #endif |
315 { | 316 { |
316 g_mutex_unlock(il->data_mutex); | 317 g_mutex_unlock(il->data_mutex); |
317 return; | 318 return; |
318 } | 319 } |
319 | 320 |
320 if (il->pixbuf) gdk_pixbuf_unref(il->pixbuf); | 321 if (il->pixbuf) g_object_unref(il->pixbuf); |
322 | |
321 il->pixbuf = pb; | 323 il->pixbuf = pb; |
322 if (il->pixbuf) gdk_pixbuf_ref(il->pixbuf); | 324 if (il->pixbuf) g_object_ref(il->pixbuf); |
325 | |
323 g_mutex_unlock(il->data_mutex); | 326 g_mutex_unlock(il->data_mutex); |
324 } | 327 } |
325 | 328 |
326 static void image_loader_area_updated_cb(GdkPixbufLoader *loader, | 329 static void image_loader_area_updated_cb(GdkPixbufLoader *loader, |
327 guint x, guint y, guint w, guint h, | 330 guint x, guint y, guint w, guint h, |