aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-03-02 07:00:35 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-03-02 07:00:35 +0000
commit23b982c79e6df941275bb9bd8c3ab4810955466c (patch)
treef8e11cc395cb37a0b60a3908aa5971d07a837d21
parentc0bbf5e3061dd4275b2e18ab37a5b7cc57bd9ea7 (diff)
fixed compose_destroy().
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@141 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/compose.c4
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 25e3419b..041190a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-03-02
+ * src/compose.c: compose_destroy(): destroy paned only if it's not
+ attached to window. Fixed memory leak of popup menu.
+
+2005-03-02
+
* src/sigstatus.c: modified the popup dialog. Fixed warning when
pressing escape key. Fixed indentation of the source.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index efb99146..2aec3595 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2005-03-02
+ * src/compose.c: compose_destroy(): paend がウィンドウに付属して
+ いない場合のみ destroy するようにした。ポップアップメニューが
+ メモリリークしていたのを修正。
+
+2005-03-02
+
* src/sigstatus.c: ポップアップダイアログを修正。エスケープキーを
押した時の警告を修正。ソースのインデントを修正。
diff --git a/src/compose.c b/src/compose.c
index 3293b79f..eeed9483 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4361,7 +4361,9 @@ static void compose_destroy(Compose *compose)
prefs_common.compose_width = compose->scrolledwin->allocation.width;
prefs_common.compose_height = compose->window->allocation.height;
- gtk_widget_destroy(compose->paned);
+ if (!gtk_widget_get_parent(compose->paned))
+ gtk_widget_destroy(compose->paned);
+ gtk_widget_destroy(compose->popupmenu);
g_free(compose);