aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2005-06-15 17:15:15 +0000
committerChristian Grothoff <christian@grothoff.org>2005-06-15 17:15:15 +0000
commit007c46940dd030da607db1f7da7d03119710cd04 (patch)
tree4ba9acb3fe409923ce4ed6be663e1f92abe63326
parentd16c92ad34a06ac316830c39209e5d0488b3202c (diff)
downloadgnunet-gtk-007c46940dd030da607db1f7da7d03119710cd04.tar.gz
gnunet-gtk-007c46940dd030da607db1f7da7d03119710cd04.zip
update
Diffstat
-rw-r--r--INSTALL61
-rw-r--r--TODO29
-rw-r--r--configure.ac4
-rw-r--r--doc/Makefile.am5
-rw-r--r--gnunet-gtk.glade125
-rw-r--r--m4/codeset.m48
-rw-r--r--m4/gettext.m4102
-rw-r--r--m4/glibc21.m414
-rw-r--r--m4/iconv.m48
-rw-r--r--m4/intdiv0.m48
-rw-r--r--m4/intmax.m418
-rw-r--r--m4/inttypes-pri.m48
-rw-r--r--m4/inttypes.m48
-rw-r--r--m4/inttypes_h.m422
-rw-r--r--m4/lcmessage.m420
-rw-r--r--m4/lib-ld.m48
-rw-r--r--m4/lib-link.m420
-rw-r--r--m4/lib-prefix.m414
-rw-r--r--m4/longdouble.m48
-rw-r--r--m4/longlong.m414
-rw-r--r--m4/nls.m416
-rw-r--r--m4/po.m433
-rw-r--r--m4/printf-posix.m48
-rw-r--r--m4/progtest.m415
-rw-r--r--m4/signed.m48
-rw-r--r--m4/size_max.m48
-rw-r--r--m4/stdint_h.m422
-rw-r--r--m4/uintmax_t.m422
-rw-r--r--m4/ulonglong.m414
-rw-r--r--m4/wchar_t.m48
-rw-r--r--m4/wint_t.m48
-rw-r--r--m4/xsize.m413
-rw-r--r--mkinstalldirs17
-rw-r--r--po/Makefile.in2
-rw-r--r--po/POTFILES6
-rw-r--r--po/POTFILES.in4
-rw-r--r--po/gnunet-gtk.pot136
-rw-r--r--src/download.c227
-rw-r--r--src/download.h4
-rw-r--r--src/fs.c27
40 files changed, 686 insertions, 416 deletions
diff --git a/INSTALL b/INSTALL
index 56b077d6..54caf7c1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,13 @@
1Installation Instructions 1Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
2************************* 2Foundation, Inc.
3 3
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free 4 This file is free documentation; the Free Software Foundation gives
5Software Foundation, Inc.
6
7This file is free documentation; the Free Software Foundation gives
8unlimited permission to copy, distribute and modify it. 5unlimited permission to copy, distribute and modify it.
9 6
10Basic Installation 7Basic Installation
11================== 8==================
12 9
13These are generic installation instructions. 10 These are generic installation instructions.
14 11
15 The `configure' shell script attempts to guess correct values for 12 The `configure' shell script attempts to guess correct values for
16various system-dependent variables used during compilation. It uses 13various system-dependent variables used during compilation. It uses
@@ -70,9 +67,9 @@ The simplest way to compile this package is:
70Compilers and Options 67Compilers and Options
71===================== 68=====================
72 69
73Some systems require unusual options for compilation or linking that the 70 Some systems require unusual options for compilation or linking that
74`configure' script does not know about. Run `./configure --help' for 71the `configure' script does not know about. Run `./configure --help'
75details on some of the pertinent environment variables. 72for details on some of the pertinent environment variables.
76 73
77 You can give `configure' initial values for configuration parameters 74 You can give `configure' initial values for configuration parameters
78by setting variables in the command line or in the environment. Here 75by setting variables in the command line or in the environment. Here
@@ -85,7 +82,7 @@ is an example:
85Compiling For Multiple Architectures 82Compiling For Multiple Architectures
86==================================== 83====================================
87 84
88You can compile the package for more than one kind of computer at the 85 You can compile the package for more than one kind of computer at the
89same time, by placing the object files for each architecture in their 86same time, by placing the object files for each architecture in their
90own directory. To do this, you must use a version of `make' that 87own directory. To do this, you must use a version of `make' that
91supports the `VPATH' variable, such as GNU `make'. `cd' to the 88supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -102,19 +99,19 @@ for another architecture.
102Installation Names 99Installation Names
103================== 100==================
104 101
105By default, `make install' will install the package's files in 102 By default, `make install' will install the package's files in
106`/usr/local/bin', `/usr/local/man', etc. You can specify an 103`/usr/local/bin', `/usr/local/man', etc. You can specify an
107installation prefix other than `/usr/local' by giving `configure' the 104installation prefix other than `/usr/local' by giving `configure' the
108option `--prefix=PREFIX'. 105option `--prefix=PATH'.
109 106
110 You can specify separate installation prefixes for 107 You can specify separate installation prefixes for
111architecture-specific files and architecture-independent files. If you 108architecture-specific files and architecture-independent files. If you
112give `configure' the option `--exec-prefix=PREFIX', the package will 109give `configure' the option `--exec-prefix=PATH', the package will use
113use PREFIX as the prefix for installing programs and libraries. 110PATH as the prefix for installing programs and libraries.
114Documentation and other data files will still use the regular prefix. 111Documentation and other data files will still use the regular prefix.
115 112
116 In addition, if you use an unusual directory layout you can give 113 In addition, if you use an unusual directory layout you can give
117options like `--bindir=DIR' to specify different values for particular 114options like `--bindir=PATH' to specify different values for particular
118kinds of files. Run `configure --help' for a list of the directories 115kinds of files. Run `configure --help' for a list of the directories
119you can set and what kinds of files go in them. 116you can set and what kinds of files go in them.
120 117
@@ -125,7 +122,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
125Optional Features 122Optional Features
126================= 123=================
127 124
128Some packages pay attention to `--enable-FEATURE' options to 125 Some packages pay attention to `--enable-FEATURE' options to
129`configure', where FEATURE indicates an optional part of the package. 126`configure', where FEATURE indicates an optional part of the package.
130They may also pay attention to `--with-PACKAGE' options, where PACKAGE 127They may also pay attention to `--with-PACKAGE' options, where PACKAGE
131is something like `gnu-as' or `x' (for the X Window System). The 128is something like `gnu-as' or `x' (for the X Window System). The
@@ -140,11 +137,11 @@ you can use the `configure' options `--x-includes=DIR' and
140Specifying the System Type 137Specifying the System Type
141========================== 138==========================
142 139
143There may be some features `configure' cannot figure out automatically, 140 There may be some features `configure' cannot figure out
144but needs to determine by the type of machine the package will run on. 141automatically, but needs to determine by the type of machine the package
145Usually, assuming the package is built to be run on the _same_ 142will run on. Usually, assuming the package is built to be run on the
146architectures, `configure' can figure that out, but if it prints a 143_same_ architectures, `configure' can figure that out, but if it prints
147message saying it cannot guess the machine type, give it the 144a message saying it cannot guess the machine type, give it the
148`--build=TYPE' option. TYPE can either be a short name for the system 145`--build=TYPE' option. TYPE can either be a short name for the system
149type, such as `sun4', or a canonical name which has the form: 146type, such as `sun4', or a canonical name which has the form:
150 147
@@ -170,9 +167,9 @@ eventually be run) with `--host=TYPE'.
170Sharing Defaults 167Sharing Defaults
171================ 168================
172 169
173If you want to set default values for `configure' scripts to share, you 170 If you want to set default values for `configure' scripts to share,
174can create a site shell script called `config.site' that gives default 171you can create a site shell script called `config.site' that gives
175values for variables like `CC', `cache_file', and `prefix'. 172default values for variables like `CC', `cache_file', and `prefix'.
176`configure' looks for `PREFIX/share/config.site' if it exists, then 173`configure' looks for `PREFIX/share/config.site' if it exists, then
177`PREFIX/etc/config.site' if it exists. Or, you can set the 174`PREFIX/etc/config.site' if it exists. Or, you can set the
178`CONFIG_SITE' environment variable to the location of the site script. 175`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@ A warning: not all `configure' scripts look for a site script.
181Defining Variables 178Defining Variables
182================== 179==================
183 180
184Variables not defined in a site shell script can be set in the 181 Variables not defined in a site shell script can be set in the
185environment passed to `configure'. However, some packages may run 182environment passed to `configure'. However, some packages may run
186configure again during the build, and the customized values of these 183configure again during the build, and the customized values of these
187variables may be lost. In order to avoid this problem, you should set 184variables may be lost. In order to avoid this problem, you should set
@@ -189,18 +186,14 @@ them in the `configure' command line, using `VAR=value'. For example:
189 186
190 ./configure CC=/usr/local2/bin/gcc 187 ./configure CC=/usr/local2/bin/gcc
191 188
192causes the specified `gcc' to be used as the C compiler (unless it is 189will cause the specified gcc to be used as the C compiler (unless it is
193overridden in the site shell script). Here is a another example: 190overridden in the site shell script).
194
195 /bin/bash ./configure CONFIG_SHELL=/bin/bash
196
197Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
198configuration-related scripts to be executed by `/bin/bash'.
199 191
200`configure' Invocation 192`configure' Invocation
201====================== 193======================
202 194
203`configure' recognizes the following options to control how it operates. 195 `configure' recognizes the following options to control how it
196operates.
204 197
205`--help' 198`--help'
206`-h' 199`-h'
diff --git a/TODO b/TODO
index f0e60fd0..d7dfadba 100644
--- a/TODO
+++ b/TODO
@@ -1,15 +1,19 @@
1High priority (for 0.7.0pre3):
2* debug
3
4Important (for 0.7.0): 1Important (for 0.7.0):
5* make use of anonymity level specification widgets (easy): 2* cleanup-code (enum instead of 1,2,3,4; refactor search/download copied code) [ easy, CG ]
3* make use of anonymity level specification widgets [ easy, CG ]:
6 - search 4 - search
7 - download 5 - download
8 - upload 6 - upload
9 - namespace creation 7 - namespace creation
10* download: 8* allow user to cancel downloads (may need FSUI API extensions) [ medium, CG ]
11 - allow download canncellation 9* allow user to clear completed downloads from summary [ easy, CG ]
10* bugs:
12 - figure out where seemingly spurious "pending" downloads come from 11 - figure out where seemingly spurious "pending" downloads come from
12* search:
13 + update namespace list combo box [ easy, CG ]
14 + support namespace URIs [ easy, CG ]
15
16Less important (but still 0.7.0ish):
13* implement advanced FS operations: 17* implement advanced FS operations:
14 - create namespace [ medium ] 18 - create namespace [ medium ]
15 - publish to namespace [ medium ] 19 - publish to namespace [ medium ]
@@ -17,19 +21,8 @@ Important (for 0.7.0):
17 - start collection [ medium ] 21 - start collection [ medium ]
18 - stop collection [ easy ] 22 - stop collection [ easy ]
19 - create directory from arbitrary mix [ medium ] 23 - create directory from arbitrary mix [ medium ]
20* search:
21 + update namespace list combo box [ easy ]
22 + support namespace URIs [ easy ]
23 + update search summary (new search start, new search result)
24* insertion:
25 + support nice progress view for recursive insertions [ medium ] (working already???)
26* highlight completed downloads [ easy ] 24* highlight completed downloads [ easy ]
27* highlight active downloads in search list [ easy ] 25* highlight active downloads in search list [ easy ]
28* allow user to cancel downloads [ medium ]
29* allow user to clear completed downloads from summary [ easy ]
30* process download progress events:
31 - show contents of directory in associated search view! [ DIFFICULT, CG ]
32* cleanup-code (enum instead of 1,2,3,4) [ easy ]
33 26
34Later (0.7.1): 27Later (0.7.1):
35* auto-rename downloaded files to better names (user feedback!?) [ medium ] 28* auto-rename downloaded files to better names (user feedback!?) [ medium ]
@@ -46,8 +39,6 @@ Later (0.7.1):
46gnunet-gtk wishlist (from pre-0.7.0 days): 39gnunet-gtk wishlist (from pre-0.7.0 days):
47- #770? (use freedback (LOG) in gnunet-gtk via show-messages) 40- #770? (use freedback (LOG) in gnunet-gtk via show-messages)
48 (is this not working nicely already?) 41 (is this not working nicely already?)
49- while (!) downloading directory, display already received results
50 for download (now supported by libecrs!)
51- add option to list all indexed files and perhaps delete from them 42- add option to list all indexed files and perhaps delete from them
52 (ECRS now supports listing of indexed files!) 43 (ECRS now supports listing of indexed files!)
53- for potentially long clists, add option to specify a string 44- for potentially long clists, add option to specify a string
diff --git a/configure.ac b/configure.ac
index 2ec16541..bcfdbf3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
20# Process this file with autoconf to produce a configure script. 20# Process this file with autoconf to produce a configure script.
21# 21#
22AC_PREREQ(2.57) 22AC_PREREQ(2.57)
23AC_INIT([gnunet-gtk],[0.0.0],[bug-gnunet@gnu.org]) 23AC_INIT([gnunet-gtk],[0.7.0pre3],[bug-gnunet@gnu.org])
24AM_INIT_AUTOMAKE([gnunet-gtk], [0.0.0]) 24AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.0pre3])
25AM_CONFIG_HEADER(config.h) 25AM_CONFIG_HEADER(config.h)
26 26
27AH_TOP([#define _GNU_SOURCE 1]) 27AH_TOP([#define _GNU_SOURCE 1])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a1bedd9b..968e2964 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,5 @@
1man_MANS = \ 1man_MANS = \
2 gnunet-gtk.1 \ No newline at end of file 2 gnunet-gtk.1
3
4EXTRA_DIST = $(man_MANS)
5
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 49b292da..5dea3528 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -755,7 +755,7 @@ Thank you,
755 <property name="visible">True</property> 755 <property name="visible">True</property>
756 <property name="tooltip" translatable="yes">Cancel the selected download</property> 756 <property name="tooltip" translatable="yes">Cancel the selected download</property>
757 <property name="can_focus">True</property> 757 <property name="can_focus">True</property>
758 <property name="label">gtk-cancel</property> 758 <property name="label">gtk-stop</property>
759 <property name="use_stock">True</property> 759 <property name="use_stock">True</property>
760 <property name="relief">GTK_RELIEF_NORMAL</property> 760 <property name="relief">GTK_RELIEF_NORMAL</property>
761 <property name="focus_on_click">True</property> 761 <property name="focus_on_click">True</property>
@@ -896,7 +896,7 @@ Thank you,
896 896
897 <child> 897 <child>
898 <widget class="GtkLabel" id="statusfstab"> 898 <widget class="GtkLabel" id="statusfstab">
899 <property name="label" translatable="yes">S_tatus</property> 899 <property name="label" translatable="yes">Stat_us</property>
900 <property name="use_underline">True</property> 900 <property name="use_underline">True</property>
901 <property name="use_markup">False</property> 901 <property name="use_markup">False</property>
902 <property name="justify">GTK_JUSTIFY_CENTER</property> 902 <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1253,7 +1253,7 @@ Thank you,
1253 <child> 1253 <child>
1254 <widget class="GtkLabel" id="methodLabel"> 1254 <widget class="GtkLabel" id="methodLabel">
1255 <property name="visible">True</property> 1255 <property name="visible">True</property>
1256 <property name="label" translatable="yes">_Method:</property> 1256 <property name="label" translatable="yes">Method:</property>
1257 <property name="use_underline">True</property> 1257 <property name="use_underline">True</property>
1258 <property name="use_markup">False</property> 1258 <property name="use_markup">False</property>
1259 <property name="justify">GTK_JUSTIFY_LEFT</property> 1259 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1333,7 +1333,7 @@ Thank you,
1333 <child> 1333 <child>
1334 <widget class="GtkLabel" id="scopeLabel"> 1334 <widget class="GtkLabel" id="scopeLabel">
1335 <property name="visible">True</property> 1335 <property name="visible">True</property>
1336 <property name="label" translatable="yes">Sco_pe:</property> 1336 <property name="label" translatable="yes">Scope:</property>
1337 <property name="use_underline">True</property> 1337 <property name="use_underline">True</property>
1338 <property name="use_markup">False</property> 1338 <property name="use_markup">False</property>
1339 <property name="justify">GTK_JUSTIFY_LEFT</property> 1339 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1645,7 +1645,7 @@ Thank you,
1645 <child> 1645 <child>
1646 <widget class="GtkLabel" id="label74"> 1646 <widget class="GtkLabel" id="label74">
1647 <property name="visible">True</property> 1647 <property name="visible">True</property>
1648 <property name="label" translatable="yes">_Upload</property> 1648 <property name="label" translatable="yes">Up_load</property>
1649 <property name="use_underline">True</property> 1649 <property name="use_underline">True</property>
1650 <property name="use_markup">False</property> 1650 <property name="use_markup">False</property>
1651 <property name="justify">GTK_JUSTIFY_LEFT</property> 1651 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2250,7 +2250,7 @@ Thank you,
2250 <child> 2250 <child>
2251 <widget class="GtkLabel" id="chatNotebookLabel"> 2251 <widget class="GtkLabel" id="chatNotebookLabel">
2252 <property name="visible">True</property> 2252 <property name="visible">True</property>
2253 <property name="label" translatable="yes">_Chat</property> 2253 <property name="label" translatable="yes">Cha_t</property>
2254 <property name="use_underline">True</property> 2254 <property name="use_underline">True</property>
2255 <property name="use_markup">False</property> 2255 <property name="use_markup">False</property>
2256 <property name="justify">GTK_JUSTIFY_CENTER</property> 2256 <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -3002,7 +3002,7 @@ Press ENTER to add the data.</atkproperty>
3002 <child> 3002 <child>
3003 <widget class="GtkLabel" id="downloadAnonymityLabel"> 3003 <widget class="GtkLabel" id="downloadAnonymityLabel">
3004 <property name="visible">True</property> 3004 <property name="visible">True</property>
3005 <property name="label" translatable="yes">_Anonymity:</property> 3005 <property name="label" translatable="yes">Anon_ymity:</property>
3006 <property name="use_underline">True</property> 3006 <property name="use_underline">True</property>
3007 <property name="use_markup">False</property> 3007 <property name="use_markup">False</property>
3008 <property name="justify">GTK_JUSTIFY_LEFT</property> 3008 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3105,7 +3105,7 @@ Press ENTER to add the data.</atkproperty>
3105 <child> 3105 <child>
3106 <widget class="GtkLabel" id="label76"> 3106 <widget class="GtkLabel" id="label76">
3107 <property name="visible">True</property> 3107 <property name="visible">True</property>
3108 <property name="label" translatable="yes">_Download</property> 3108 <property name="label" translatable="yes">Down_load</property>
3109 <property name="use_underline">True</property> 3109 <property name="use_underline">True</property>
3110 <property name="use_markup">False</property> 3110 <property name="use_markup">False</property>
3111 <property name="justify">GTK_JUSTIFY_LEFT</property> 3111 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3234,73 +3234,11 @@ Press ENTER to add the data.</atkproperty>
3234 <widget class="GtkButton" id="namespaceInsertButton"> 3234 <widget class="GtkButton" id="namespaceInsertButton">
3235 <property name="visible">True</property> 3235 <property name="visible">True</property>
3236 <property name="can_focus">True</property> 3236 <property name="can_focus">True</property>
3237 <property name="label">gtk-add</property>
3238 <property name="use_stock">True</property>
3237 <property name="relief">GTK_RELIEF_NORMAL</property> 3239 <property name="relief">GTK_RELIEF_NORMAL</property>
3238 <property name="focus_on_click">True</property> 3240 <property name="focus_on_click">True</property>
3239 <signal name="clicked" handler="on_namespaceInsertButton_clicked" object="namespaceContentFrame" last_modification_time="Mon, 23 May 2005 19:00:01 GMT"/> 3241 <signal name="clicked" handler="on_namespaceInsertButton_clicked" object="namespaceContentFrame" last_modification_time="Mon, 23 May 2005 19:00:01 GMT"/>
3240
3241 <child>
3242 <widget class="GtkAlignment" id="alignment4">
3243 <property name="visible">True</property>
3244 <property name="xalign">0.5</property>
3245 <property name="yalign">0.5</property>
3246 <property name="xscale">0</property>
3247 <property name="yscale">0</property>
3248 <property name="top_padding">0</property>
3249 <property name="bottom_padding">0</property>
3250 <property name="left_padding">0</property>
3251 <property name="right_padding">0</property>
3252
3253 <child>
3254 <widget class="GtkHBox" id="hbox15">
3255 <property name="visible">True</property>
3256 <property name="homogeneous">False</property>
3257 <property name="spacing">2</property>
3258
3259 <child>
3260 <widget class="GtkImage" id="image4">
3261 <property name="visible">True</property>
3262 <property name="stock">gtk-add</property>
3263 <property name="icon_size">4</property>
3264 <property name="xalign">0.5</property>
3265 <property name="yalign">0.5</property>
3266 <property name="xpad">0</property>
3267 <property name="ypad">0</property>
3268 </widget>
3269 <packing>
3270 <property name="padding">0</property>
3271 <property name="expand">False</property>
3272 <property name="fill">False</property>
3273 </packing>
3274 </child>
3275
3276 <child>
3277 <widget class="GtkLabel" id="label66">
3278 <property name="visible">True</property>
3279 <property name="label" translatable="yes">_Insert</property>
3280 <property name="use_underline">True</property>
3281 <property name="use_markup">False</property>
3282 <property name="justify">GTK_JUSTIFY_LEFT</property>
3283 <property name="wrap">False</property>
3284 <property name="selectable">False</property>
3285 <property name="xalign">0.5</property>
3286 <property name="yalign">0.5</property>
3287 <property name="xpad">0</property>
3288 <property name="ypad">0</property>
3289 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
3290 <property name="width_chars">-1</property>
3291 <property name="single_line_mode">False</property>
3292 <property name="angle">0</property>
3293 </widget>
3294 <packing>
3295 <property name="padding">0</property>
3296 <property name="expand">False</property>
3297 <property name="fill">False</property>
3298 </packing>
3299 </child>
3300 </widget>
3301 </child>
3302 </widget>
3303 </child>
3304 </widget> 3242 </widget>
3305 <packing> 3243 <packing>
3306 <property name="padding">0</property> 3244 <property name="padding">0</property>
@@ -3357,7 +3295,7 @@ Press ENTER to add the data.</atkproperty>
3357 <child> 3295 <child>
3358 <widget class="GtkLabel" id="label67"> 3296 <widget class="GtkLabel" id="label67">
3359 <property name="visible">True</property> 3297 <property name="visible">True</property>
3360 <property name="label" translatable="yes">_Update</property> 3298 <property name="label" translatable="yes">U_pdate</property>
3361 <property name="use_underline">True</property> 3299 <property name="use_underline">True</property>
3362 <property name="use_markup">False</property> 3300 <property name="use_markup">False</property>
3363 <property name="justify">GTK_JUSTIFY_LEFT</property> 3301 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3538,7 +3476,7 @@ Press ENTER to add the data.</atkproperty>
3538 <child> 3476 <child>
3539 <widget class="GtkLabel" id="label69"> 3477 <widget class="GtkLabel" id="label69">
3540 <property name="visible">True</property> 3478 <property name="visible">True</property>
3541 <property name="label" translatable="yes">Senden</property> 3479 <property name="label" translatable="yes">Sen_d</property>
3542 <property name="use_underline">True</property> 3480 <property name="use_underline">True</property>
3543 <property name="use_markup">False</property> 3481 <property name="use_markup">False</property>
3544 <property name="justify">GTK_JUSTIFY_LEFT</property> 3482 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4542,4 +4480,43 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
4542 </child> 4480 </child>
4543</widget> 4481</widget>
4544 4482
4483<widget class="GtkMenu" id="searchSummaryContextMenu">
4484 <property agent="glademm" name="cxx_visibility">public</property>
4485
4486 <child>
4487 <widget class="GtkImageMenuItem" id="close_selected_search">
4488 <property name="visible">True</property>
4489 <property name="tooltip" translatable="yes">Close the selected search</property>
4490 <property name="label" translatable="yes">_Close</property>
4491 <property name="use_underline">True</property>
4492 <signal name="activate" handler="on_close_selected_search_activate" last_modification_time="Tue, 14 Jun 2005 23:59:56 GMT"/>
4493 <accelerator key="C" modifiers="0" signal="activate"/>
4494
4495 <child internal-child="image">
4496 <widget class="GtkImage" id="image18">
4497 <property name="visible">True</property>
4498 <property name="stock">gtk-close</property>
4499 <property name="icon_size">1</property>
4500 <property name="xalign">0.5</property>
4501 <property name="yalign">0.5</property>
4502 <property name="xpad">0</property>
4503 <property name="ypad">0</property>
4504 </widget>
4505 </child>
4506 </widget>
4507 </child>
4508</widget>
4509
4510<widget class="GtkMenu" id="fsAdvancedAvailableContentContextMenu">
4511
4512 <child>
4513 <widget class="GtkImageMenuItem" id="clear_known_content">
4514 <property name="visible">True</property>
4515 <property name="label">gtk-clear</property>
4516 <property name="use_stock">True</property>
4517 <signal name="activate" handler="on_clear_known_content_activate" last_modification_time="Wed, 15 Jun 2005 00:09:05 GMT"/>
4518 </widget>
4519 </child>
4520</widget>
4521
4545</glade-interface> 4522</glade-interface>
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 59535ebc..a6e67ec4 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,10 +1,8 @@
1# codeset.m4 serial AM1 (gettext-0.10.40) 1# codeset.m4 serial AM1 (gettext-0.10.40)
2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index a374f03f..624a8078 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,10 +1,8 @@
1# gettext.m4 serial 28 (gettext-0.13) 1# gettext.m4 serial 37 (gettext-0.14.4)
2dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -65,8 +63,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
65 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , 63 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
66 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT 64 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
67])])])]) 65])])])])
68 define(gt_included_intl, ifelse([$1], [external], [no], [yes])) 66 define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
69 define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) 67 define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
70 68
71 AC_REQUIRE([AM_PO_SUBDIRS])dnl 69 AC_REQUIRE([AM_PO_SUBDIRS])dnl
72 ifelse(gt_included_intl, yes, [ 70 ifelse(gt_included_intl, yes, [
@@ -92,6 +90,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
92 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) 90 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
93 ]) 91 ])
94 92
93 dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
94 gt_INTL_MACOSX
95
95 dnl Set USE_NLS. 96 dnl Set USE_NLS.
96 AM_NLS 97 AM_NLS
97 98
@@ -138,7 +139,7 @@ changequote([,])dnl
138], [])[extern int _nl_msg_cat_cntr; 139], [])[extern int _nl_msg_cat_cntr;
139extern int *_nl_domain_bindings;], 140extern int *_nl_domain_bindings;],
140 [bindtextdomain ("", ""); 141 [bindtextdomain ("", "");
141return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], 142return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
142 gt_cv_func_gnugettext_libc=yes, 143 gt_cv_func_gnugettext_libc=yes,
143 gt_cv_func_gnugettext_libc=no)]) 144 gt_cv_func_gnugettext_libc=no)])
144 145
@@ -172,9 +173,9 @@ extern
172#ifdef __cplusplus 173#ifdef __cplusplus
173"C" 174"C"
174#endif 175#endif
175const char *_nl_expand_alias ();], 176const char *_nl_expand_alias (const char *);],
176 [bindtextdomain ("", ""); 177 [bindtextdomain ("", "");
177return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], 178return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
178 gt_cv_func_gnugettext_libintl=yes, 179 gt_cv_func_gnugettext_libintl=yes,
179 gt_cv_func_gnugettext_libintl=no) 180 gt_cv_func_gnugettext_libintl=no)
180 dnl Now see whether libintl exists and depends on libiconv. 181 dnl Now see whether libintl exists and depends on libiconv.
@@ -193,9 +194,9 @@ extern
193#ifdef __cplusplus 194#ifdef __cplusplus
194"C" 195"C"
195#endif 196#endif
196const char *_nl_expand_alias ();], 197const char *_nl_expand_alias (const char *);],
197 [bindtextdomain ("", ""); 198 [bindtextdomain ("", "");
198return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], 199return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
199 [LIBINTL="$LIBINTL $LIBICONV" 200 [LIBINTL="$LIBINTL $LIBICONV"
200 LTLIBINTL="$LTLIBINTL $LTLIBICONV" 201 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
201 gt_cv_func_gnugettext_libintl=yes 202 gt_cv_func_gnugettext_libintl=yes
@@ -238,6 +239,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
238 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` 239 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
239 fi 240 fi
240 241
242 CATOBJEXT=
241 if test "$gt_use_preinstalled_gnugettext" = "yes" \ 243 if test "$gt_use_preinstalled_gnugettext" = "yes" \
242 || test "$nls_cv_use_gnu_gettext" = "yes"; then 244 || test "$nls_cv_use_gnu_gettext" = "yes"; then
243 dnl Mark actions to use GNU gettext tools. 245 dnl Mark actions to use GNU gettext tools.
@@ -245,6 +247,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
245 fi 247 fi
246 ]) 248 ])
247 249
250 if test -n "$INTL_MACOSX_LIBS"; then
251 if test "$gt_use_preinstalled_gnugettext" = "yes" \
252 || test "$nls_cv_use_gnu_gettext" = "yes"; then
253 dnl Some extra flags are needed during linking.
254 LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
255 LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
256 fi
257 fi
258
248 if test "$gt_use_preinstalled_gnugettext" = "yes" \ 259 if test "$gt_use_preinstalled_gnugettext" = "yes" \
249 || test "$nls_cv_use_gnu_gettext" = "yes"; then 260 || test "$nls_cv_use_gnu_gettext" = "yes"; then
250 AC_DEFINE(ENABLE_NLS, 1, 261 AC_DEFINE(ENABLE_NLS, 1,
@@ -320,6 +331,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
320 AC_SUBST(GENCAT) 331 AC_SUBST(GENCAT)
321 332
322 dnl For backward compatibility. Some Makefiles may be using this. 333 dnl For backward compatibility. Some Makefiles may be using this.
334 INTLOBJS=
323 if test "$USE_INCLUDED_LIBINTL" = yes; then 335 if test "$USE_INCLUDED_LIBINTL" = yes; then
324 INTLOBJS="\$(GETTOBJS)" 336 INTLOBJS="\$(GETTOBJS)"
325 fi 337 fi
@@ -350,6 +362,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
350 AC_REQUIRE([AM_MKINSTALLDIRS])dnl 362 AC_REQUIRE([AM_MKINSTALLDIRS])dnl
351 AC_REQUIRE([AC_PROG_CC])dnl 363 AC_REQUIRE([AC_PROG_CC])dnl
352 AC_REQUIRE([AC_CANONICAL_HOST])dnl 364 AC_REQUIRE([AC_CANONICAL_HOST])dnl
365 AC_REQUIRE([gt_GLIBC2])dnl
353 AC_REQUIRE([AC_PROG_RANLIB])dnl 366 AC_REQUIRE([AC_PROG_RANLIB])dnl
354 AC_REQUIRE([AC_ISC_POSIX])dnl 367 AC_REQUIRE([AC_ISC_POSIX])dnl
355 AC_REQUIRE([AC_HEADER_STDC])dnl 368 AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -358,22 +371,23 @@ AC_DEFUN([AM_INTL_SUBDIR],
358 AC_REQUIRE([AC_C_INLINE])dnl 371 AC_REQUIRE([AC_C_INLINE])dnl
359 AC_REQUIRE([AC_TYPE_OFF_T])dnl 372 AC_REQUIRE([AC_TYPE_OFF_T])dnl
360 AC_REQUIRE([AC_TYPE_SIZE_T])dnl 373 AC_REQUIRE([AC_TYPE_SIZE_T])dnl
361 AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl 374 AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
362 AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl 375 AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
363 AC_REQUIRE([gt_TYPE_WCHAR_T])dnl 376 AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
364 AC_REQUIRE([gt_TYPE_WINT_T])dnl 377 AC_REQUIRE([gt_TYPE_WINT_T])dnl
365 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) 378 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
366 AC_REQUIRE([jm_AC_HEADER_STDINT_H]) 379 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
367 AC_REQUIRE([gt_TYPE_INTMAX_T]) 380 AC_REQUIRE([gt_TYPE_INTMAX_T])
368 AC_REQUIRE([gt_PRINTF_POSIX]) 381 AC_REQUIRE([gt_PRINTF_POSIX])
369 AC_REQUIRE([AC_FUNC_ALLOCA])dnl 382 AC_REQUIRE([AC_FUNC_ALLOCA])dnl
370 AC_REQUIRE([AC_FUNC_MMAP])dnl 383 AC_REQUIRE([AC_FUNC_MMAP])dnl
371 AC_REQUIRE([jm_GLIBC21])dnl 384 AC_REQUIRE([gl_GLIBC21])dnl
372 AC_REQUIRE([gt_INTDIV0])dnl 385 AC_REQUIRE([gt_INTDIV0])dnl
373 AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl 386 AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
374 AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl 387 AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
375 AC_REQUIRE([gt_INTTYPES_PRI])dnl 388 AC_REQUIRE([gt_INTTYPES_PRI])dnl
376 AC_REQUIRE([gl_XSIZE])dnl 389 AC_REQUIRE([gl_XSIZE])dnl
390 AC_REQUIRE([gt_INTL_MACOSX])dnl
377 391
378 AC_CHECK_TYPE([ptrdiff_t], , 392 AC_CHECK_TYPE([ptrdiff_t], ,
379 [AC_DEFINE([ptrdiff_t], [long], 393 [AC_DEFINE([ptrdiff_t], [long],
@@ -427,7 +441,11 @@ __fsetlocking])
427 AM_ICONV 441 AM_ICONV
428 AM_LANGINFO_CODESET 442 AM_LANGINFO_CODESET
429 if test $ac_cv_header_locale_h = yes; then 443 if test $ac_cv_header_locale_h = yes; then
430 AM_LC_MESSAGES 444 gt_LC_MESSAGES
445 fi
446
447 if test -n "$INTL_MACOSX_LIBS"; then
448 CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
431 fi 449 fi
432 450
433 dnl intl/plural.c is generated from intl/plural.y. It requires bison, 451 dnl intl/plural.c is generated from intl/plural.y. It requires bison,
@@ -463,6 +481,50 @@ changequote([,])dnl
463]) 481])
464 482
465 483
484dnl Checks for special options needed on MacOS X.
485dnl Defines INTL_MACOSX_LIBS.
486AC_DEFUN([gt_INTL_MACOSX],
487[
488 dnl Check for API introduced in MacOS X 10.2.
489 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
490 gt_cv_func_CFPreferencesCopyAppValue,
491 [gt_save_CPPFLAGS="$CPPFLAGS"
492 CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
493 gt_save_LIBS="$LIBS"
494 LIBS="$LIBS -framework CoreFoundation"
495 AC_TRY_LINK([#include <CFPreferences.h>],
496 [CFPreferencesCopyAppValue(NULL, NULL)],
497 [gt_cv_func_CFPreferencesCopyAppValue=yes],
498 [gt_cv_func_CFPreferencesCopyAppValue=no])
499 CPPFLAGS="$gt_save_CPPFLAGS"
500 LIBS="$gt_save_LIBS"])
501 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
502 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
503 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
504 fi
505 dnl Check for API introduced in MacOS X 10.3.
506 AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
507 [gt_save_CPPFLAGS="$CPPFLAGS"
508 CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
509 gt_save_LIBS="$LIBS"
510 LIBS="$LIBS -framework CoreFoundation"
511 AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
512 [gt_cv_func_CFLocaleCopyCurrent=yes],
513 [gt_cv_func_CFLocaleCopyCurrent=no])
514 CPPFLAGS="$gt_save_CPPFLAGS"
515 LIBS="$gt_save_LIBS"])
516 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
517 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
518 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
519 fi
520 INTL_MACOSX_LIBS=
521 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
522 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
523 fi
524 AC_SUBST([INTL_MACOSX_LIBS])
525])
526
527
466dnl gt_CHECK_DECL(FUNC, INCLUDES) 528dnl gt_CHECK_DECL(FUNC, INCLUDES)
467dnl Check whether a function is declared. 529dnl Check whether a function is declared.
468AC_DEFUN([gt_CHECK_DECL], 530AC_DEFUN([gt_CHECK_DECL],
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 9c9f3db3..d95fd986 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,15 +1,13 @@
1# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) 1# glibc21.m4 serial 3
2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9# Test for the GNU C Library, version 2.1 or newer. 7# Test for the GNU C Library, version 2.1 or newer.
10# From Bruno Haible. 8# From Bruno Haible.
11 9
12AC_DEFUN([jm_GLIBC21], 10AC_DEFUN([gl_GLIBC21],
13 [ 11 [
14 AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, 12 AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
15 ac_cv_gnu_library_2_1, 13 ac_cv_gnu_library_2_1,
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index c5f35798..654c4158 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,10 +1,8 @@
1# iconv.m4 serial AM4 (gettext-0.11.3) 1# iconv.m4 serial AM4 (gettext-0.11.3)
2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index 55dddcf1..b8d78176 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,10 +1,8 @@
1# intdiv0.m4 serial 1 (gettext-0.11.3) 1# intdiv0.m4 serial 1 (gettext-0.11.3)
2dnl Copyright (C) 2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index dfb08ccc..d99c999f 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,10 +1,8 @@
1# intmax.m4 serial 1 (gettext-0.12) 1# intmax.m4 serial 2 (gettext-0.14.2)
2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether the system has the 'intmax_t' type, but don't attempt to 8dnl Test whether the system has the 'intmax_t' type, but don't attempt to
@@ -12,11 +10,11 @@ dnl find a replacement if it is lacking.
12 10
13AC_DEFUN([gt_TYPE_INTMAX_T], 11AC_DEFUN([gt_TYPE_INTMAX_T],
14[ 12[
15 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) 13 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
16 AC_REQUIRE([jm_AC_HEADER_STDINT_H]) 14 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
17 AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, 15 AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
18 [AC_TRY_COMPILE([ 16 [AC_TRY_COMPILE([
19#include <stddef.h> 17#include <stddef.h>
20#include <stdlib.h> 18#include <stdlib.h>
21#if HAVE_STDINT_H_WITH_UINTMAX 19#if HAVE_STDINT_H_WITH_UINTMAX
22#include <stdint.h> 20#include <stdint.h>
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index fd007c31..4d56a9ad 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,10 +1,8 @@
1# inttypes-pri.m4 serial 1 (gettext-0.11.4) 1# inttypes-pri.m4 serial 1 (gettext-0.11.4)
2dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index ab370ffe..779bcea0 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,10 +1,8 @@
1# inttypes.m4 serial 1 (gettext-0.11.4) 1# inttypes.m4 serial 1 (gettext-0.11.4)
2dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index f342eba3..a5d075d9 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,26 +1,24 @@
1# inttypes_h.m4 serial 5 (gettext-0.12) 1# inttypes_h.m4 serial 6
2dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, 9# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
12# doesn't clash with <sys/types.h>, and declares uintmax_t. 10# doesn't clash with <sys/types.h>, and declares uintmax_t.
13 11
14AC_DEFUN([jm_AC_HEADER_INTTYPES_H], 12AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
15[ 13[
16 AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, 14 AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
17 [AC_TRY_COMPILE( 15 [AC_TRY_COMPILE(
18 [#include <sys/types.h> 16 [#include <sys/types.h>
19#include <inttypes.h>], 17#include <inttypes.h>],
20 [uintmax_t i = (uintmax_t) -1;], 18 [uintmax_t i = (uintmax_t) -1;],
21 jm_ac_cv_header_inttypes_h=yes, 19 gl_cv_header_inttypes_h=yes,
22 jm_ac_cv_header_inttypes_h=no)]) 20 gl_cv_header_inttypes_h=no)])
23 if test $jm_ac_cv_header_inttypes_h = yes; then 21 if test $gl_cv_header_inttypes_h = yes; then
24 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, 22 AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
25 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, 23 [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
26 and declares uintmax_t. ]) 24 and declares uintmax_t. ])
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index ffd4008b..19aa77e4 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,10 +1,8 @@
1# lcmessage.m4 serial 3 (gettext-0.11.3) 1# lcmessage.m4 serial 4 (gettext-0.14.2)
2dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -20,12 +18,12 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
20 18
21# Check whether LC_MESSAGES is available in <locale.h>. 19# Check whether LC_MESSAGES is available in <locale.h>.
22 20
23AC_DEFUN([AM_LC_MESSAGES], 21AC_DEFUN([gt_LC_MESSAGES],
24[ 22[
25 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, 23 AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
26 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], 24 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
27 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) 25 gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
28 if test $am_cv_val_LC_MESSAGES = yes; then 26 if test $gt_cv_val_LC_MESSAGES = yes; then
29 AC_DEFINE(HAVE_LC_MESSAGES, 1, 27 AC_DEFINE(HAVE_LC_MESSAGES, 1,
30 [Define if your <locale.h> file defines LC_MESSAGES.]) 28 [Define if your <locale.h> file defines LC_MESSAGES.])
31 fi 29 fi
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 38aeaec1..96c4e2c3 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,10 +1,8 @@
1# lib-ld.m4 serial 3 (gettext-0.13) 1# lib-ld.m4 serial 3 (gettext-0.13)
2dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl Subroutines of libtool.m4, 7dnl Subroutines of libtool.m4,
10dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision 8dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index eeb200d2..ea0b0c4e 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,13 +1,13 @@
1# lib-link.m4 serial 4 (gettext-0.12) 1# lib-link.m4 serial 6 (gettext-0.14.3)
2dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
9AC_PREREQ(2.50)
10
11dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and 11dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
12dnl the libraries corresponding to explicit and implicit dependencies. 12dnl the libraries corresponding to explicit and implicit dependencies.
13dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and 13dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -95,6 +95,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
95dnl hardcode_direct, hardcode_minus_L. 95dnl hardcode_direct, hardcode_minus_L.
96AC_DEFUN([AC_LIB_RPATH], 96AC_DEFUN([AC_LIB_RPATH],
97[ 97[
98 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
99 m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
98 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS 100 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
99 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld 101 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
100 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host 102 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
@@ -350,7 +352,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
350 if test "X$additional_includedir" = "X/usr/local/include"; then 352 if test "X$additional_includedir" = "X/usr/local/include"; then
351 if test -n "$GCC"; then 353 if test -n "$GCC"; then
352 case $host_os in 354 case $host_os in
353 linux*) haveit=yes;; 355 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
354 esac 356 esac
355 fi 357 fi
356 fi 358 fi
@@ -399,7 +401,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
399 if test "X$additional_libdir" = "X/usr/local/lib"; then 401 if test "X$additional_libdir" = "X/usr/local/lib"; then
400 if test -n "$GCC"; then 402 if test -n "$GCC"; then
401 case $host_os in 403 case $host_os in
402 linux*) haveit=yes;; 404 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
403 esac 405 esac
404 fi 406 fi
405 fi 407 fi
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 8aff5a9d..0d895ca6 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,10 +1,8 @@
1# lib-prefix.m4 serial 3 (gettext-0.13) 1# lib-prefix.m4 serial 4 (gettext-0.14.2)
2dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
@@ -71,7 +69,7 @@ AC_DEFUN([AC_LIB_PREFIX],
71 if test "X$additional_includedir" = "X/usr/local/include"; then 69 if test "X$additional_includedir" = "X/usr/local/include"; then
72 if test -n "$GCC"; then 70 if test -n "$GCC"; then
73 case $host_os in 71 case $host_os in
74 linux*) haveit=yes;; 72 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
75 esac 73 esac
76 fi 74 fi
77 fi 75 fi
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
index 1333d2f5..40cd7ce0 100644
--- a/m4/longdouble.m4
+++ b/m4/longdouble.m4
@@ -1,10 +1,8 @@
1# longdouble.m4 serial 1 (gettext-0.12) 1# longdouble.m4 serial 1 (gettext-0.12)
2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether the compiler supports the 'long double' type. 8dnl Test whether the compiler supports the 'long double' type.
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index d7d7350b..7b399e01 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,16 +1,14 @@
1# longlong.m4 serial 4 1# longlong.m4 serial 5
2dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_LONG_LONG if 'long long' works. 9# Define HAVE_LONG_LONG if 'long long' works.
12 10
13AC_DEFUN([jm_AC_TYPE_LONG_LONG], 11AC_DEFUN([gl_AC_TYPE_LONG_LONG],
14[ 12[
15 AC_CACHE_CHECK([for long long], ac_cv_type_long_long, 13 AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
16 [AC_TRY_LINK([long long ll = 1LL; int i = 63;], 14 [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
diff --git a/m4/nls.m4 b/m4/nls.m4
index 36bc4931..2082c3b2 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,10 +1,8 @@
1# nls.m4 serial 1 (gettext-0.12) 1# nls.m4 serial 2 (gettext-0.14.3)
2dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -19,6 +17,8 @@ dnl Authors:
19dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
20dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
21 19
20AC_PREREQ(2.50)
21
22AC_DEFUN([AM_NLS], 22AC_DEFUN([AM_NLS],
23[ 23[
24 AC_MSG_CHECKING([whether NLS is requested]) 24 AC_MSG_CHECKING([whether NLS is requested])
@@ -32,6 +32,8 @@ AC_DEFUN([AM_NLS],
32 32
33AC_DEFUN([AM_MKINSTALLDIRS], 33AC_DEFUN([AM_MKINSTALLDIRS],
34[ 34[
35 dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
36 m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
35 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly 37 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
36 dnl find the mkinstalldirs script in another subdir but $(top_srcdir). 38 dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
37 dnl Try to locate it. 39 dnl Try to locate it.
diff --git a/m4/po.m4 b/m4/po.m4
index e1619988..f2795eea 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,10 +1,8 @@
1# po.m4 serial 3 (gettext-0.14) 1# po.m4 serial 7 (gettext-0.14.3)
2dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -19,6 +17,8 @@ dnl Authors:
19dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
20dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
21 19
20AC_PREREQ(2.50)
21
22dnl Checks for all prerequisites of the po subdirectory. 22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS], 23AC_DEFUN([AM_PO_SUBDIRS],
24[ 24[
@@ -34,7 +34,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
34 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. 34 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
35 dnl The second test excludes FreeBSD msgfmt. 35 dnl The second test excludes FreeBSD msgfmt.
36 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, 36 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
37 [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && 37 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
38 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 38 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
39 :) 39 :)
40 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) 40 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
@@ -43,7 +43,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
43 dnl The first test excludes Solaris xgettext and early GNU xgettext versions. 43 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
44 dnl The second test excludes FreeBSD xgettext. 44 dnl The second test excludes FreeBSD xgettext.
45 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, 45 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
46 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && 46 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
47 (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 47 (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
48 :) 48 :)
49 dnl Remove leftover from FreeBSD xgettext call. 49 dnl Remove leftover from FreeBSD xgettext call.
@@ -51,7 +51,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
51 51
52 dnl Search for GNU msgmerge 0.11 or newer in the PATH. 52 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
53 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, 53 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
54 [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) 54 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
55 55
56 dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. 56 dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
57 dnl Test whether we really found GNU msgfmt. 57 dnl Test whether we really found GNU msgfmt.
@@ -106,6 +106,9 @@ AC_DEFUN([AM_PO_SUBDIRS],
106 /*) top_srcdir="$ac_given_srcdir" ;; 106 /*) top_srcdir="$ac_given_srcdir" ;;
107 *) top_srcdir="$ac_dots$ac_given_srcdir" ;; 107 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
108 esac 108 esac
109 # Treat a directory as a PO directory if and only if it has a
110 # POTFILES.in file. This allows packages to have multiple PO
111 # directories under different names or in different locations.
109 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then 112 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
110 rm -f "$ac_dir/POTFILES" 113 rm -f "$ac_dir/POTFILES"
111 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" 114 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
@@ -119,7 +122,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
119 if test -n "$OBSOLETE_ALL_LINGUAS"; then 122 if test -n "$OBSOLETE_ALL_LINGUAS"; then
120 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" 123 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
121 fi 124 fi
122 ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` 125 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
123 # Hide the ALL_LINGUAS assigment from automake. 126 # Hide the ALL_LINGUAS assigment from automake.
124 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 127 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
125 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" 128 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
@@ -298,7 +301,7 @@ changequote([,])dnl
298 fi 301 fi
299 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then 302 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
300 # The LINGUAS file contains the set of available languages. 303 # The LINGUAS file contains the set of available languages.
301 ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` 304 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
302 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" 305 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
303 else 306 else
304 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. 307 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
@@ -348,7 +351,7 @@ changequote([,])dnl
348 QMFILES="$QMFILES $srcdirpre$lang.qm" 351 QMFILES="$QMFILES $srcdirpre$lang.qm"
349 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 352 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
350 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" 353 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
351 frobbedlang=`echo $lang | sed -e 's/_/-/g'` 354 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
352 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" 355 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
353 done 356 done
354 # CATALOGS depends on both $ac_dir and the user's LINGUAS 357 # CATALOGS depends on both $ac_dir and the user's LINGUAS
@@ -389,7 +392,7 @@ changequote([,])dnl
389 QTCATALOGS="$QTCATALOGS $lang.qm" 392 QTCATALOGS="$QTCATALOGS $lang.qm"
390 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 393 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
391 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" 394 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
392 frobbedlang=`echo $lang | sed -e 's/_/-/g'` 395 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
393 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" 396 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
394 done 397 done
395 fi 398 fi
@@ -409,7 +412,7 @@ EOF
409 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then 412 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
410 # Add dependencies that cannot be formulated as a simple suffix rule. 413 # Add dependencies that cannot be formulated as a simple suffix rule.
411 for lang in $ALL_LINGUAS; do 414 for lang in $ALL_LINGUAS; do
412 frobbedlang=`echo $lang | sed -e 's/_/-/g'` 415 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
413 cat >> "$ac_file.tmp" <<EOF 416 cat >> "$ac_file.tmp" <<EOF
414$frobbedlang/\$(DOMAIN).resources.dll: $lang.po 417$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
415 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ 418 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
index 186ba6a6..af10170a 100644
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -1,10 +1,8 @@
1# printf-posix.m4 serial 2 (gettext-0.13.1) 1# printf-posix.m4 serial 2 (gettext-0.13.1)
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether the printf() function supports POSIX/XSI format strings with 8dnl Test whether the printf() function supports POSIX/XSI format strings with
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 8fe527ce..a56365cd 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,10 +1,8 @@
1# progtest.m4 serial 3 (gettext-0.12) 1# progtest.m4 serial 4 (gettext-0.14.2)
2dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8dnl 6dnl
9dnl This file can can be used in projects which are not available under 7dnl This file can can be used in projects which are not available under
10dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Library General Public
@@ -18,6 +16,8 @@ dnl They are *not* in the public domain.
18dnl Authors: 16dnl Authors:
19dnl Ulrich Drepper <drepper@cygnus.com>, 1996. 17dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
20 18
19AC_PREREQ(2.50)
20
21# Search path for a program which passes the given test. 21# Search path for a program which passes the given test.
22 22
23dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, 23dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -67,6 +67,7 @@ AC_CACHE_VAL(ac_cv_path_$1,
67 test -z "$ac_dir" && ac_dir=. 67 test -z "$ac_dir" && ac_dir=.
68 for ac_exec_ext in '' $ac_executable_extensions; do 68 for ac_exec_ext in '' $ac_executable_extensions; do
69 if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then 69 if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
70 echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
70 if [$3]; then 71 if [$3]; then
71 ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" 72 ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
72 break 2 73 break 2
diff --git a/m4/signed.m4 b/m4/signed.m4
index dc1f54f1..048f5936 100644
--- a/m4/signed.m4
+++ b/m4/signed.m4
@@ -1,10 +1,8 @@
1# signed.m4 serial 1 (gettext-0.10.40) 1# signed.m4 serial 1 (gettext-0.10.40)
2dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index 5762fc33..4fe81c7b 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,10 +1,8 @@
1# size_max.m4 serial 2 1# size_max.m4 serial 2
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10 8
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 32ba7ae7..3355f35a 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,26 +1,24 @@
1# stdint_h.m4 serial 3 (gettext-0.12) 1# stdint_h.m4 serial 5
2dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, 9# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
12# doesn't clash with <sys/types.h>, and declares uintmax_t. 10# doesn't clash with <sys/types.h>, and declares uintmax_t.
13 11
14AC_DEFUN([jm_AC_HEADER_STDINT_H], 12AC_DEFUN([gl_AC_HEADER_STDINT_H],
15[ 13[
16 AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, 14 AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
17 [AC_TRY_COMPILE( 15 [AC_TRY_COMPILE(
18 [#include <sys/types.h> 16 [#include <sys/types.h>
19#include <stdint.h>], 17#include <stdint.h>],
20 [uintmax_t i = (uintmax_t) -1;], 18 [uintmax_t i = (uintmax_t) -1;],
21 jm_ac_cv_header_stdint_h=yes, 19 gl_cv_header_stdint_h=yes,
22 jm_ac_cv_header_stdint_h=no)]) 20 gl_cv_header_stdint_h=no)])
23 if test $jm_ac_cv_header_stdint_h = yes; then 21 if test $gl_cv_header_stdint_h = yes; then
24 AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, 22 AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
25 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, 23 [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
26 and declares uintmax_t. ]) 24 and declares uintmax_t. ])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index b5f28d44..bf83ed74 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,10 +1,8 @@
1# uintmax_t.m4 serial 7 (gettext-0.12) 1# uintmax_t.m4 serial 9
2dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
@@ -13,12 +11,12 @@ AC_PREREQ(2.13)
13# Define uintmax_t to 'unsigned long' or 'unsigned long long' 11# Define uintmax_t to 'unsigned long' or 'unsigned long long'
14# if it is not already defined in <stdint.h> or <inttypes.h>. 12# if it is not already defined in <stdint.h> or <inttypes.h>.
15 13
16AC_DEFUN([jm_AC_TYPE_UINTMAX_T], 14AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
17[ 15[
18 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) 16 AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
19 AC_REQUIRE([jm_AC_HEADER_STDINT_H]) 17 AC_REQUIRE([gl_AC_HEADER_STDINT_H])
20 if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then 18 if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
21 AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) 19 AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
22 test $ac_cv_type_unsigned_long_long = yes \ 20 test $ac_cv_type_unsigned_long_long = yes \
23 && ac_type='unsigned long long' \ 21 && ac_type='unsigned long long' \
24 || ac_type='unsigned long' 22 || ac_type='unsigned long'
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index 1da8b809..dee10ccc 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,16 +1,14 @@
1# ulonglong.m4 serial 3 1# ulonglong.m4 serial 4
2dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Paul Eggert. 7dnl From Paul Eggert.
10 8
11# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. 9# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
12 10
13AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], 11AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
14[ 12[
15 AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, 13 AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
16 [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], 14 [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index d8fd1ec5..cde2129a 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -1,10 +1,8 @@
1# wchar_t.m4 serial 1 (gettext-0.12) 1# wchar_t.m4 serial 1 (gettext-0.12)
2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether <stddef.h> has the 'wchar_t' type. 8dnl Test whether <stddef.h> has the 'wchar_t' type.
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index 3d8d2159..b8fff9c8 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,10 +1,8 @@
1# wint_t.m4 serial 1 (gettext-0.12) 1# wint_t.m4 serial 1 (gettext-0.12)
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9dnl From Bruno Haible. 7dnl From Bruno Haible.
10dnl Test whether <wchar.h> has the 'wint_t' type. 8dnl Test whether <wchar.h> has the 'wint_t' type.
diff --git a/m4/xsize.m4 b/m4/xsize.m4
index 9b7cf9b4..85bb721e 100644
--- a/m4/xsize.m4
+++ b/m4/xsize.m4
@@ -1,14 +1,13 @@
1# xsize.m4 serial 2 1# xsize.m4 serial 3
2dnl Copyright (C) 2003 Free Software Foundation, Inc. 2dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU 3dnl This file is free software; the Free Software Foundation
4dnl General Public License. As a special exception to the GNU General 4dnl gives unlimited permission to copy and/or distribute it,
5dnl Public License, this file may be distributed as part of a program 5dnl with or without modifications, as long as this notice is preserved.
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8 6
9AC_DEFUN([gl_XSIZE], 7AC_DEFUN([gl_XSIZE],
10[ 8[
11 dnl Prerequisites of lib/xsize.h. 9 dnl Prerequisites of lib/xsize.h.
12 AC_REQUIRE([gl_SIZE_MAX]) 10 AC_REQUIRE([gl_SIZE_MAX])
11 AC_REQUIRE([AC_C_INLINE])
13 AC_CHECK_HEADERS(stdint.h) 12 AC_CHECK_HEADERS(stdint.h)
14]) 13])
diff --git a/mkinstalldirs b/mkinstalldirs
index 6504b744..6fbe5e11 100644
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
1#! /bin/sh 1#! /bin/sh
2# mkinstalldirs --- make directory hierarchy 2# mkinstalldirs --- make directory hierarchy
3 3
4scriptversion=2003-11-08.23 4scriptversion=2004-02-15.20
5 5
6# Original author: Noah Friedman <friedman@prep.ai.mit.edu> 6# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
7# Created: 1993-05-16 7# Created: 1993-05-16
@@ -66,9 +66,15 @@ case $# in
66 0) exit 0 ;; 66 0) exit 0 ;;
67esac 67esac
68 68
69# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
70# mkdir -p a/c at the same time, both will detect that a is missing,
71# one will create a, then the other will try to create a and die with
72# a "File exists" error. This is a problem when calling mkinstalldirs
73# from a parallel make. We use --version in the probe to restrict
74# ourselves to GNU mkdir, which is thread-safe.
69case $dirmode in 75case $dirmode in
70 '') 76 '')
71 if mkdir -p -- . 2>/dev/null; then 77 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
72 echo "mkdir -p -- $*" 78 echo "mkdir -p -- $*"
73 exec mkdir -p -- "$@" 79 exec mkdir -p -- "$@"
74 else 80 else
@@ -77,16 +83,17 @@ case $dirmode in
77 # directories to create, and then abort because `.' already 83 # directories to create, and then abort because `.' already
78 # exists. 84 # exists.
79 test -d ./-p && rmdir ./-p 85 test -d ./-p && rmdir ./-p
80 test -d ./-- && rmdir ./-- 86 test -d ./--version && rmdir ./--version
81 fi 87 fi
82 ;; 88 ;;
83 *) 89 *)
84 if mkdir -m "$dirmode" -p -- . 2>/dev/null; then 90 if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
91 test ! -d ./--version; then
85 echo "mkdir -m $dirmode -p -- $*" 92 echo "mkdir -m $dirmode -p -- $*"
86 exec mkdir -m "$dirmode" -p -- "$@" 93 exec mkdir -m "$dirmode" -p -- "$@"
87 else 94 else
88 # Clean up after NextStep and OpenStep mkdir. 95 # Clean up after NextStep and OpenStep mkdir.
89 for d in ./-m ./-p ./-- "./$dirmode"; 96 for d in ./-m ./-p ./--version "./$dirmode";
90 do 97 do
91 test -d $d && rmdir $d 98 test -d $d && rmdir $d
92 done 99 done
diff --git a/po/Makefile.in b/po/Makefile.in
index 9251fc40..9f75943f 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
11# Origin: gettext-0.14.4 11# Origin: gettext-0.14.4
12 12
13PACKAGE = gnunet-gtk 13PACKAGE = gnunet-gtk
14VERSION = 0.0.0 14VERSION = 0.7.0pre3
15PACKAGE_BUGREPORT = bug-gnunet@gnu.org 15PACKAGE_BUGREPORT = bug-gnunet@gnu.org
16 16
17SHELL = /bin/sh 17SHELL = /bin/sh
diff --git a/po/POTFILES b/po/POTFILES
index ddbf950a..7342f76f 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,6 +1,8 @@
1 ../src/helper.c \ 1 ../src/helper.c \
2 ../src/main.c \ 2 ../src/main.c \
3 ../src/fs.c \ 3 ../src/fs.c \
4 ../src/daemon.c \
5 ../src/search.c \ 4 ../src/search.c \
6 ../src/about.c 5 ../src/daemon.c \
6 ../src/about.c \
7 ../src/download.c \
8 ../src/upload.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f475388a..703d3123 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,8 @@
1src/helper.c 1src/helper.c
2src/main.c 2src/main.c
3src/fs.c 3src/fs.c
4src/daemon.c
5src/search.c 4src/search.c
5src/daemon.c
6src/about.c 6src/about.c
7src/download.c
8src/upload.c
diff --git a/po/gnunet-gtk.pot b/po/gnunet-gtk.pot
index 0450e798..048a4d22 100644
--- a/po/gnunet-gtk.pot
+++ b/po/gnunet-gtk.pot
@@ -3,12 +3,13 @@
3# This file is distributed under the same license as the PACKAGE package. 3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5# 5#
6#: src/search.c:153 src/download.c:122
6#, fuzzy 7#, fuzzy
7msgid "" 8msgid ""
8msgstr "" 9msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n" 10"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n" 11"Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
11"POT-Creation-Date: 2005-05-30 16:41-0500\n" 12"POT-Creation-Date: 2005-06-14 18:25-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n" 15"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,19 +17,19 @@ msgstr ""
16"Content-Type: text/plain; charset=CHARSET\n" 17"Content-Type: text/plain; charset=CHARSET\n"
17"Content-Transfer-Encoding: 8bit\n" 18"Content-Transfer-Encoding: 8bit\n"
18 19
19#: src/helper.c:201 20#: src/helper.c:207
20msgid "Notification" 21msgid "Notification"
21msgstr "" 22msgstr ""
22 23
23#: src/helper.c:219 24#: src/helper.c:225
24msgid "Ok" 25msgid "Ok"
25msgstr "" 26msgstr ""
26 27
27#: src/helper.c:275 28#: src/helper.c:281
28msgid "Messages" 29msgid "Messages"
29msgstr "" 30msgstr ""
30 31
31#: src/helper.c:308 32#: src/helper.c:314
32msgid "Close" 33msgid "Close"
33msgstr "" 34msgstr ""
34 35
@@ -40,69 +41,150 @@ msgstr ""
40msgid "Use --help to get a list of options.\n" 41msgid "Use --help to get a list of options.\n"
41msgstr "" 42msgstr ""
42 43
43#: src/daemon.c:61 44#: src/fs.c:48
45#, c-format
46msgid "Error while searching: %s\n"
47msgstr ""
48
49#: src/fs.c:71
50#, c-format
51msgid "Error while downloading: %s\n"
52msgstr ""
53
54#: src/fs.c:91
55#, c-format
56msgid "Error while uploading: %s\n"
57msgstr ""
58
59#: src/fs.c:96
60msgid "Connected to gnunetd.\n"
61msgstr ""
62
63#: src/fs.c:100
64msgid "Disconnected from gnunetd.\n"
65msgstr ""
66
67#: src/fs.c:105
68#, c-format
69msgid "Unhandled (unknown) FSUI event: %u.\n"
70msgstr ""
71
72#: src/search.c:141 src/download.c:110
73msgid "unknown"
74msgstr ""
75
76#: src/search.c:165 src/download.c:134
77msgid "no name given"
78msgstr ""
79
80#: src/search.c:361 src/download.c:445
81msgid "Name"
82msgstr ""
83
84#: src/search.c:368 src/download.c:453
85msgid "Size"
86msgstr ""
87
88#: src/search.c:375
89msgid "Mime-type"
90msgstr ""
91
92#: src/search.c:382
93msgid "Meta-data"
94msgstr ""
95
96#: src/search.c:389
97msgid "Preview"
98msgstr ""
99
100#: src/search.c:450 src/search.c:570
101msgid "globally"
102msgstr ""
103
104#: src/search.c:695
105msgid "Query"
106msgstr ""
107
108#: src/search.c:702
109msgid "Results"
110msgstr ""
111
112#: src/daemon.c:62
44msgid "gnunetd is NOT running.\n" 113msgid "gnunetd is NOT running.\n"
45msgstr "" 114msgstr ""
46 115
47#: src/daemon.c:127 116#: src/daemon.c:128
48#, c-format 117#, c-format
49msgid "Attempted path to '%s' was '%s'.\n" 118msgid "Attempted path to '%s' was '%s'.\n"
50msgstr "" 119msgstr ""
51 120
52#: src/daemon.c:145 121#: src/daemon.c:146
53#, c-format 122#, c-format
54msgid "Starting gnunetd failed, error code: %d" 123msgid "Starting gnunetd failed, error code: %d"
55msgstr "" 124msgstr ""
56 125
57#: src/daemon.c:151 126#: src/daemon.c:152
58msgid "Starting gnunetd failed (core dumped)." 127msgid "Starting gnunetd failed (core dumped)."
59msgstr "" 128msgstr ""
60 129
61#: src/daemon.c:157 130#: src/daemon.c:158
62msgid "Starting gnunetd failed (aborted by signal)." 131msgid "Starting gnunetd failed (aborted by signal)."
63msgstr "" 132msgstr ""
64 133
65#: src/daemon.c:200 134#: src/daemon.c:206
66msgid "Launching gnunetd..." 135msgid "Launching gnunetd..."
67msgstr "" 136msgstr ""
68 137
69#: src/daemon.c:227 138#: src/daemon.c:239
70msgid "Error sending shutdown request to gnunetd." 139msgid "Error sending shutdown request to gnunetd."
71msgstr "" 140msgstr ""
72 141
73#: src/daemon.c:234 142#: src/daemon.c:246
74msgid "Error reading shutdown confirmation from gnunetd." 143msgid "Error reading shutdown confirmation from gnunetd."
75msgstr "" 144msgstr ""
76 145
77#: src/daemon.c:245 146#: src/daemon.c:257
78msgid "Terminating gnunetd..." 147msgid "Terminating gnunetd..."
79msgstr "" 148msgstr ""
80 149
81#: src/daemon.c:247 150#: src/daemon.c:259
82#, c-format 151#, c-format
83msgid "gnunetd refused to shut down (error code '%d')." 152msgid "gnunetd refused to shut down (error code '%d')."
84msgstr "" 153msgstr ""
85 154
86#: src/search.c:137 src/search.c:302 155#: src/download.c:209
87msgid "globally" 156msgid "unnamed"
88msgstr "" 157msgstr ""
89 158
90#: src/search.c:202 159#: src/download.c:221
91msgid "Name" 160#, c-format
161msgid ""
162"You must specify a directory in the configuration in section '%s' under '%s'."
92msgstr "" 163msgstr ""
93 164
94#: src/search.c:209 165#: src/download.c:236
95msgid "Size" 166#, c-format
167msgid ""
168"File '%s' exists in '%s',\n"
169"will store download under its GNUnet URI '%s' instead.\n"
96msgstr "" 170msgstr ""
97 171
98#: src/search.c:216 172#: src/download.c:460 src/upload.c:742
99msgid "Mime-type" 173msgid "URI"
100msgstr "" 174msgstr ""
101 175
102#: src/search.c:223 176#: src/upload.c:422
103msgid "Meta-data" 177msgid "Category"
104msgstr "" 178msgstr ""
105 179
106#: src/search.c:230 180#: src/upload.c:429
107msgid "Preview" 181msgid "Value"
182msgstr ""
183
184#: src/upload.c:445
185msgid "Keyword"
186msgstr ""
187
188#: src/upload.c:734
189msgid "Filename"
108msgstr "" 190msgstr ""
diff --git a/src/download.c b/src/download.c
index dca61157..0154e9ac 100644
--- a/src/download.c
+++ b/src/download.c
@@ -36,12 +36,137 @@ typedef struct DL {
36 struct ECRS_URI * uri; 36 struct ECRS_URI * uri;
37 char * filename; 37 char * filename;
38 GtkTreeRowReference * rr; 38 GtkTreeRowReference * rr;
39 GtkTreeModel * model;
39} DownloadList; 40} DownloadList;
40 41
41static DownloadList * head; 42static DownloadList * head;
42 43
43static GtkTreeStore * summary; 44static GtkTreeStore * summary;
44 45
46static int addFilesToDirectory
47 (const ECRS_FileInfo * fi,
48 const HashCode512 * key,
49 void * closure) {
50 struct ECRS_URI * uri = closure;
51 DownloadList * pos;
52
53 pos = head;
54 while (pos != NULL) {
55 if (ECRS_equalsUri(uri,
56 pos->uri))
57 break;
58 pos = pos->next;
59 }
60 if (pos == NULL) {
61 BREAK(); /* odd */
62 } else {
63 GtkTreeIter iter;
64 GtkTreeIter child;
65 int i;
66 unsigned long long size;
67 char * name;
68 char * mime;
69 char * desc;
70 unsigned char * thumb;
71 size_t ts;
72 GdkPixbuf * pixbuf;
73 GdkPixbufLoader * loader;
74 GtkTreePath * path;
75
76 if (! gtk_tree_row_reference_valid(pos->rr))
77 return SYSERR;
78 path = gtk_tree_row_reference_get_path(pos->rr);
79 gtk_tree_model_get_iter(GTK_TREE_MODEL(pos->model),
80 &iter,
81 path);
82 for (i=gtk_tree_model_iter_n_children(pos->model,
83 &iter)-1;i>=0;i--) {
84 if (TRUE == gtk_tree_model_iter_nth_child(pos->model,
85 &child,
86 &iter,
87 i)) {
88 struct ECRS_URI * uri;
89 uri = NULL;
90 gtk_tree_model_get(pos->model,
91 &iter,
92 5, &uri,
93 -1);
94 if ( (uri != NULL) &&
95 (ECRS_equalsUri(uri,
96 fi->uri)) )
97 return OK;
98 }
99 }
100 gtk_tree_store_append(GTK_TREE_STORE(pos->model),
101 &child,
102 &iter);
103
104 /* FIXME: this code is identical to some
105 code in search.c -- refactor into one
106 function (on model, iter and fi) */
107 mime = ECRS_getFromMetaData(fi->meta,
108 EXTRACTOR_MIMETYPE);
109 if (mime == NULL)
110 mime = STRDUP(_("unknown"));
111 desc = ECRS_getFirstFromMetaData(fi->meta,
112 EXTRACTOR_DESCRIPTION,
113 EXTRACTOR_GENRE,
114 EXTRACTOR_ALBUM,
115 EXTRACTOR_COMMENT,
116 EXTRACTOR_SUBJECT,
117 EXTRACTOR_FORMAT,
118 EXTRACTOR_SIZE,
119 EXTRACTOR_KEYWORDS,
120 -1);
121 if (desc == NULL)
122 desc = STRDUP(_(""));
123 name = ECRS_getFirstFromMetaData(fi->meta,
124 EXTRACTOR_FILENAME,
125 EXTRACTOR_TITLE,
126 EXTRACTOR_ARTIST,
127 EXTRACTOR_AUTHOR,
128 EXTRACTOR_PUBLISHER,
129 EXTRACTOR_CREATOR,
130 EXTRACTOR_PRODUCER,
131 EXTRACTOR_UNKNOWN,
132 -1);
133 if (name == NULL)
134 name = STRDUP(_("no name given"));
135 size = ECRS_fileSize(fi->uri);
136 thumb = NULL;
137 ts = ECRS_getThumbnailFromMetaData(fi->meta,
138 &thumb);
139 if (ts != 0) {
140 loader = gdk_pixbuf_loader_new();
141 gdk_pixbuf_loader_write(loader,
142 (const guchar*) thumb,
143 ts,
144 NULL);
145 pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
146 gdk_pixbuf_loader_close(loader,
147 NULL);
148 } else {
149 pixbuf = NULL;
150 }
151 gtk_tree_store_set(GTK_TREE_STORE(pos->model),
152 &child,
153 0, name,
154 1, size,
155 2, mime,
156 3, desc,
157 4, pixbuf,
158 5, ECRS_dupUri(fi->uri),
159 6, ECRS_dupMetaData(fi->meta),
160 7, NULL, /* internal */
161 -1);
162 FREE(mime);
163 FREE(desc);
164 FREE(name);
165 FREENONNULL(thumb);
166 }
167 return OK;
168}
169
45static void initiateDownload(GtkTreeModel *model, 170static void initiateDownload(GtkTreeModel *model,
46 GtkTreePath * path, 171 GtkTreePath * path,
47 GtkTreeIter * iter, 172 GtkTreeIter * iter,
@@ -85,8 +210,11 @@ static void initiateDownload(GtkTreeModel *model,
85 list = MALLOC(sizeof(DownloadList)); 210 list = MALLOC(sizeof(DownloadList));
86 list->next = head; 211 list->next = head;
87 list->rr = NULL; 212 list->rr = NULL;
88 if (ECRS_isDirectory(meta)) 213 list->model = NULL;
214 if (ECRS_isDirectory(meta)) {
89 list->rr = gtk_tree_row_reference_new(model, path); 215 list->rr = gtk_tree_row_reference_new(model, path);
216 list->model = model;
217 }
90 list->uri = ECRS_dupUri(uri); 218 list->uri = ECRS_dupUri(uri);
91 fn = getFileName("FS", 219 fn = getFileName("FS",
92 "DOWNLOADDIR", 220 "DOWNLOADDIR",
@@ -160,35 +288,46 @@ void on_downloadButton_clicked(GtkWidget * treeview,
160/** 288/**
161 */ 289 */
162void displayDownloadUpdate(const struct ECRS_URI * uri, 290void displayDownloadUpdate(const struct ECRS_URI * uri,
163 unsigned long long completed) { 291 unsigned long long completed,
292 const char * data,
293 unsigned int size) {
164 GtkTreeIter iter; 294 GtkTreeIter iter;
165 unsigned int val; 295 unsigned int val;
166 unsigned long long total; 296 unsigned long long total;
167 struct ECRS_URI * u; 297 struct ECRS_URI * u;
298 struct ECRS_MetaData * meta;
299
168 300
169 if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary), 301 if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
170 &iter)) 302 &iter)) {
171 return; 303 do {
172 do { 304 gtk_tree_model_get(GTK_TREE_MODEL(summary),
173
174 gtk_tree_model_get(GTK_TREE_MODEL(summary),
175 &iter,
176 1, &total,
177 4, &u,
178 -1);
179 if (ECRS_equalsUri(u, uri)) {
180 if (total != 0)
181 val = completed * 100 / total;
182 else
183 val = 100;
184 gtk_tree_store_set(GTK_TREE_STORE(summary),
185 &iter, 305 &iter,
186 2, val, 306 1, &total,
187 -1); 307 4, &u,
188 break; 308 -1);
189 } 309 if (ECRS_equalsUri(u, uri)) {
190 } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary), 310 if (total != 0)
191 &iter)); 311 val = completed * 100 / total;
312 else
313 val = 100;
314 gtk_tree_store_set(GTK_TREE_STORE(summary),
315 &iter,
316 2, val,
317 -1);
318 break;
319 }
320 } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
321 &iter));
322 }
323 meta = NULL;
324 ECRS_listDirectory(data,
325 size,
326 &meta,
327 &addFilesToDirectory,
328 (void*)uri);
329 if (meta != NULL)
330 ECRS_freeMetaData(meta);
192} 331}
193 332
194/** 333/**
@@ -196,6 +335,19 @@ void displayDownloadUpdate(const struct ECRS_URI * uri,
196void displayDownloadComplete(const struct ECRS_URI * uri, 335void displayDownloadComplete(const struct ECRS_URI * uri,
197 const char * filename) { 336 const char * filename) {
198 char * ren; 337 char * ren;
338 unsigned long long size;
339 char * data;
340 int fd;
341 struct ECRS_MetaData * meta;
342 DownloadList * pos;
343
344 pos = head;
345 while (pos != NULL) {
346 if (ECRS_equalsUri(uri,
347 pos->uri))
348 break;
349 pos = pos->next;
350 }
199 351
200 ren = ECRS_suggestFilename(filename); 352 ren = ECRS_suggestFilename(filename);
201 if (ren == NULL) 353 if (ren == NULL)
@@ -207,9 +359,35 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
207 } 359 }
208 FREE(ren); 360 FREE(ren);
209 /* fixme: also update download model? */ 361 /* fixme: also update download model? */
362 /* update directory view (if applicable!) */
363 if ( (pos != NULL) &&
364 (pos->rr != NULL) ) {
365 size = getFileSize(filename);
366 fd = fileopen(filename, O_RDONLY);
367 data = MMAP(NULL,
368 size,
369 PROT_READ,
370 MAP_SHARED,
371 fd,
372 0);
373 meta = NULL;
374 if (data != NULL) {
375 ECRS_listDirectory(data,
376 size,
377 &meta,
378 &addFilesToDirectory,
379 (void*)uri);
380 MUNMAP(data, size);
381 }
382 CLOSE(fd);
383 if (meta != NULL)
384 ECRS_freeMetaData(meta);
385 }
386
210} 387}
211 388
212static int addDownloadView(void * cls, 389static int addDownloadView(void * cls,
390 const struct FSUI_DownloadList * pos,
213 const char * filename, 391 const char * filename,
214 const struct ECRS_URI * uri, 392 const struct ECRS_URI * uri,
215 unsigned long long filesize, 393 unsigned long long filesize,
@@ -284,6 +462,7 @@ void fs_download_start() {
284 "text", 3, 462 "text", 3,
285 NULL); 463 NULL);
286 FSUI_listDownloads(ctx, 464 FSUI_listDownloads(ctx,
465 NULL,
287 &addDownloadView, 466 &addDownloadView,
288 NULL); 467 NULL);
289} 468}
diff --git a/src/download.h b/src/download.h
index 8fe3afef..a5629cda 100644
--- a/src/download.h
+++ b/src/download.h
@@ -33,7 +33,9 @@
33/** 33/**
34 */ 34 */
35void displayDownloadUpdate(const struct ECRS_URI * uri, 35void displayDownloadUpdate(const struct ECRS_URI * uri,
36 unsigned long long completed); 36 unsigned long long completed,
37 const char * data,
38 unsigned int size);
37 39
38/** 40/**
39 */ 41 */
diff --git a/src/fs.c b/src/fs.c
index 7f177bdc..114efe0f 100644
--- a/src/fs.c
+++ b/src/fs.c
@@ -38,35 +38,40 @@ static gint saveEventProcessor(SaveCall * call) {
38 38
39 event = (const FSUI_Event *) call->args; 39 event = (const FSUI_Event *) call->args;
40 switch (event->type) { 40 switch (event->type) {
41 case search_result: 41 case FSUI_search_result:
42 displaySearchResult(&event->data.SearchResult.fi, 42 displaySearchResult(&event->data.SearchResult.fi,
43 event->data.SearchResult.searchURI, 43 event->data.SearchResult.searchURI,
44 NULL); 44 NULL);
45 break; 45 break;
46 case search_error: 46 case FSUI_search_error:
47 LOG(LOG_ERROR, 47 LOG(LOG_ERROR,
48 _("Error while searching: %s\n"), 48 _("Error while searching: %s\n"),
49 event->data.message); 49 event->data.message);
50 break; 50 break;
51 case download_progress: 51 case FSUI_download_aborted:
52 /* ignore for now */
53 break;
54 case FSUI_download_progress:
52 displayDownloadUpdate(event->data.DownloadProgress.uri, 55 displayDownloadUpdate(event->data.DownloadProgress.uri,
53 event->data.DownloadProgress.completed); 56 event->data.DownloadProgress.completed,
57 event->data.DownloadProgress.last_block,
58 event->data.DownloadProgress.last_size);
54 /* FIXME: 59 /* FIXME:
55 if directory, also update search view! */ 60 if directory, also update search view! */
56 break; 61 break;
57 case download_complete: 62 case FSUI_download_complete:
58 displayDownloadComplete(event->data.DownloadProgress.uri, 63 displayDownloadComplete(event->data.DownloadProgress.uri,
59 event->data.DownloadProgress.filename); 64 event->data.DownloadProgress.filename);
60 /* FIXME: 65 /* FIXME:
61 if directory, also update search view! */ 66 if directory, also update search view! */
62 break; 67 break;
63 case download_error: 68 case FSUI_download_error:
64 BREAK(); 69 BREAK();
65 LOG(LOG_ERROR, 70 LOG(LOG_ERROR,
66 _("Error while downloading: %s\n"), 71 _("Error while downloading: %s\n"),
67 event->data.message); 72 event->data.message);
68 break; 73 break;
69 case upload_progress: 74 case FSUI_upload_progress:
70 displayUploadUpdate(event->data.UploadProgress.main_filename, 75 displayUploadUpdate(event->data.UploadProgress.main_filename,
71 event->data.UploadProgress.filename, 76 event->data.UploadProgress.filename,
72 event->data.UploadProgress.completed, 77 event->data.UploadProgress.completed,
@@ -76,21 +81,21 @@ static gint saveEventProcessor(SaveCall * call) {
76 event->data.UploadProgress.main_completed, 81 event->data.UploadProgress.main_completed,
77 event->data.UploadProgress.main_total); 82 event->data.UploadProgress.main_total);
78 break; 83 break;
79 case upload_complete: 84 case FSUI_upload_complete:
80 displayUploadComplete(event->data.UploadComplete.main_filename, 85 displayUploadComplete(event->data.UploadComplete.main_filename,
81 event->data.UploadComplete.filename, 86 event->data.UploadComplete.filename,
82 event->data.UploadComplete.uri); 87 event->data.UploadComplete.uri);
83 break; 88 break;
84 case upload_error: 89 case FSUI_upload_error:
85 LOG(LOG_ERROR, 90 LOG(LOG_ERROR,
86 _("Error while uploading: %s\n"), 91 _("Error while uploading: %s\n"),
87 event->data.message); 92 event->data.message);
88 break; 93 break;
89 case gnunetd_connected: 94 case FSUI_gnunetd_connected:
90 LOG(LOG_MESSAGE, 95 LOG(LOG_MESSAGE,
91 _("Connected to gnunetd.\n")); 96 _("Connected to gnunetd.\n"));
92 break; 97 break;
93 case gnunetd_disconnected: 98 case FSUI_gnunetd_disconnected:
94 LOG(LOG_MESSAGE, 99 LOG(LOG_MESSAGE,
95 _("Disconnected from gnunetd.\n")); 100 _("Disconnected from gnunetd.\n"));
96 break; 101 break;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 22:35:20 +0000