diff options
| author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-06-18 19:22:00 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-06-18 19:22:00 (GMT) |
| commit | f302b9a420aaf02e5805b3225ce4fef5a63e9b67 (patch) | |
| tree | 1465b37364970f800216e8918a1675de047a5c1e /shell/ev-sidebar-links.c | |
| parent | 6f98f83c02032b7f164fa6a497ad8069f60bf642 (diff) | |
Fixed lot's of memory leaks, for example, memory leak on reload, described
* shell/ev-page-action.c: (match_selected_cb),
(display_completion_text), (match_completion), (update_model):
* shell/ev-sidebar-links.c: (ev_sidebar_links_dispose),
(expand_open_links):
* shell/ev-sidebar.c: (ev_sidebar_destroy),
(ev_sidebar_menu_item_activate_cb), (ev_sidebar_add_page),
(ev_sidebar_set_document):
* shell/ev-window.c: (ev_window_xfer_job_cb),
(sidebar_widget_model_set), (sidebar_page_main_widget_update_cb):
Fixed lot's of memory leaks, for example, memory leak on reload,
described in bug 307793.
Diffstat (limited to 'shell/ev-sidebar-links.c')
| -rw-r--r-- | shell/ev-sidebar-links.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index 84b49dd..14b4b00 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -143,12 +143,6 @@ ev_sidebar_links_dispose (GObject *object) { EvSidebarLinks *sidebar = EV_SIDEBAR_LINKS (object); - if (sidebar->priv->document) { - g_object_unref (sidebar->priv->document); - sidebar->priv->document = NULL; - sidebar->priv->page_cache = NULL; - } - if (sidebar->priv->job) { g_signal_handlers_disconnect_by_func (sidebar->priv->job, job_finished_callback, sidebar); @@ -157,6 +151,13 @@ ev_sidebar_links_dispose (GObject *object) sidebar->priv->job = NULL; } + if (sidebar->priv->document) { + g_object_unref (sidebar->priv->document); + sidebar->priv->document = NULL; + sidebar->priv->page_cache = NULL; + } + + G_OBJECT_CLASS (ev_sidebar_links_parent_class)->dispose (object); } @@ -529,13 +530,11 @@ static void expand_open_links (GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *parent) { GtkTreeIter iter; - EvLink *link; gboolean expand; if (gtk_tree_model_iter_children (model, &iter, parent)) { do { gtk_tree_model_get (model, &iter, - EV_DOCUMENT_LINKS_COLUMN_LINK, &link, EV_DOCUMENT_LINKS_COLUMN_EXPAND, &expand, -1); if (expand) { |