glom r1520 - in branches/glom-1-6: . glom/utility_widgets/db_adddel

[murrayc svn gnome org]

Author: murrayc
Date: Fri Apr  4 13:45:34 2008
New Revision: 1520
URL: http://svn.gnome.org/viewvc/glom?rev=1520&view=rev

Log:
2008-04-04  Murray Cumming  <murrayc murrayc com>

* glom/utility_widgets/db_adddel/db_adddel.cc:
treeviewcolumn_on_cell_data(): Do not try to dereference a null pixbuf 
refptr. This fixes a crash when adding an image field to the list view 
if one of the records has no data in that field.
Bug #526114 (Jani Monoses).

Modified:
   branches/glom-1-6/ChangeLog
   branches/glom-1-6/glom/utility_widgets/db_adddel/db_adddel.cc

Modified: branches/glom-1-6/glom/utility_widgets/db_adddel/db_adddel.cc
==============================================================================
--- branches/glom-1-6/glom/utility_widgets/db_adddel/db_adddel.cc	(original)
+++ branches/glom-1-6/glom/utility_widgets/db_adddel/db_adddel.cc	Fri Apr  4 13:45:34 2008
@@ -1955,7 +1955,8 @@
             if(pixbuf)
               pixbuf = ImageGlom::scale_keeping_ratio(pixbuf,  get_fixed_cell_height(), pixbuf->get_width());
 
-            g_object_set(pDerived->gobj(), "pixbuf", pixbuf->gobj(), (gpointer)NULL);
+            if(pixbuf)
+              g_object_set(pDerived->gobj(), "pixbuf", pixbuf->gobj(), (gpointer)NULL);
           }
           else
             g_warning("Field::sql(): glom_type is TYPE_IMAGE but gda type is not VALUE_TYPE_BINARY");