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
|
$NetBSD: patch-ag,v 1.2 2005/05/19 21:09:43 jmmv Exp $
Needed for gcc-2.95.
--- srcore/srbrl.c.orig 2005-03-23 08:47:48.000000000 +0000
+++ srcore/srbrl.c
@@ -762,7 +762,12 @@ src_braille_setting_new ()
static void
src_braille_load_values (SRCBraille *braille)
{
+ gint default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR;
+ gint default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR;
gint default_port = DEFAULT_BRAILLE_PORT_NO;
+ gchar *default_braille_transaltion_table = DEFAULT_BRAILLE_TRANSLATION;
+ gchar *default_braille_style = DEFAULT_BRAILLE_STYLE;
+ gchar *default_braille_cursor_style = DEFAULT_BRAILLE_CURSOR_STYLE;
sru_assert (braille);
@@ -786,7 +791,6 @@ src_braille_load_values (SRCBraille *bra
SET_BRAILLE_CONFIG_DATA (BRAILLE_PORT_NO, CFGT_INT, &braille->port);
}
- gchar *default_braille_transaltion_table = DEFAULT_BRAILLE_TRANSLATION;
GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_TRANSLATION, CFGT_STRING,
&braille->translation_table,
default_braille_transaltion_table);
@@ -798,22 +802,18 @@ src_braille_load_values (SRCBraille *bra
}
- gchar *default_braille_style = DEFAULT_BRAILLE_STYLE;
GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_STYLE, CFGT_STRING,
&braille->style,
default_braille_style);
- gchar *default_braille_cursor_style = DEFAULT_BRAILLE_CURSOR_STYLE;
GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_CURSOR_STYLE, CFGT_STRING,
&braille->cursor_style,
default_braille_cursor_style);
- gint default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR;
GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_POSITION_SENSOR, CFGT_INT,
&braille->position_sensor,
&default_pos_sensor);
- gint default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR;
GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_OPTICAL_SENSOR, CFGT_INT,
&braille->optical_sensor,
&default_opt_sensor);
|
