blob: 0ed8ce08e82eebd5fc570972095b5c69ed04dd10 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- src/messageview.c.orig Wed Aug 18 03:23:29 2004
+++ src/messageview.c Wed Aug 18 03:37:58 2004
@@ -80,7 +80,9 @@
imageview->messageview = messageview;
htmlview = htmlview_create();
- htmlview->messageview = messageview;
+ if(htmlview) {
+ htmlview->messageview = messageview;
+ }
mimeview = mimeview_create();
mimeview->textview = textview;
@@ -91,7 +93,9 @@
/* to remove without destroyed */
gtk_widget_ref(*(GtkWidget **)textview);
gtk_widget_ref(*(GtkWidget **)imageview);
- gtk_widget_ref(*(GtkWidget **)htmlview);
+ if(htmlview) {
+ gtk_widget_ref(*(GtkWidget **)htmlview);
+ }
gtk_widget_ref(*(GtkWidget **)mimeview);
paned = gtk_vpaned_new();
@@ -152,7 +156,9 @@
gtk_paned_add2(GTK_PANED(messageview->paned), *(GtkWidget **)textview);
#endif
- htmlview_init(messageview->htmlview);
+ if(messageview->htmlview) {
+ htmlview_init(messageview->htmlview);
+ }
mimeview_init(messageview->mimeview);
textview_init(messageview->textview);
imageview_init(messageview->imageview);
@@ -267,17 +273,21 @@
GtkWidget *textview = *(GtkWidget **)messageview->textview;
GtkWidget *imageview = *(GtkWidget **)messageview->imageview;
GtkWidget *mimeview = *(GtkWidget **)messageview->mimeview;
- GtkWidget *htmlview = *(GtkWidget **)messageview->htmlview;
+
+ if(messageview->htmlview) {
+ GtkWidget *htmlview = *(GtkWidget **)messageview->htmlview;
+ htmlview_destroy(messageview->htmlview);
+ gtk_widget_destroy(htmlview);
+ }
+
textview_destroy(messageview->textview);
imageview_destroy(messageview->imageview);
- htmlview_destroy(messageview->htmlview);
mimeview_destroy(messageview->mimeview);
g_free(messageview);
gtk_widget_unref(textview);
gtk_widget_unref(imageview);
- gtk_widget_unref(htmlview);
gtk_widget_unref(mimeview);
}
|
