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
|
$NetBSD: patch-ag,v 1.1 2005/04/12 00:59:36 rillig Exp $
Needed for gcc-2.95.
--- srcore/srbrl.c.orig Tue Oct 5 16:00:07 2004
+++ srcore/srbrl.c Mon Apr 11 02:10:13 2005
@@ -762,6 +762,9 @@ 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;
+
sru_assert (braille);
if (!braille->device)
@@ -788,10 +791,9 @@ src_braille_load_values (SRCBraille *bra
}
}
- 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);
+ DEFAULT_BRAILLE_TRANSLATION);
if (!src_braille_translation_table_exist (braille->translation_table))
{
srconf_set_config_data (BRAILLE_TRANSLATION, CFGT_STRING,
@@ -800,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);
+ 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);
+ 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);
|
