aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-08-11 21:22:35 +0000
committerChristian Grothoff <christian@grothoff.org>2013-08-11 21:22:35 +0000
commit5738861616006f58a14deb3e45c0d0b15e2a705a (patch)
tree2086e38a5f57b1600bd1b67b33708c3311c598d3
parent568a8d319b5291177a35b72bf5dc2ad5fd090ea8 (diff)
downloadgnunet-gtk-5738861616006f58a14deb3e45c0d0b15e2a705a.tar.gz
gnunet-gtk-5738861616006f58a14deb3e45c0d0b15e2a705a.zip
changing time measurement from milliseconds to microseconds
Diffstat
-rw-r--r--contrib/Makefile.in810
-rw-r--r--contrib/gnunet_identity_gtk_about_window.glade2
-rw-r--r--src/fs/gnunet-fs-gtk_common.c2
-rw-r--r--src/fs/gnunet-fs-gtk_event-handler.c2
-rw-r--r--src/fs/gnunet-fs-gtk_publish-dialog.c8
-rw-r--r--src/lib/eventloop.c8
-rw-r--r--src/setup/gnunet-setup-gns-edit.c18
-rw-r--r--src/setup/gnunet-setup-gns.c8
-rw-r--r--src/statistics/gnunet-statistics-gtk.c2
9 files changed, 25 insertions, 835 deletions
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
deleted file mode 100644
index f141ba82..00000000
--- a/contrib/Makefile.in
+++ /dev/null
@@ -1,810 +0,0 @@
1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@
3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6# Foundation, Inc.
7# This Makefile.in is free software; the Free Software Foundation
8# gives unlimited permission to copy and/or distribute it,
9# with or without modifications, as long as this notice is preserved.
10
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
13# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
14# PARTICULAR PURPOSE.
15
16@SET_MAKE@
17
18# Process this file with automake to produce Makefile.in
19
20VPATH = @srcdir@
21am__make_dryrun = \
22 { \
23 am__dry=no; \
24 case $$MAKEFLAGS in \
25 *\\[\ \ ]*) \
26 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
27 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
28 *) \
29 for am__flg in $$MAKEFLAGS; do \
30 case $$am__flg in \
31 *=*|--*) ;; \
32 *n*) am__dry=yes; break;; \
33 esac; \
34 done;; \
35 esac; \
36 test $$am__dry = yes; \
37 }
38pkgdatadir = $(datadir)/@PACKAGE@
39pkgincludedir = $(includedir)/@PACKAGE@
40pkglibdir = $(libdir)/@PACKAGE@
41pkglibexecdir = $(libexecdir)/@PACKAGE@
42am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
43install_sh_DATA = $(install_sh) -c -m 644
44install_sh_PROGRAM = $(install_sh) -c
45install_sh_SCRIPT = $(install_sh) -c
46INSTALL_HEADER = $(INSTALL_DATA)
47transform = $(program_transform_name)
48NORMAL_INSTALL = :
49PRE_INSTALL = :
50POST_INSTALL = :
51NORMAL_UNINSTALL = :
52PRE_UNINSTALL = :
53POST_UNINSTALL = :
54build_triplet = @build@
55host_triplet = @host@
56subdir = contrib
57DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
58 $(srcdir)/gnunet_fs_gtk_about_window.glade.in \
59 $(srcdir)/gnunet_identity_gtk_about_window.glade.in \
60 $(srcdir)/gnunet_peerinfo_gtk_about_window.glade.in \
61 $(srcdir)/gnunet_setup_about_window.glade.in \
62 $(srcdir)/gnunet_statistics_gtk_about_window.glade.in
63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
65 $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-2.0.m4 \
66 $(top_srcdir)/m4/gtk-3.0.m4 $(top_srcdir)/m4/iconv.m4 \
67 $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
68 $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
70 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
71 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
72 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
73 $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
74am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
75 $(ACLOCAL_M4)
76mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
77CONFIG_HEADER = $(top_builddir)/gnunet_gtk_config.h
78CONFIG_CLEAN_FILES = gnunet_fs_gtk_about_window.glade \
79 gnunet_identity_gtk_about_window.glade \
80 gnunet_peerinfo_gtk_about_window.glade \
81 gnunet_statistics_gtk_about_window.glade \
82 gnunet_setup_about_window.glade
83CONFIG_CLEAN_VPATH_FILES =
84AM_V_GEN = $(am__v_GEN_@AM_V@)
85am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
86am__v_GEN_0 = @echo " GEN " $@;
87AM_V_at = $(am__v_at_@AM_V@)
88am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
89am__v_at_0 = @
90SOURCES =
91DIST_SOURCES =
92RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
93 html-recursive info-recursive install-data-recursive \
94 install-dvi-recursive install-exec-recursive \
95 install-html-recursive install-info-recursive \
96 install-pdf-recursive install-ps-recursive install-recursive \
97 installcheck-recursive installdirs-recursive pdf-recursive \
98 ps-recursive uninstall-recursive
99am__can_run_installinfo = \
100 case $$AM_UPDATE_INFO_DIR in \
101 n|no|NO) false;; \
102 *) (install-info --version) >/dev/null 2>&1;; \
103 esac
104am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
105am__vpath_adj = case $$p in \
106 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
107 *) f=$$p;; \
108 esac;
109am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
110am__install_max = 40
111am__nobase_strip_setup = \
112 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
113am__nobase_strip = \
114 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
115am__nobase_list = $(am__nobase_strip_setup); \
116 for p in $$list; do echo "$$p $$p"; done | \
117 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
118 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
119 if (++n[$$2] == $(am__install_max)) \
120 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
121 END { for (dir in files) print dir, files[dir] }'
122am__base_list = \
123 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
124 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
125am__uninstall_files_from_dir = { \
126 test -z "$$files" \
127 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
128 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
129 $(am__cd) "$$dir" && rm -f $$files; }; \
130 }
131am__installdirs = "$(DESTDIR)$(pkgdatadir)"
132DATA = $(pkgdata_DATA)
133RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
134 distclean-recursive maintainer-clean-recursive
135AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
136 $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
137 distdir
138ETAGS = etags
139CTAGS = ctags
140DIST_SUBDIRS = $(SUBDIRS)
141DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
142am__relativize = \
143 dir0=`pwd`; \
144 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
145 sed_rest='s,^[^/]*/*,,'; \
146 sed_last='s,^.*/\([^/]*\)$$,\1,'; \
147 sed_butlast='s,/*[^/]*$$,,'; \
148 while test -n "$$dir1"; do \
149 first=`echo "$$dir1" | sed -e "$$sed_first"`; \
150 if test "$$first" != "."; then \
151 if test "$$first" = ".."; then \
152 dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
153 dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
154 else \
155 first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
156 if test "$$first2" = "$$first"; then \
157 dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
158 else \
159 dir2="../$$dir2"; \
160 fi; \
161 dir0="$$dir0"/"$$first"; \
162 fi; \
163 fi; \
164 dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
165 done; \
166 reldir="$$dir2"
167ACLOCAL = @ACLOCAL@
168AMTAR = @AMTAR@
169AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
170AR = @AR@
171AS = @AS@
172AUTOCONF = @AUTOCONF@
173AUTOHEADER = @AUTOHEADER@
174AUTOMAKE = @AUTOMAKE@
175AWK = @AWK@
176CC = @CC@
177CCDEPMODE = @CCDEPMODE@
178CFLAGS = @CFLAGS@
179CPP = @CPP@
180CPPFLAGS = @CPPFLAGS@
181CYGPATH_W = @CYGPATH_W@
182DEFS = @DEFS@
183DEPDIR = @DEPDIR@
184DLLTOOL = @DLLTOOL@
185DSYMUTIL = @DSYMUTIL@
186DUMPBIN = @DUMPBIN@
187ECHO_C = @ECHO_C@
188ECHO_N = @ECHO_N@
189ECHO_T = @ECHO_T@
190EGREP = @EGREP@
191ENABLE_ON_UNIX = @ENABLE_ON_UNIX@
192ENABLE_ON_W32 = @ENABLE_ON_W32@
193EXEEXT = @EXEEXT@
194FGREP = @FGREP@
195GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
196GLADE_CFLAGS = @GLADE_CFLAGS@
197GLADE_LIBS = @GLADE_LIBS@
198GMSGFMT = @GMSGFMT@
199GMSGFMT_015 = @GMSGFMT_015@
200GNUNET_CFLAGS = @GNUNET_CFLAGS@
201GNUNET_FS_APP = @GNUNET_FS_APP@
202GNUNET_FS_GTK_NAME = @GNUNET_FS_GTK_NAME@
203GNUNET_FS_GTK_VERSION3 = @GNUNET_FS_GTK_VERSION3@
204GNUNET_FS_GTK_YEARFROM = @GNUNET_FS_GTK_YEARFROM@
205GNUNET_FS_GTK_YEARTO = @GNUNET_FS_GTK_YEARTO@
206GNUNET_GNS_GTK_NAME = @GNUNET_GNS_GTK_NAME@
207GNUNET_LIBS = @GNUNET_LIBS@
208GNUNET_PEERINFO_APP = @GNUNET_PEERINFO_APP@
209GNUNET_PEERINFO_GTK_NAME = @GNUNET_PEERINFO_GTK_NAME@
210GNUNET_PEERINFO_GTK_VERSION3 = @GNUNET_PEERINFO_GTK_VERSION3@
211GNUNET_PEERINFO_GTK_YEARFROM = @GNUNET_PEERINFO_GTK_YEARFROM@
212GNUNET_PEERINFO_GTK_YEARTO = @GNUNET_PEERINFO_GTK_YEARTO@
213GNUNET_SETUP_APP = @GNUNET_SETUP_APP@
214GNUNET_SETUP_GTK_NAME = @GNUNET_SETUP_GTK_NAME@
215GNUNET_SETUP_GTK_VERSION3 = @GNUNET_SETUP_GTK_VERSION3@
216GNUNET_SETUP_GTK_YEARFROM = @GNUNET_SETUP_GTK_YEARFROM@
217GNUNET_SETUP_GTK_YEARTO = @GNUNET_SETUP_GTK_YEARTO@
218GNUNET_STATISTICS_GTK_NAME = @GNUNET_STATISTICS_GTK_NAME@
219GNUNET_STATISTICS_GTK_VERSION3 = @GNUNET_STATISTICS_GTK_VERSION3@
220GNUNET_STATISTICS_GTK_YEARFROM = @GNUNET_STATISTICS_GTK_YEARFROM@
221GNUNET_STATISTICS_GTK_YEARTO = @GNUNET_STATISTICS_GTK_YEARTO@
222GN_LIB_LDFLAGS = @GN_LIB_LDFLAGS@
223GREP = @GREP@
224GTK_CFLAGS = @GTK_CFLAGS@
225GTK_LIBS = @GTK_LIBS@
226INSTALL = @INSTALL@
227INSTALL_DATA = @INSTALL_DATA@
228INSTALL_PROGRAM = @INSTALL_PROGRAM@
229INSTALL_SCRIPT = @INSTALL_SCRIPT@
230INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
231INTLLIBS = @INTLLIBS@
232INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
233LD = @LD@
234LDFLAGS = @LDFLAGS@
235LIBICONV = @LIBICONV@
236LIBINTL = @LIBINTL@
237LIBOBJS = @LIBOBJS@
238LIBS = @LIBS@
239LIBTOOL = @LIBTOOL@
240LIPO = @LIPO@
241LN_S = @LN_S@
242LTLIBICONV = @LTLIBICONV@
243LTLIBINTL = @LTLIBINTL@
244LTLIBOBJS = @LTLIBOBJS@
245MAKEINFO = @MAKEINFO@
246MANIFEST_TOOL = @MANIFEST_TOOL@
247MKDIR_P = @MKDIR_P@
248MSGFMT = @MSGFMT@
249MSGFMT_015 = @MSGFMT_015@
250MSGMERGE = @MSGMERGE@
251NM = @NM@
252NMEDIT = @NMEDIT@
253OBJDUMP = @OBJDUMP@
254OBJEXT = @OBJEXT@
255OTOOL = @OTOOL@
256OTOOL64 = @OTOOL64@
257PACKAGE = @PACKAGE@
258PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
259PACKAGE_DATA = @PACKAGE_DATA@
260PACKAGE_NAME = @PACKAGE_NAME@
261PACKAGE_STRING = @PACKAGE_STRING@
262PACKAGE_TARNAME = @PACKAGE_TARNAME@
263PACKAGE_URL = @PACKAGE_URL@
264PACKAGE_VERSION = @PACKAGE_VERSION@
265PATH_SEPARATOR = @PATH_SEPARATOR@
266PKG_CONFIG = @PKG_CONFIG@
267POSUB = @POSUB@
268QR_CFLAGS = @QR_CFLAGS@
269QR_LIBS = @QR_LIBS@
270RANLIB = @RANLIB@
271SED = @SED@
272SET_MAKE = @SET_MAKE@
273SHELL = @SHELL@
274STRIP = @STRIP@
275USE_NLS = @USE_NLS@
276VERSION = @VERSION@
277XGETTEXT = @XGETTEXT@
278XGETTEXT_015 = @XGETTEXT_015@
279XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
280abs_builddir = @abs_builddir@
281abs_srcdir = @abs_srcdir@
282abs_top_builddir = @abs_top_builddir@
283abs_top_srcdir = @abs_top_srcdir@
284ac_ct_AR = @ac_ct_AR@
285ac_ct_CC = @ac_ct_CC@
286ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
287am__include = @am__include@
288am__leading_dot = @am__leading_dot@
289am__quote = @am__quote@
290am__tar = @am__tar@
291am__untar = @am__untar@
292bindir = @bindir@
293build = @build@
294build_alias = @build_alias@
295build_cpu = @build_cpu@
296build_os = @build_os@
297build_vendor = @build_vendor@
298builddir = @builddir@
299datadir = @datadir@
300datarootdir = @datarootdir@
301docdir = @docdir@
302dvidir = @dvidir@
303exec_prefix = @exec_prefix@
304host = @host@
305host_alias = @host_alias@
306host_cpu = @host_cpu@
307host_os = @host_os@
308host_vendor = @host_vendor@
309htmldir = @htmldir@
310includedir = @includedir@
311infodir = @infodir@
312install_sh = @install_sh@
313libdir = @libdir@
314libexecdir = @libexecdir@
315localedir = @localedir@
316localstatedir = @localstatedir@
317mandir = @mandir@
318mkdir_p = @mkdir_p@
319oldincludedir = @oldincludedir@
320pdfdir = @pdfdir@
321prefix = @prefix@
322program_transform_name = @program_transform_name@
323psdir = @psdir@
324sbindir = @sbindir@
325sharedstatedir = @sharedstatedir@
326srcdir = @srcdir@
327sysconfdir = @sysconfdir@
328target_alias = @target_alias@
329top_build_prefix = @top_build_prefix@
330top_builddir = @top_builddir@
331top_srcdir = @top_srcdir@
332unique_CFLAGS = @unique_CFLAGS@
333unique_LIBS = @unique_LIBS@
334SUBDIRS = .
335pkgpixdir = $(pkgdatadir)
336IMAGES = \
337 gnunet-setup-oxygen-cancel.png \
338 gnunet-setup-oxygen-ok.png
339
340EXTRA_DIST = \
341 gnunet-fs-gtk.protocol \
342 gnunet-fs-gtk-gnome.sh \
343 $(pkgdata_DATA) \
344 $(IMAGES)
345
346pkgdata_DATA = \
347 $(IMAGES) \
348 qr_dummy.png \
349 downloading.gif \
350 downloading_not_receiving.gif \
351 downloaded.gif \
352 error.gif \
353 found_source.gif \
354 published.gif \
355 publishing.gif \
356 red.png \
357 green.png \
358 searching_sources.gif \
359 gnunet_fs_gtk_about_window.glade \
360 gnunet_fs_gtk_download_as_dialog.glade \
361 gnunet_fs_gtk_main_window.glade \
362 gnunet_fs_gtk_edit_publication.glade \
363 gnunet_fs_gtk_open_directory_dialog.glade \
364 gnunet_fs_gtk_open_url_dialog.glade \
365 gnunet_fs_gtk_publish_dialog.glade \
366 gnunet_fs_gtk_publish_directory_dialog.glade \
367 gnunet_fs_gtk_publish_file_dialog.glade \
368 gnunet_fs_gtk_publish_tab.glade \
369 gnunet_fs_gtk_search_tab.glade \
370 gnunet_fs_gtk_unindex.glade \
371 gnunet_fs_gtk_progress_dialog.glade \
372 gnunet_gtk_status_bar_menu.glade \
373 gnunet_identity_gtk_about_window.glade \
374 gnunet_identity_gtk_advertise_dialog.glade \
375 gnunet_identity_gtk_main_window.glade \
376 gnunet_peerinfo_gtk_about_window.glade \
377 gnunet_peerinfo_gtk_main_window.glade \
378 gnunet_statistics_gtk_about_window.glade \
379 gnunet_statistics_gtk_main_window.glade \
380 gnunet_setup_calendar_dialog.glade \
381 gnunet_setup_qr_save_as_dialog.glade \
382 gnunet_setup_gtk_main_window.glade \
383 gnunet_setup_gns_edit_a.glade \
384 gnunet_setup_gns_edit_ns.glade \
385 gnunet_setup_gns_edit_cname.glade \
386 gnunet_setup_gns_edit_soa.glade \
387 gnunet_setup_gns_edit_ptr.glade \
388 gnunet_setup_gns_edit_mx.glade \
389 gnunet_setup_gns_edit_txt.glade \
390 gnunet_setup_gns_edit_aaaa.glade \
391 gnunet_setup_gns_edit_pkey.glade \
392 gnunet_setup_gns_edit_leho.glade \
393 gnunet_setup_gns_edit_srv.glade \
394 gnunet_setup_gns_edit_vpn.glade
395
396all: all-recursive
397
398.SUFFIXES:
399$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
400 @for dep in $?; do \
401 case '$(am__configure_deps)' in \
402 *$$dep*) \
403 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
404 && { if test -f $@; then exit 0; else break; fi; }; \
405 exit 1;; \
406 esac; \
407 done; \
408 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
409 $(am__cd) $(top_srcdir) && \
410 $(AUTOMAKE) --gnu contrib/Makefile
411.PRECIOUS: Makefile
412Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
413 @case '$?' in \
414 *config.status*) \
415 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
416 *) \
417 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
418 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
419 esac;
420
421$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
422 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
423
424$(top_srcdir)/configure: $(am__configure_deps)
425 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
426$(ACLOCAL_M4): $(am__aclocal_m4_deps)
427 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
428$(am__aclocal_m4_deps):
429gnunet_fs_gtk_about_window.glade: $(top_builddir)/config.status $(srcdir)/gnunet_fs_gtk_about_window.glade.in
430 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
431gnunet_identity_gtk_about_window.glade: $(top_builddir)/config.status $(srcdir)/gnunet_identity_gtk_about_window.glade.in
432 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
433gnunet_peerinfo_gtk_about_window.glade: $(top_builddir)/config.status $(srcdir)/gnunet_peerinfo_gtk_about_window.glade.in
434 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
435gnunet_statistics_gtk_about_window.glade: $(top_builddir)/config.status $(srcdir)/gnunet_statistics_gtk_about_window.glade.in
436 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
437gnunet_setup_about_window.glade: $(top_builddir)/config.status $(srcdir)/gnunet_setup_about_window.glade.in
438 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
439
440mostlyclean-libtool:
441 -rm -f *.lo
442
443clean-libtool:
444 -rm -rf .libs _libs
445install-pkgdataDATA: $(pkgdata_DATA)
446 @$(NORMAL_INSTALL)
447 @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
448 if test -n "$$list"; then \
449 echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
450 $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
451 fi; \
452 for p in $$list; do \
453 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
454 echo "$$d$$p"; \
455 done | $(am__base_list) | \
456 while read files; do \
457 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
458 $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
459 done
460
461uninstall-pkgdataDATA:
462 @$(NORMAL_UNINSTALL)
463 @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
464 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
465 dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
466
467# This directory's subdirectories are mostly independent; you can cd
468# into them and run `make' without going through this Makefile.
469# To change the values of `make' variables: instead of editing Makefiles,
470# (1) if the variable is set in `config.status', edit `config.status'
471# (which will cause the Makefiles to be regenerated when you run `make');
472# (2) otherwise, pass the desired values on the `make' command line.
473$(RECURSIVE_TARGETS):
474 @fail= failcom='exit 1'; \
475 for f in x $$MAKEFLAGS; do \
476 case $$f in \
477 *=* | --[!k]*);; \
478 *k*) failcom='fail=yes';; \
479 esac; \
480 done; \
481 dot_seen=no; \
482 target=`echo $@ | sed s/-recursive//`; \
483 list='$(SUBDIRS)'; for subdir in $$list; do \
484 echo "Making $$target in $$subdir"; \
485 if test "$$subdir" = "."; then \
486 dot_seen=yes; \
487 local_target="$$target-am"; \
488 else \
489 local_target="$$target"; \
490 fi; \
491 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
492 || eval $$failcom; \
493 done; \
494 if test "$$dot_seen" = "no"; then \
495 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
496 fi; test -z "$$fail"
497
498$(RECURSIVE_CLEAN_TARGETS):
499 @fail= failcom='exit 1'; \
500 for f in x $$MAKEFLAGS; do \
501 case $$f in \
502 *=* | --[!k]*);; \
503 *k*) failcom='fail=yes';; \
504 esac; \
505 done; \
506 dot_seen=no; \
507 case "$@" in \
508 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
509 *) list='$(SUBDIRS)' ;; \
510 esac; \
511 rev=''; for subdir in $$list; do \
512 if test "$$subdir" = "."; then :; else \
513 rev="$$subdir $$rev"; \
514 fi; \
515 done; \
516 rev="$$rev ."; \
517 target=`echo $@ | sed s/-recursive//`; \
518 for subdir in $$rev; do \
519 echo "Making $$target in $$subdir"; \
520 if test "$$subdir" = "."; then \
521 local_target="$$target-am"; \
522 else \
523 local_target="$$target"; \
524 fi; \
525 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
526 || eval $$failcom; \
527 done && test -z "$$fail"
528tags-recursive:
529 list='$(SUBDIRS)'; for subdir in $$list; do \
530 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
531 done
532ctags-recursive:
533 list='$(SUBDIRS)'; for subdir in $$list; do \
534 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
535 done
536
537ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
538 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
539 unique=`for i in $$list; do \
540 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
541 done | \
542 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
543 END { if (nonempty) { for (i in files) print i; }; }'`; \
544 mkid -fID $$unique
545tags: TAGS
546
547TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
548 $(TAGS_FILES) $(LISP)
549 set x; \
550 here=`pwd`; \
551 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
552 include_option=--etags-include; \
553 empty_fix=.; \
554 else \
555 include_option=--include; \
556 empty_fix=; \
557 fi; \
558 list='$(SUBDIRS)'; for subdir in $$list; do \
559 if test "$$subdir" = .; then :; else \
560 test ! -f $$subdir/TAGS || \
561 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
562 fi; \
563 done; \
564 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
565 unique=`for i in $$list; do \
566 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
567 done | \
568 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
569 END { if (nonempty) { for (i in files) print i; }; }'`; \
570 shift; \
571 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
572 test -n "$$unique" || unique=$$empty_fix; \
573 if test $$# -gt 0; then \
574 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
575 "$$@" $$unique; \
576 else \
577 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
578 $$unique; \
579 fi; \
580 fi
581ctags: CTAGS
582CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
583 $(TAGS_FILES) $(LISP)
584 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
585 unique=`for i in $$list; do \
586 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
587 done | \
588 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
589 END { if (nonempty) { for (i in files) print i; }; }'`; \
590 test -z "$(CTAGS_ARGS)$$unique" \
591 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
592 $$unique
593
594GTAGS:
595 here=`$(am__cd) $(top_builddir) && pwd` \
596 && $(am__cd) $(top_srcdir) \
597 && gtags -i $(GTAGS_ARGS) "$$here"
598
599distclean-tags:
600 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
601
602distdir: $(DISTFILES)
603 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
604 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
605 list='$(DISTFILES)'; \
606 dist_files=`for file in $$list; do echo $$file; done | \
607 sed -e "s|^$$srcdirstrip/||;t" \
608 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
609 case $$dist_files in \
610 */*) $(MKDIR_P) `echo "$$dist_files" | \
611 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
612 sort -u` ;; \
613 esac; \
614 for file in $$dist_files; do \
615 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
616 if test -d $$d/$$file; then \
617 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
618 if test -d "$(distdir)/$$file"; then \
619 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
620 fi; \
621 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
622 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
623 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
624 fi; \
625 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
626 else \
627 test -f "$(distdir)/$$file" \
628 || cp -p $$d/$$file "$(distdir)/$$file" \
629 || exit 1; \
630 fi; \
631 done
632 @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
633 if test "$$subdir" = .; then :; else \
634 $(am__make_dryrun) \
635 || test -d "$(distdir)/$$subdir" \
636 || $(MKDIR_P) "$(distdir)/$$subdir" \
637 || exit 1; \
638 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
639 $(am__relativize); \
640 new_distdir=$$reldir; \
641 dir1=$$subdir; dir2="$(top_distdir)"; \
642 $(am__relativize); \
643 new_top_distdir=$$reldir; \
644 echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
645 echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
646 ($(am__cd) $$subdir && \
647 $(MAKE) $(AM_MAKEFLAGS) \
648 top_distdir="$$new_top_distdir" \
649 distdir="$$new_distdir" \
650 am__remove_distdir=: \
651 am__skip_length_check=: \
652 am__skip_mode_fix=: \
653 distdir) \
654 || exit 1; \
655 fi; \
656 done
657 $(MAKE) $(AM_MAKEFLAGS) \
658 top_distdir="$(top_distdir)" distdir="$(distdir)" \
659 dist-hook
660check-am: all-am
661check: check-recursive
662all-am: Makefile $(DATA)
663installdirs: installdirs-recursive
664installdirs-am:
665 for dir in "$(DESTDIR)$(pkgdatadir)"; do \
666 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
667 done
668install: install-recursive
669install-exec: install-exec-recursive
670install-data: install-data-recursive
671uninstall: uninstall-recursive
672
673install-am: all-am
674 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
675
676installcheck: installcheck-recursive
677install-strip:
678 if test -z '$(STRIP)'; then \
679 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
680 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
681 install; \
682 else \
683 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
684 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
685 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
686 fi
687mostlyclean-generic:
688
689clean-generic:
690
691distclean-generic:
692 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
693 -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
694
695maintainer-clean-generic:
696 @echo "This command is intended for maintainers to use"
697 @echo "it deletes files that may require special tools to rebuild."
698clean: clean-recursive
699
700clean-am: clean-generic clean-libtool mostlyclean-am
701
702distclean: distclean-recursive
703 -rm -f Makefile
704distclean-am: clean-am distclean-generic distclean-tags
705
706dvi: dvi-recursive
707
708dvi-am:
709
710html: html-recursive
711
712html-am:
713
714info: info-recursive
715
716info-am:
717
718install-data-am: install-data-local install-pkgdataDATA
719
720install-dvi: install-dvi-recursive
721
722install-dvi-am:
723
724install-exec-am:
725
726install-html: install-html-recursive
727
728install-html-am:
729
730install-info: install-info-recursive
731
732install-info-am:
733
734install-man:
735
736install-pdf: install-pdf-recursive
737
738install-pdf-am:
739
740install-ps: install-ps-recursive
741
742install-ps-am:
743
744installcheck-am:
745
746maintainer-clean: maintainer-clean-recursive
747 -rm -f Makefile
748maintainer-clean-am: distclean-am maintainer-clean-generic
749
750mostlyclean: mostlyclean-recursive
751
752mostlyclean-am: mostlyclean-generic mostlyclean-libtool
753
754pdf: pdf-recursive
755
756pdf-am:
757
758ps: ps-recursive
759
760ps-am:
761
762uninstall-am: uninstall-pkgdataDATA
763
764.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
765 install-am install-strip tags-recursive
766
767.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
768 all all-am check check-am clean clean-generic clean-libtool \
769 ctags ctags-recursive dist-hook distclean distclean-generic \
770 distclean-libtool distclean-tags distdir dvi dvi-am html \
771 html-am info info-am install install-am install-data \
772 install-data-am install-data-local install-dvi install-dvi-am \
773 install-exec install-exec-am install-html install-html-am \
774 install-info install-info-am install-man install-pdf \
775 install-pdf-am install-pkgdataDATA install-ps install-ps-am \
776 install-strip installcheck installcheck-am installdirs \
777 installdirs-am maintainer-clean maintainer-clean-generic \
778 mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
779 ps ps-am tags tags-recursive uninstall uninstall-am \
780 uninstall-pkgdataDATA
781
782
783install-data-local:
784 $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)
785 $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)/flags
786 @$(NORMAL_INSTALL)
787 for pixmap in $(IMAGES); do \
788 if test -f $$pixmap; then \
789 $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgpixdir); \
790 fi \
791 done
792 for flag in $(srcdir)/flags/*.png; do \
793 if test -f $$flag; then \
794 $(INSTALL_DATA) $$flag $(DESTDIR)$(pkgpixdir)/flags/ ; \
795 fi \
796 done
797
798dist-hook:
799 if test -d $(srcdir)/flags; then \
800 mkdir -p $(distdir)/flags; \
801 for flag in $(srcdir)/flags/*.png; do \
802 if test -f $$flag; then \
803 cp -p $$flag $(distdir)/flags; \
804 fi \
805 done \
806 fi
807
808# Tell versions [3.59,3.63) of GNU make to not export all variables.
809# Otherwise a system limit (for SysV at least) may be exceeded.
810.NOEXPORT:
diff --git a/contrib/gnunet_identity_gtk_about_window.glade b/contrib/gnunet_identity_gtk_about_window.glade
index 31a906fb..097e8709 100644
--- a/contrib/gnunet_identity_gtk_about_window.glade
+++ b/contrib/gnunet_identity_gtk_about_window.glade
@@ -91,7 +91,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;</property>
91 <object class="GtkLabel" id="about_name_version_label"> 91 <object class="GtkLabel" id="about_name_version_label">
92 <property name="visible">True</property> 92 <property name="visible">True</property>
93 <property name="can_focus">False</property> 93 <property name="can_focus">False</property>
94 <property name="label">GNUnet-Peerinfo-GTK r28462</property> 94 <property name="label">GNUnet-Peerinfo-GTK 0.9.3</property>
95 <attributes> 95 <attributes>
96 <attribute name="weight" value="bold"/> 96 <attribute name="weight" value="bold"/>
97 <attribute name="size" value="200"/> 97 <attribute name="size" value="200"/>
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index f4be95d3..b7d0c6d1 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -137,7 +137,7 @@ GNUNET_FS_GTK_get_expiration_time (GtkSpinButton * spin)
137 year = gtk_spin_button_get_value_as_int (spin); 137 year = gtk_spin_button_get_value_as_int (spin);
138 GNUNET_assert (year >= 0); 138 GNUNET_assert (year >= 0);
139 ret = GNUNET_FS_year_to_time ((unsigned int) year); 139 ret = GNUNET_FS_year_to_time ((unsigned int) year);
140 GNUNET_break (GNUNET_TIME_absolute_get ().abs_value < ret.abs_value); 140 GNUNET_break (GNUNET_TIME_absolute_get ().abs_value_us < ret.abs_value_us);
141 return ret; 141 return ret;
142} 142}
143 143
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 4b28903b..a441eeaf 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -2143,7 +2143,7 @@ update_search_result (struct SearchResult *sr,
2143 GNUNET_CONTAINER_meta_data_duplicate (meta), 2143 GNUNET_CONTAINER_meta_data_duplicate (meta),
2144 SEARCH_TAB_MC_PREVIEW, pixbuf, 2144 SEARCH_TAB_MC_PREVIEW, pixbuf,
2145 SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) percent_avail, 2145 SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) percent_avail,
2146 SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 == availability_certainty) ? (gint) (probe_time.rel_value / GNUNET_FS_PROBE_UPDATE_FREQUENCY.rel_value) : -1, 2146 SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 == availability_certainty) ? (gint) (probe_time.rel_value_us / GNUNET_FS_PROBE_UPDATE_FREQUENCY.rel_value_us) : -1,
2147 SEARCH_TAB_MC_FILENAME, desc, 2147 SEARCH_TAB_MC_FILENAME, desc,
2148 SEARCH_TAB_MC_MIMETYPE, mime, 2148 SEARCH_TAB_MC_MIMETYPE, mime,
2149 SEARCH_TAB_MC_APPLICABILITY_RANK, 2149 SEARCH_TAB_MC_APPLICABILITY_RANK,
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index ffca4a33..8335ba4a 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -609,7 +609,7 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx,
609 PUBLISH_MC_PRIORITY, (guint) bo->content_priority, 609 PUBLISH_MC_PRIORITY, (guint) bo->content_priority,
610 PUBLISH_MC_FILE_INFORMATION_STRUCT, fi, 610 PUBLISH_MC_FILE_INFORMATION_STRUCT, fi,
611 PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE, 611 PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
612 (guint64) bo->expiration_time.abs_value, 612 (guint64) bo->expiration_time.abs_value_us,
613 PUBLISH_MC_REPLICATION_LEVEL, 613 PUBLISH_MC_REPLICATION_LEVEL,
614 (guint) bo->replication_level, 614 (guint) bo->replication_level,
615 -1); 615 -1);
@@ -1399,7 +1399,7 @@ add_item (struct AddDirClientContext *adcc,
1399 (guint) adcc->directory_scan_bo.content_priority, 1399 (guint) adcc->directory_scan_bo.content_priority,
1400 PUBLISH_MC_FILE_INFORMATION_STRUCT, fi, 1400 PUBLISH_MC_FILE_INFORMATION_STRUCT, fi,
1401 PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE, 1401 PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
1402 (guint64) adcc->directory_scan_bo.expiration_time.abs_value, 1402 (guint64) adcc->directory_scan_bo.expiration_time.abs_value_us,
1403 PUBLISH_MC_REPLICATION_LEVEL, 1403 PUBLISH_MC_REPLICATION_LEVEL,
1404 (guint) adcc->directory_scan_bo.replication_level, -1); 1404 (guint) adcc->directory_scan_bo.replication_level, -1);
1405 GNUNET_free (file_size_fancy); 1405 GNUNET_free (file_size_fancy);
@@ -1483,7 +1483,7 @@ directory_scan_cb (void *cls,
1483 { 1483 {
1484 case GNUNET_FS_DIRSCANNER_FILE_START: 1484 case GNUNET_FS_DIRSCANNER_FILE_START:
1485 GNUNET_assert (NULL != filename); 1485 GNUNET_assert (NULL != filename);
1486 if (GNUNET_TIME_absolute_get_duration (last_pulse).rel_value > 100) 1486 if (GNUNET_TIME_absolute_get_duration (last_pulse).rel_value_us > 100000LL)
1487 { 1487 {
1488 gtk_progress_bar_pulse (adcc->progress_dialog_bar); 1488 gtk_progress_bar_pulse (adcc->progress_dialog_bar);
1489 last_pulse = GNUNET_TIME_absolute_get (); 1489 last_pulse = GNUNET_TIME_absolute_get ();
@@ -1904,7 +1904,7 @@ update_treeview_after_edit (void *cls, struct GNUNET_FS_FileInformation *fi,
1904 PUBLISH_MC_ANONYMITY_LEVEL, (guint) bo->anonymity_level, 1904 PUBLISH_MC_ANONYMITY_LEVEL, (guint) bo->anonymity_level,
1905 PUBLISH_MC_PRIORITY, (guint) bo->content_priority, 1905 PUBLISH_MC_PRIORITY, (guint) bo->content_priority,
1906 PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE, 1906 PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
1907 (guint64) bo->expiration_time.abs_value, 1907 (guint64) bo->expiration_time.abs_value_us,
1908 PUBLISH_MC_REPLICATION_LEVEL, 1908 PUBLISH_MC_REPLICATION_LEVEL,
1909 (guint) bo->replication_level, 1909 (guint) bo->replication_level,
1910 -1); 1910 -1);
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index de3c315a..1f23e801 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -590,14 +590,14 @@ gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds,
590 resize_cached_poll_array (ml, fd_counter + need_gfds); 590 resize_cached_poll_array (ml, fd_counter + need_gfds);
591 } 591 }
592 } 592 }
593 if (timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value) 593 if (timeout.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
594 { 594 {
595 if (delay >= 0) 595 if (delay >= 0)
596 delay = 596 delay =
597 GNUNET_MIN (timeout.rel_value / 597 GNUNET_MIN (timeout.rel_value_us /
598 GNUNET_TIME_UNIT_MILLISECONDS.rel_value, delay); 598 GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us, delay);
599 else 599 else
600 delay = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value; 600 delay = timeout.rel_value_us / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
601 } 601 }
602 602
603#if WINDOWS 603#if WINDOWS
diff --git a/src/setup/gnunet-setup-gns-edit.c b/src/setup/gnunet-setup-gns-edit.c
index be3ca42f..362b1ce0 100644
--- a/src/setup/gnunet-setup-gns-edit.c
+++ b/src/setup/gnunet-setup-gns-edit.c
@@ -199,7 +199,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
199 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 199 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
200 "edit_dialog_options_shadow_checkbutton")), 200 "edit_dialog_options_shadow_checkbutton")),
201 edc->n_is_shadow); 201 edc->n_is_shadow);
202 if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == edc->n_exp_time) 202 if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time)
203 { 203 {
204 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 204 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
205 "edit_dialog_expiration_never_radiobutton")), 205 "edit_dialog_expiration_never_radiobutton")),
@@ -212,7 +212,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
212 "edit_dialog_expiration_relative_combobox"))); 212 "edit_dialog_expiration_relative_combobox")));
213 } 213 }
214 if ( (edc->n_is_relative) && 214 if ( (edc->n_is_relative) &&
215 (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != edc->n_exp_time) ) 215 (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != edc->n_exp_time) )
216 { 216 {
217 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 217 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
218 "edit_dialog_expiration_relative_radiobutton")), 218 "edit_dialog_expiration_relative_radiobutton")),
@@ -221,7 +221,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
221 "edit_dialog_expiration_absolute_calendar"))); 221 "edit_dialog_expiration_absolute_calendar")));
222 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder, 222 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
223 "edit_dialog_expiration_absolute_hbox"))); 223 "edit_dialog_expiration_absolute_hbox")));
224 rt.rel_value = edc->n_exp_time; 224 rt.rel_value_us = edc->n_exp_time;
225 } 225 }
226 else 226 else
227 { 227 {
@@ -237,7 +237,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
237 -1); 237 -1);
238 gtk_combo_box_set_active_iter (cb, &iter); 238 gtk_combo_box_set_active_iter (cb, &iter);
239 if ( (! edc->n_is_relative) && 239 if ( (! edc->n_is_relative) &&
240 (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value != edc->n_exp_time) ) 240 (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != edc->n_exp_time) )
241 { 241 {
242 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 242 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
243 "edit_dialog_expiration_absolute_radiobutton")), 243 "edit_dialog_expiration_absolute_radiobutton")),
@@ -245,14 +245,14 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
245 245
246 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder, 246 gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
247 "edit_dialog_expiration_relative_combobox"))); 247 "edit_dialog_expiration_relative_combobox")));
248 at.abs_value = edc->n_exp_time; 248 at.abs_value_us = edc->n_exp_time;
249 } 249 }
250 else 250 else
251 { 251 {
252 /* select a sane default: right now */ 252 /* select a sane default: right now */
253 at = GNUNET_TIME_absolute_get (); 253 at = GNUNET_TIME_absolute_get ();
254 } 254 }
255 tp = (time_t) (at.abs_value / 1000LL); /* convert to seconds */ 255 tp = (time_t) (at.abs_value_us / 1000000LL); /* convert to seconds */
256 ymd = gmtime (&tp); 256 ymd = gmtime (&tp);
257 cal = GTK_CALENDAR (gtk_builder_get_object (edc->builder, 257 cal = GTK_CALENDAR (gtk_builder_get_object (edc->builder,
258 "edit_dialog_expiration_absolute_calendar")); 258 "edit_dialog_expiration_absolute_calendar"));
@@ -327,7 +327,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
327 if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 327 if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
328 "edit_dialog_expiration_never_radiobutton")))) 328 "edit_dialog_expiration_never_radiobutton"))))
329 { 329 {
330 edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value; 330 edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us;
331 edc->n_is_relative = TRUE; /* doesn't matter, but make sure it is well-defined anyway */ 331 edc->n_is_relative = TRUE; /* doesn't matter, but make sure it is well-defined anyway */
332 } 332 }
333 333
@@ -349,7 +349,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
349 GNUNET_break (GNUNET_YES == 349 GNUNET_break (GNUNET_YES ==
350 GNUNET_STRINGS_fancy_time_to_relative (rt_s, 350 GNUNET_STRINGS_fancy_time_to_relative (rt_s,
351 &rt)); 351 &rt));
352 edc->n_exp_time = rt.rel_value; 352 edc->n_exp_time = rt.rel_value_us;
353 edc->n_is_relative = TRUE; 353 edc->n_is_relative = TRUE;
354 } 354 }
355 355
@@ -387,7 +387,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
387 GNUNET_break (GNUNET_OK == 387 GNUNET_break (GNUNET_OK ==
388 GNUNET_STRINGS_fancy_time_to_absolute (fancydate, 388 GNUNET_STRINGS_fancy_time_to_absolute (fancydate,
389 &atime)); 389 &atime));
390 edc->n_exp_time = atime.abs_value; 390 edc->n_exp_time = atime.abs_value_us;
391 edc->n_is_relative = FALSE; 391 edc->n_is_relative = FALSE;
392 } 392 }
393 393
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 36cca3d0..beba823a 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -1847,16 +1847,16 @@ zone_iteration_proc (void *cls,
1847 { 1847 {
1848 struct GNUNET_TIME_Relative rel_time; 1848 struct GNUNET_TIME_Relative rel_time;
1849 1849
1850 rel_time.rel_value = rd[c].expiration_time; 1850 rel_time.rel_value_us = rd[c].expiration_time;
1851 exp_t = rel_time.rel_value; 1851 exp_t = rel_time.rel_value_us;
1852 exp = GNUNET_STRINGS_relative_time_to_string (rel_time, GNUNET_NO); 1852 exp = GNUNET_STRINGS_relative_time_to_string (rel_time, GNUNET_NO);
1853 } 1853 }
1854 else 1854 else
1855 { 1855 {
1856 struct GNUNET_TIME_Absolute exp_abs; 1856 struct GNUNET_TIME_Absolute exp_abs;
1857 1857
1858 exp_abs.abs_value = rd[c].expiration_time; 1858 exp_abs.abs_value_us = rd[c].expiration_time;
1859 exp_t = exp_abs.abs_value; 1859 exp_t = exp_abs.abs_value_us;
1860 exp = GNUNET_STRINGS_absolute_time_to_string (exp_abs); 1860 exp = GNUNET_STRINGS_absolute_time_to_string (exp_abs);
1861 } 1861 }
1862 /* value */ 1862 /* value */
diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index 21b92e03..cc05c150 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -149,7 +149,7 @@ process_value_update (void *cls, const char *subsystem, const char *name,
149 GNUNET_asprintf (&id, "%s: %s", subsystem, name); 149 GNUNET_asprintf (&id, "%s: %s", subsystem, name);
150 gtk_statistics_update_value (stats, id, 150 gtk_statistics_update_value (stats, id,
151 GNUNET_TIME_absolute_get_duration 151 GNUNET_TIME_absolute_get_duration
152 (start_time).rel_value / 1000LL, value); 152 (start_time).rel_value_us / 1000000LL, value);
153 GNUNET_free (id); 153 GNUNET_free (id);
154 return GNUNET_OK; 154 return GNUNET_OK;
155} 155}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 05:06:23 +0000