graphics/eog
graphics/eog
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/eog synced 2024-10-19 14:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unref start image. (eog_collection_view_dispose): Unref displayed image.

Browse source 
2003-03-11  Jens Finke  <jens@triq.net>

	* collection/eog-collection-view.c (verb_SlideShow_cb): Unref
	start image.
	(eog_collection_view_dispose): Unref displayed image.
	(eog_collection_view_instance_init): Init new variable.
	(handle_selection_changed): Free ressources of the previously
	viewed image and store reference the the new one.
This commit is contained in:
Jens Finke 2003-03-11 17:07:30 +00:00 committed by Jens Finke
parent 7e21ea9c5e
commit 49b7bfbaf8
2 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2003-03-11 Jens Finke <jens@triq.net>
* collection/eog-collection-view.c (verb_SlideShow_cb): Unref
start image.
(eog_collection_view_dispose): Unref displayed image.
(eog_collection_view_instance_init): Init new variable.
(handle_selection_changed): Free ressources of the previously
viewed image and store reference the the new one.
2003-03-11 Jens Finke <jens@triq.net> 2003-03-11 Jens Finke <jens@triq.net>
* libeog/eog-image.[ch]: Switched to a thread based loading * libeog/eog-image.[ch]: Switched to a thread based loading

23
collection/eog-collection-view.c
View file

@ -91,6 +91,8 @@ struct _EogCollectionViewPrivate {
gint idle_id; gint idle_id;
gboolean need_update_prop[PROP_LAST]; gboolean need_update_prop[PROP_LAST];
EogImage *displayed_image;
}; };
@ -128,7 +130,8 @@ verb_SlideShow_cb (BonoboUIComponent *uic,
start_image = eog_wrap_list_get_first_selected_image (EOG_WRAP_LIST (view->priv->wraplist)); start_image = eog_wrap_list_get_first_selected_image (EOG_WRAP_LIST (view->priv->wraplist));
show = eog_full_screen_new (images, start_image); show = eog_full_screen_new (images, start_image);
g_object_unref (start_image);
if (free_list) if (free_list)
g_list_free (images); g_list_free (images);
@ -205,11 +208,18 @@ static void
eog_collection_view_dispose (GObject *object) eog_collection_view_dispose (GObject *object)
{ {
EogCollectionView *list_view; EogCollectionView *list_view;
EogCollectionViewPrivate *priv;
g_return_if_fail (object != NULL); g_return_if_fail (object != NULL);
g_return_if_fail (EOG_IS_COLLECTION_VIEW (object)); g_return_if_fail (EOG_IS_COLLECTION_VIEW (object));
list_view = EOG_COLLECTION_VIEW (object); list_view = EOG_COLLECTION_VIEW (object);
priv = list_view->priv;
if (priv->displayed_image != NULL) {
g_object_unref (priv->displayed_image);
priv->displayed_image = NULL;
}
if (list_view->priv->model) if (list_view->priv->model)
g_object_unref (G_OBJECT (list_view->priv->model)); g_object_unref (G_OBJECT (list_view->priv->model));
@ -263,6 +273,8 @@ eog_collection_view_instance_init (EogCollectionView *view)
view->priv = g_new0 (EogCollectionViewPrivate, 1); view->priv = g_new0 (EogCollectionViewPrivate, 1);
view->priv->idle_id = -1; view->priv->idle_id = -1;
view->priv->model = NULL; view->priv->model = NULL;
view->priv->displayed_image = NULL;
} }
static void static void
@ -444,10 +456,15 @@ handle_selection_changed (EogWrapList *list, EogCollectionView *view)
priv = view->priv; priv = view->priv;
if (priv->displayed_image != NULL) {
eog_image_free_mem (priv->displayed_image);
g_object_unref (priv->displayed_image);
priv->displayed_image = NULL;
}
eog_scroll_view_set_image (EOG_SCROLL_VIEW (priv->scroll_view), image); eog_scroll_view_set_image (EOG_SCROLL_VIEW (priv->scroll_view), image);
if (image != NULL) priv->displayed_image = image;
g_object_unref (image);
update_status_text (view); update_status_text (view);
} }