Mercurial > dwindows
comparison gtk/dw.c @ 256:63d68387d924
Don't unref a non-existant pixmap. (GTK 2.x)
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Thu, 20 Feb 2003 17:55:56 +0000 |
parents | a167001c56df |
children | 9ea4ac9a097f |
comparison
equal
deleted
inserted
replaced
255:a167001c56df | 256:63d68387d924 |
---|---|
3461 | 3461 |
3462 pixbuf = _find_pixbuf(icon); | 3462 pixbuf = _find_pixbuf(icon); |
3463 | 3463 |
3464 gtk_tree_store_insert_after(store, iter, (GtkTreeIter *)parent, (GtkTreeIter *)item); | 3464 gtk_tree_store_insert_after(store, iter, (GtkTreeIter *)parent, (GtkTreeIter *)item); |
3465 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); | 3465 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); |
3466 g_object_unref(pixbuf); | 3466 if(pixbuf) |
3467 g_object_unref(pixbuf); | |
3467 retval = (HWND)iter; | 3468 retval = (HWND)iter; |
3468 } | 3469 } |
3469 DW_MUTEX_UNLOCK; | 3470 DW_MUTEX_UNLOCK; |
3470 | 3471 |
3471 return retval; | 3472 return retval; |
3586 | 3587 |
3587 pixbuf = _find_pixbuf(icon); | 3588 pixbuf = _find_pixbuf(icon); |
3588 | 3589 |
3589 gtk_tree_store_append (store, iter, (GtkTreeIter *)parent); | 3590 gtk_tree_store_append (store, iter, (GtkTreeIter *)parent); |
3590 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); | 3591 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1); |
3591 g_object_unref(pixbuf); | 3592 if(pixbuf) |
3593 g_object_unref(pixbuf); | |
3592 retval = (HWND)iter; | 3594 retval = (HWND)iter; |
3593 } | 3595 } |
3594 DW_MUTEX_UNLOCK; | 3596 DW_MUTEX_UNLOCK; |
3595 | 3597 |
3596 return retval; | 3598 return retval; |
3698 (store = (GtkTreeStore *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_store"))) | 3700 (store = (GtkTreeStore *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_store"))) |
3699 { | 3701 { |
3700 pixbuf = _find_pixbuf(icon); | 3702 pixbuf = _find_pixbuf(icon); |
3701 | 3703 |
3702 gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1); | 3704 gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1); |
3703 g_object_unref(pixbuf); | 3705 if(pixbuf) |
3706 g_object_unref(pixbuf); | |
3704 } | 3707 } |
3705 DW_MUTEX_UNLOCK; | 3708 DW_MUTEX_UNLOCK; |
3706 #else | 3709 #else |
3707 GtkWidget *label, *hbox, *pixmap; | 3710 GtkWidget *label, *hbox, *pixmap; |
3708 GdkPixmap *gdkpix; | 3711 GdkPixmap *gdkpix; |