x11/gnomeapplets2/files/patch-gweather_gweather-pref.c


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

--- gweather/gweather-pref.c.orig   Mon Jul 19 18:24:06 2004
+++ gweather/gweather-pref.c    Mon Jul 19 18:28:39 2004
@@ -411,13 +411,14 @@
         }
     }
     if (!prefs->temperature_unit || prefs->temperature_unit == TEMP_UNIT_DEFAULT ) {
+#ifdef _NL_MEASUREMENT_MEASUREMENT
         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
         if ( imperial && imperial[0] == 2 )  {
             /* imperial */
             prefs->temperature_unit = TEMP_UNIT_FAHRENHEIT;
-        } else {
+        } else
+#endif
             prefs->temperature_unit = TEMP_UNIT_CENTIGRADE;
-        }
     }
 }
 
@@ -446,13 +447,14 @@
         }
     }
     if ( (!prefs->speed_unit) || prefs->speed_unit == SPEED_UNIT_DEFAULT ) {
+#ifdef _NL_MEASUREMENT_MEASUREMENT
         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
         if ( imperial && imperial[0] == 2 )  {
             /* imperial */
             prefs->speed_unit = SPEED_UNIT_KNOTS;
-        } else {
+        } else
+#endif
             prefs->speed_unit = SPEED_UNIT_MS;
-        }
     }
 }
 
@@ -483,13 +485,14 @@
         }
     }
     if ( (!prefs->pressure_unit) || prefs->pressure_unit == PRESSURE_UNIT_DEFAULT ) {
+#ifdef _NL_MEASUREMENT_MEASUREMENT
         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
         if ( imperial && imperial[0] == 2 )  {
             /* imperial */
             prefs->pressure_unit = PRESSURE_UNIT_INCH_HG;
-        } else {
+        } else
+#endif
             prefs->pressure_unit = PRESSURE_UNIT_HPA;
-        }
     }  
 }
 
@@ -518,13 +521,14 @@
     }
 
    if ((!prefs->distance_unit) || prefs->distance_unit == DISTANCE_UNIT_DEFAULT ) {
+#ifdef _NL_MEASUREMENT_MEASUREMENT
         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
         if ( imperial && imperial[0] == 2 )  {
             /* imperial */
             prefs->distance_unit = DISTANCE_UNIT_MILES;
-        } else {
+        } else
+#endif
             prefs->distance_unit = DISTANCE_UNIT_METERS;
-        }
     }
 
     return;