Commit 313b8ffa authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Handle pixbuf being NULL without warnings. Also, don't leak pixbuf

2005-08-19  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c (change_icon_theme)
	(model_add_special, model_add_special, model_add_volumes):
	Handle pixbuf being NULL without warnings. Also, don't
	leak pixbuf references when the icon theme is changed.
parent 37ef7f03
2005-08-19 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (change_icon_theme)
(model_add_special, model_add_special, model_add_volumes):
Handle pixbuf being NULL without warnings. Also, don't
leak pixbuf references when the icon theme is changed.
* gtk/gtkmain.c (gtk_get_event_widget): Don't access
the user data on destroyed windows, since at best
it can be a stale pointer. (#313953, Robin Green)
......
2005-08-19 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (change_icon_theme)
(model_add_special, model_add_special, model_add_volumes):
Handle pixbuf being NULL without warnings. Also, don't
leak pixbuf references when the icon theme is changed.
* gtk/gtkmain.c (gtk_get_event_widget): Don't access
the user data on destroyed windows, since at best
it can be a stale pointer. (#313953, Robin Green)
......
2005-08-19 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (change_icon_theme)
(model_add_special, model_add_special, model_add_volumes):
Handle pixbuf being NULL without warnings. Also, don't
leak pixbuf references when the icon theme is changed.
* gtk/gtkmain.c (gtk_get_event_widget): Don't access
the user data on destroyed windows, since at best
it can be a stale pointer. (#313953, Robin Green)
......
......@@ -1109,6 +1109,9 @@ change_icon_theme (GtkFileChooserButton *button)
gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
ICON_COLUMN, pixbuf,
-1);
if (pixbuf)
g_object_unref (pixbuf);
}
while (gtk_tree_model_iter_next (priv->model, &iter));
......@@ -1311,7 +1314,8 @@ model_add_special (GtkFileChooserButton *button)
DATA_COLUMN, path,
-1);
g_object_unref (pixbuf);
if (pixbuf)
g_object_unref (pixbuf);
button->priv->n_special++;
#ifndef G_OS_WIN32
......@@ -1339,7 +1343,8 @@ model_add_special (GtkFileChooserButton *button)
DATA_COLUMN, path,
-1);
g_object_unref (pixbuf);
if (pixbuf)
g_object_unref (pixbuf);
button->priv->n_special++;
}
}
......@@ -1379,7 +1384,8 @@ model_add_volumes (GtkFileChooserButton *button,
DATA_COLUMN, volumes->data,
-1);
g_object_unref (pixbuf);
if (pixbuf)
g_object_unref (pixbuf);
g_free (display_name);
button->priv->n_volumes++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment