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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
--- src/gnome2/commentary_dialog.c.orig 2006-08-05 19:40:34.000000000 +0200
+++ src/gnome2/commentary_dialog.c 2006-08-05 19:44:41.000000000 +0200
@@ -317,7 +317,7 @@
#ifndef USE_GTKHTML38
GSHTMLEditorControlData *ec =
(GSHTMLEditorControlData *) d->editor;
- ed->changed = TRUE;
+ ec->changed = TRUE;
//g_warning("html_key_press_event");
gui_update_statusbar(ec);
#endif
@@ -368,9 +368,9 @@
#ifndef USE_GTKHTML38
if (!ec)
return;
- if (ed->key)
- g_free(ed->key);
- ed->key = g_strdup_printf("%s 1:1", bookname);
+ if (ec->key)
+ g_free(ec->key);
+ ec->key = g_strdup_printf("%s 1:1", bookname);
#endif
}
@@ -416,9 +416,9 @@
#ifndef USE_GTKHTML38
if (!ec)
return FALSE;
- if (ed->key)
- g_free(ed->key);
- ed->key = g_strdup_printf("%s %d:1", bookname, chapter);
+ if (ec->key)
+ g_free(ec->key);
+ ec->key = g_strdup_printf("%s %d:1", bookname, chapter);
#endif
return FALSE;
}
@@ -471,9 +471,9 @@
#ifndef USE_GTKHTML38
if (!ec)
return FALSE;
- if (ed->key)
- g_free(ed->key);
- ed->key = g_strdup_printf("%s %d:%d", bookname, chapter, verse);
+ if (ec->key)
+ g_free(ec->key);
+ ec->key = g_strdup_printf("%s %d:%d", bookname, chapter, verse);
#endif
return FALSE;
}
@@ -516,9 +516,9 @@
#ifndef USE_GTKHTML38
if (!ec)
return;
- if (ed->key)
- g_free(ed->key);
- ed->key = g_strdup_printf("%s", buf);
+ if (ec->key)
+ g_free(ec->key);
+ ec->key = g_strdup_printf("%s", buf);
#endif
}
return FALSE;
@@ -560,9 +560,9 @@
#ifndef USE_GTKHTML38
if (!ec)
return;
- if (ed->key)
- g_free(ed->key);
- ed->key = g_strdup_printf("%s", buf);
+ if (ec->key)
+ g_free(ec->key);
+ ec->key = g_strdup_printf("%s", buf);
#endif
}
@@ -967,41 +967,41 @@
if (do_edit) {
#ifndef USE_GTKHTML38
- ed->htmlwidget = gtk_html_new();
- ed->html = GTK_HTML(ed->htmlwidget);
- gtk_widget_show(ed->htmlwidget);
+ ec->htmlwidget = gtk_html_new();
+ ec->html = GTK_HTML(ec->htmlwidget);
+ gtk_widget_show(ec->htmlwidget);
gtk_container_add(GTK_CONTAINER(scrolledwindow38),
- ed->htmlwidget);
+ ec->htmlwidget);
- ed->vbox = vbox30;
+ ec->vbox = vbox30;
- ed->pm = gui_create_editor_popup(ec);
- gnome_popup_menu_attach(ed->pm, ed->htmlwidget, NULL);
+ ec->pm = gui_create_editor_popup(ec);
+ gnome_popup_menu_attach(ec->pm, ec->htmlwidget, NULL);
- ed->statusbar = gtk_statusbar_new();
- gtk_widget_show(ed->statusbar);
- gtk_box_pack_start(GTK_BOX(vbox30), ed->statusbar,
+ ec->statusbar = gtk_statusbar_new();
+ gtk_widget_show(ec->statusbar);
+ gtk_box_pack_start(GTK_BOX(vbox30), ec->statusbar,
FALSE, TRUE, 0);
/* html.c */
- g_signal_connect(G_OBJECT(ed->htmlwidget),
+ g_signal_connect(G_OBJECT(ec->htmlwidget),
"key_press_event",
G_CALLBACK(html_key_press_event), d);
- g_signal_connect(GTK_OBJECT(ed->htmlwidget),
+ g_signal_connect(GTK_OBJECT(ec->htmlwidget),
"link_clicked",
G_CALLBACK(gui_link_clicked), NULL);
- g_signal_connect(GTK_OBJECT(ed->htmlwidget),
+ g_signal_connect(GTK_OBJECT(ec->htmlwidget),
"on_url", G_CALLBACK(gui_url), NULL);
gui_toolbar_style(ec);
gtk_box_pack_start(GTK_BOX(vbox_toolbars),
- ed->toolbar_style, FALSE, FALSE, 0);
- gtk_widget_show(ed->toolbar_style);
+ ec->toolbar_style, FALSE, FALSE, 0);
+ gtk_widget_show(ec->toolbar_style);
gui_toolbar_edit(ec);
gtk_box_pack_start(GTK_BOX(vbox_toolbars),
- ed->toolbar_edit, FALSE, FALSE, 0);
- gtk_widget_show(ed->toolbar_edit);
+ ec->toolbar_edit, FALSE, FALSE, 0);
+ gtk_widget_show(ec->toolbar_edit);
#endif /* USE_GTKHTML38 */
} else {
d->html = gtk_html_new();
|
GitWeb