You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
file-roller/0001-Don-t-destroy-attached...

45 lines
1.4 KiB

10 years ago
From 370756f9a6334d87b98cebc395962712657e595a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 21 Aug 2015 17:53:36 -0400
Subject: [PATCH] Don't destroy attached menus
The documentation for gtk_menu_attach_to_widget states that
attached menus are destroyed together with their attach_widget,
like child widgets. Destroying them manually leads to bad things,
such as segfaults.
https://bugzilla.gnome.org/show_bug.cgi?id=753951
---
src/fr-window.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/src/fr-window.c b/src/fr-window.c
index d27e00f..b9f128f 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -540,21 +540,6 @@ fr_window_free_private_data (FrWindow *window)
_g_string_list_free (window->priv->drag_file_list);
window->priv->drag_file_list = NULL;
- if (window->priv->file_popup_menu != NULL) {
- gtk_widget_destroy (window->priv->file_popup_menu);
- window->priv->file_popup_menu = NULL;
- }
-
- if (window->priv->folder_popup_menu != NULL) {
- gtk_widget_destroy (window->priv->folder_popup_menu);
- window->priv->folder_popup_menu = NULL;
- }
-
- if (window->priv->sidebar_folder_popup_menu != NULL) {
- gtk_widget_destroy (window->priv->sidebar_folder_popup_menu);
- window->priv->sidebar_folder_popup_menu = NULL;
- }
-
g_free (window->priv->last_location);
fr_window_free_batch_data (window);
--
2.5.0