if we set a new stock_id and there was a previous stock_id, unref the
Wed Dec 17 23:50:56 2003 Kristian Rietveld <kris@gtk.org> * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_set_property): if we set a new stock_id and there was a previous stock_id, unref the pixbuf (since it was used to renderer the previous stock_id and stock_id might have been set to NULL now). (Fixes #122966).
This commit is contained in:
		
				
					committed by
					
						
						Kristian Rietveld
					
				
			
			
				
	
			
			
			
						parent
						
							3ea41a9212
						
					
				
				
					commit
					e6e76e1cac
				
			@ -1,3 +1,10 @@
 | 
				
			|||||||
 | 
					Wed Dec 17 23:50:56 2003  Kristian Rietveld  <kris@gtk.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_set_property):
 | 
				
			||||||
 | 
						if we set a new stock_id and there was a previous stock_id, unref
 | 
				
			||||||
 | 
						the pixbuf (since it was used to renderer the previous stock_id
 | 
				
			||||||
 | 
						and stock_id might have been set to NULL now). (Fixes #122966).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
					2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
						* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +1,10 @@
 | 
				
			|||||||
 | 
					Wed Dec 17 23:50:56 2003  Kristian Rietveld  <kris@gtk.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_set_property):
 | 
				
			||||||
 | 
						if we set a new stock_id and there was a previous stock_id, unref
 | 
				
			||||||
 | 
						the pixbuf (since it was used to renderer the previous stock_id
 | 
				
			||||||
 | 
						and stock_id might have been set to NULL now). (Fixes #122966).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
					2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
						* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +1,10 @@
 | 
				
			|||||||
 | 
					Wed Dec 17 23:50:56 2003  Kristian Rietveld  <kris@gtk.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_set_property):
 | 
				
			||||||
 | 
						if we set a new stock_id and there was a previous stock_id, unref
 | 
				
			||||||
 | 
						the pixbuf (since it was used to renderer the previous stock_id
 | 
				
			||||||
 | 
						and stock_id might have been set to NULL now). (Fixes #122966).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
					2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
						* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +1,10 @@
 | 
				
			|||||||
 | 
					Wed Dec 17 23:50:56 2003  Kristian Rietveld  <kris@gtk.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_set_property):
 | 
				
			||||||
 | 
						if we set a new stock_id and there was a previous stock_id, unref
 | 
				
			||||||
 | 
						the pixbuf (since it was used to renderer the previous stock_id
 | 
				
			||||||
 | 
						and stock_id might have been set to NULL now). (Fixes #122966).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
					2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
						* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +1,10 @@
 | 
				
			|||||||
 | 
					Wed Dec 17 23:50:56 2003  Kristian Rietveld  <kris@gtk.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_set_property):
 | 
				
			||||||
 | 
						if we set a new stock_id and there was a previous stock_id, unref
 | 
				
			||||||
 | 
						the pixbuf (since it was used to renderer the previous stock_id
 | 
				
			||||||
 | 
						and stock_id might have been set to NULL now). (Fixes #122966).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
					2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
						* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
 | 
				
			||||||
 | 
				
			|||||||
@ -277,7 +277,14 @@ gtk_cell_renderer_pixbuf_set_property (GObject      *object,
 | 
				
			|||||||
      break;
 | 
					      break;
 | 
				
			||||||
    case PROP_STOCK_ID:
 | 
					    case PROP_STOCK_ID:
 | 
				
			||||||
      if (cellinfo->stock_id)
 | 
					      if (cellinfo->stock_id)
 | 
				
			||||||
        g_free (cellinfo->stock_id);
 | 
					        {
 | 
				
			||||||
 | 
					          if (cellpixbuf->pixbuf)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					              g_object_unref (cellpixbuf->pixbuf);
 | 
				
			||||||
 | 
					              cellpixbuf->pixbuf = NULL;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					          g_free (cellinfo->stock_id);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
      cellinfo->stock_id = g_strdup (g_value_get_string (value));
 | 
					      cellinfo->stock_id = g_strdup (g_value_get_string (value));
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
    case PROP_STOCK_SIZE:
 | 
					    case PROP_STOCK_SIZE:
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user