[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28502 - in gnunet-gtk: contrib src/fs src/lib src/setup sr
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r28502 - in gnunet-gtk: contrib src/fs src/lib src/setup src/statistics |
|
Date: |
Sun, 11 Aug 2013 23:22:35 +0200 |
Author: grothoff
Date: 2013-08-11 23:22:35 +0200 (Sun, 11 Aug 2013)
New Revision: 28502
Removed:
gnunet-gtk/contrib/Makefile.in
Modified:
gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
gnunet-gtk/src/fs/gnunet-fs-gtk_common.c
gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
gnunet-gtk/src/lib/eventloop.c
gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
gnunet-gtk/src/setup/gnunet-setup-gns.c
gnunet-gtk/src/statistics/gnunet-statistics-gtk.c
Log:
changing time measurement from milliseconds to microseconds
Deleted: gnunet-gtk/contrib/Makefile.in
===================================================================
--- gnunet-gtk/contrib/Makefile.in 2013-08-11 21:21:56 UTC (rev 28501)
+++ gnunet-gtk/contrib/Makefile.in 2013-08-11 21:22:35 UTC (rev 28502)
@@ -1,810 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
address@hidden@
-
-# Process this file with automake to produce Makefile.in
-
-VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = contrib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/gnunet_fs_gtk_about_window.glade.in \
- $(srcdir)/gnunet_identity_gtk_about_window.glade.in \
- $(srcdir)/gnunet_peerinfo_gtk_about_window.glade.in \
- $(srcdir)/gnunet_setup_about_window.glade.in \
- $(srcdir)/gnunet_statistics_gtk_about_window.glade.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-2.0.m4 \
- $(top_srcdir)/m4/gtk-3.0.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/gnunet_gtk_config.h
-CONFIG_CLEAN_FILES = gnunet_fs_gtk_about_window.glade \
- gnunet_identity_gtk_about_window.glade \
- gnunet_peerinfo_gtk_about_window.glade \
- gnunet_statistics_gtk_about_window.glade \
- gnunet_setup_about_window.glade
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(address@hidden@)
-am__v_GEN_ = $(address@hidden@)
-am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(address@hidden@)
-am__v_at_ = $(address@hidden@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-DATA = $(pkgdata_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_ON_UNIX = @ENABLE_ON_UNIX@
-ENABLE_ON_W32 = @ENABLE_ON_W32@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GLADE_CFLAGS = @GLADE_CFLAGS@
-GLADE_LIBS = @GLADE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GNUNET_CFLAGS = @GNUNET_CFLAGS@
-GNUNET_FS_APP = @GNUNET_FS_APP@
-GNUNET_FS_GTK_NAME = @GNUNET_FS_GTK_NAME@
-GNUNET_FS_GTK_VERSION3 = @GNUNET_FS_GTK_VERSION3@
-GNUNET_FS_GTK_YEARFROM = @GNUNET_FS_GTK_YEARFROM@
-GNUNET_FS_GTK_YEARTO = @GNUNET_FS_GTK_YEARTO@
-GNUNET_GNS_GTK_NAME = @GNUNET_GNS_GTK_NAME@
-GNUNET_LIBS = @GNUNET_LIBS@
-GNUNET_PEERINFO_APP = @GNUNET_PEERINFO_APP@
-GNUNET_PEERINFO_GTK_NAME = @GNUNET_PEERINFO_GTK_NAME@
-GNUNET_PEERINFO_GTK_VERSION3 = @GNUNET_PEERINFO_GTK_VERSION3@
-GNUNET_PEERINFO_GTK_YEARFROM = @GNUNET_PEERINFO_GTK_YEARFROM@
-GNUNET_PEERINFO_GTK_YEARTO = @GNUNET_PEERINFO_GTK_YEARTO@
-GNUNET_SETUP_APP = @GNUNET_SETUP_APP@
-GNUNET_SETUP_GTK_NAME = @GNUNET_SETUP_GTK_NAME@
-GNUNET_SETUP_GTK_VERSION3 = @GNUNET_SETUP_GTK_VERSION3@
-GNUNET_SETUP_GTK_YEARFROM = @GNUNET_SETUP_GTK_YEARFROM@
-GNUNET_SETUP_GTK_YEARTO = @GNUNET_SETUP_GTK_YEARTO@
-GNUNET_STATISTICS_GTK_NAME = @GNUNET_STATISTICS_GTK_NAME@
-GNUNET_STATISTICS_GTK_VERSION3 = @GNUNET_STATISTICS_GTK_VERSION3@
-GNUNET_STATISTICS_GTK_YEARFROM = @GNUNET_STATISTICS_GTK_YEARFROM@
-GNUNET_STATISTICS_GTK_YEARTO = @GNUNET_STATISTICS_GTK_YEARTO@
-GN_LIB_LDFLAGS = @GN_LIB_LDFLAGS@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA = @PACKAGE_DATA@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-QR_CFLAGS = @QR_CFLAGS@
-QR_LIBS = @QR_LIBS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-unique_CFLAGS = @unique_CFLAGS@
-unique_LIBS = @unique_LIBS@
-SUBDIRS = .
-pkgpixdir = $(pkgdatadir)
-IMAGES = \
- gnunet-setup-oxygen-cancel.png \
- gnunet-setup-oxygen-ok.png
-
-EXTRA_DIST = \
- gnunet-fs-gtk.protocol \
- gnunet-fs-gtk-gnome.sh \
- $(pkgdata_DATA) \
- $(IMAGES)
-
-pkgdata_DATA = \
- $(IMAGES) \
- qr_dummy.png \
- downloading.gif \
- downloading_not_receiving.gif \
- downloaded.gif \
- error.gif \
- found_source.gif \
- published.gif \
- publishing.gif \
- red.png \
- green.png \
- searching_sources.gif \
- gnunet_fs_gtk_about_window.glade \
- gnunet_fs_gtk_download_as_dialog.glade \
- gnunet_fs_gtk_main_window.glade \
- gnunet_fs_gtk_edit_publication.glade \
- gnunet_fs_gtk_open_directory_dialog.glade \
- gnunet_fs_gtk_open_url_dialog.glade \
- gnunet_fs_gtk_publish_dialog.glade \
- gnunet_fs_gtk_publish_directory_dialog.glade \
- gnunet_fs_gtk_publish_file_dialog.glade \
- gnunet_fs_gtk_publish_tab.glade \
- gnunet_fs_gtk_search_tab.glade \
- gnunet_fs_gtk_unindex.glade \
- gnunet_fs_gtk_progress_dialog.glade \
- gnunet_gtk_status_bar_menu.glade \
- gnunet_identity_gtk_about_window.glade \
- gnunet_identity_gtk_advertise_dialog.glade \
- gnunet_identity_gtk_main_window.glade \
- gnunet_peerinfo_gtk_about_window.glade \
- gnunet_peerinfo_gtk_main_window.glade \
- gnunet_statistics_gtk_about_window.glade \
- gnunet_statistics_gtk_main_window.glade \
- gnunet_setup_calendar_dialog.glade \
- gnunet_setup_qr_save_as_dialog.glade \
- gnunet_setup_gtk_main_window.glade \
- gnunet_setup_gns_edit_a.glade \
- gnunet_setup_gns_edit_ns.glade \
- gnunet_setup_gns_edit_cname.glade \
- gnunet_setup_gns_edit_soa.glade \
- gnunet_setup_gns_edit_ptr.glade \
- gnunet_setup_gns_edit_mx.glade \
- gnunet_setup_gns_edit_txt.glade \
- gnunet_setup_gns_edit_aaaa.glade \
- gnunet_setup_gns_edit_pkey.glade \
- gnunet_setup_gns_edit_leho.glade \
- gnunet_setup_gns_edit_srv.glade \
- gnunet_setup_gns_edit_vpn.glade
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu contrib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-gnunet_fs_gtk_about_window.glade: $(top_builddir)/config.status
$(srcdir)/gnunet_fs_gtk_about_window.glade.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-gnunet_identity_gtk_about_window.glade: $(top_builddir)/config.status
$(srcdir)/gnunet_identity_gtk_about_window.glade.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-gnunet_peerinfo_gtk_about_window.glade: $(top_builddir)/config.status
$(srcdir)/gnunet_peerinfo_gtk_about_window.glade.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-gnunet_statistics_gtk_about_window.glade: $(top_builddir)/config.status
$(srcdir)/gnunet_statistics_gtk_about_window.glade.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-gnunet_setup_about_window.glade: $(top_builddir)/config.status
$(srcdir)/gnunet_setup_about_window.glade.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
- done
-
-uninstall-pkgdataDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- $(am__make_dryrun) \
- || test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
- for dir in "$(DESTDIR)$(pkgdatadir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f
$(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local install-pkgdataDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-pkgdataDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive dist-hook distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pkgdataDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-pkgdataDATA
-
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)
- $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)/flags
- @$(NORMAL_INSTALL)
- for pixmap in $(IMAGES); do \
- if test -f $$pixmap; then \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgpixdir); \
- fi \
- done
- for flag in $(srcdir)/flags/*.png; do \
- if test -f $$flag; then \
- $(INSTALL_DATA) $$flag $(DESTDIR)$(pkgpixdir)/flags/ ; \
- fi \
- done
-
-dist-hook:
- if test -d $(srcdir)/flags; then \
- mkdir -p $(distdir)/flags; \
- for flag in $(srcdir)/flags/*.png; do \
- if test -f $$flag; then \
- cp -p $$flag $(distdir)/flags; \
- fi \
- done \
- fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified: gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade 2013-08-11
21:21:56 UTC (rev 28501)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade 2013-08-11
21:22:35 UTC (rev 28502)
@@ -91,7 +91,7 @@
<object class="GtkLabel" id="about_name_version_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">GNUnet-Peerinfo-GTK r28462</property>
+ <property name="label">GNUnet-Peerinfo-GTK 0.9.3</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="200"/>
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_common.c 2013-08-11 21:21:56 UTC (rev
28501)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_common.c 2013-08-11 21:22:35 UTC (rev
28502)
@@ -137,7 +137,7 @@
year = gtk_spin_button_get_value_as_int (spin);
GNUNET_assert (year >= 0);
ret = GNUNET_FS_year_to_time ((unsigned int) year);
- GNUNET_break (GNUNET_TIME_absolute_get ().abs_value < ret.abs_value);
+ GNUNET_break (GNUNET_TIME_absolute_get ().abs_value_us < ret.abs_value_us);
return ret;
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2013-08-11 21:21:56 UTC
(rev 28501)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2013-08-11 21:22:35 UTC
(rev 28502)
@@ -2143,7 +2143,7 @@
GNUNET_CONTAINER_meta_data_duplicate (meta),
SEARCH_TAB_MC_PREVIEW, pixbuf,
SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint)
percent_avail,
- SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 ==
availability_certainty) ? (gint) (probe_time.rel_value /
GNUNET_FS_PROBE_UPDATE_FREQUENCY.rel_value) : -1,
+ SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 ==
availability_certainty) ? (gint) (probe_time.rel_value_us /
GNUNET_FS_PROBE_UPDATE_FREQUENCY.rel_value_us) : -1,
SEARCH_TAB_MC_FILENAME, desc,
SEARCH_TAB_MC_MIMETYPE, mime,
SEARCH_TAB_MC_APPLICABILITY_RANK,
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2013-08-11 21:21:56 UTC
(rev 28501)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2013-08-11 21:22:35 UTC
(rev 28502)
@@ -609,7 +609,7 @@
PUBLISH_MC_PRIORITY, (guint) bo->content_priority,
PUBLISH_MC_FILE_INFORMATION_STRUCT, fi,
PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
- (guint64) bo->expiration_time.abs_value,
+ (guint64) bo->expiration_time.abs_value_us,
PUBLISH_MC_REPLICATION_LEVEL,
(guint) bo->replication_level,
-1);
@@ -1399,7 +1399,7 @@
(guint) adcc->directory_scan_bo.content_priority,
PUBLISH_MC_FILE_INFORMATION_STRUCT, fi,
PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
- (guint64)
adcc->directory_scan_bo.expiration_time.abs_value,
+ (guint64)
adcc->directory_scan_bo.expiration_time.abs_value_us,
PUBLISH_MC_REPLICATION_LEVEL,
(guint) adcc->directory_scan_bo.replication_level, -1);
GNUNET_free (file_size_fancy);
@@ -1483,7 +1483,7 @@
{
case GNUNET_FS_DIRSCANNER_FILE_START:
GNUNET_assert (NULL != filename);
- if (GNUNET_TIME_absolute_get_duration (last_pulse).rel_value > 100)
+ if (GNUNET_TIME_absolute_get_duration (last_pulse).rel_value_us > 100000LL)
{
gtk_progress_bar_pulse (adcc->progress_dialog_bar);
last_pulse = GNUNET_TIME_absolute_get ();
@@ -1904,7 +1904,7 @@
PUBLISH_MC_ANONYMITY_LEVEL, (guint) bo->anonymity_level,
PUBLISH_MC_PRIORITY, (guint) bo->content_priority,
PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
- (guint64) bo->expiration_time.abs_value,
+ (guint64) bo->expiration_time.abs_value_us,
PUBLISH_MC_REPLICATION_LEVEL,
(guint) bo->replication_level,
-1);
Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c 2013-08-11 21:21:56 UTC (rev 28501)
+++ gnunet-gtk/src/lib/eventloop.c 2013-08-11 21:22:35 UTC (rev 28502)
@@ -590,14 +590,14 @@
resize_cached_poll_array (ml, fd_counter + need_gfds);
}
}
- if (timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ if (timeout.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
{
if (delay >= 0)
delay =
- GNUNET_MIN (timeout.rel_value /
- GNUNET_TIME_UNIT_MILLISECONDS.rel_value, delay);
+ GNUNET_MIN (timeout.rel_value_us /
+ GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us, delay);
else
- delay = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
+ delay = timeout.rel_value_us /
GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
}
#if WINDOWS
Modified: gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2013-08-11 21:21:56 UTC
(rev 28501)
+++ gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2013-08-11 21:22:35 UTC
(rev 28502)
@@ -199,7 +199,7 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
"edit_dialog_options_shadow_checkbutton")),
edc->n_is_shadow);
- if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == edc->n_exp_time)
+ if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
"edit_dialog_expiration_never_radiobutton")),
@@ -212,7 +212,7 @@
"edit_dialog_expiration_relative_combobox")));
}
if ( (edc->n_is_relative) &&
- (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != edc->n_exp_time) )
+ (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != edc->n_exp_time) )
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
"edit_dialog_expiration_relative_radiobutton")),
@@ -221,7 +221,7 @@
"edit_dialog_expiration_absolute_calendar")));
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
"edit_dialog_expiration_absolute_hbox")));
- rt.rel_value = edc->n_exp_time;
+ rt.rel_value_us = edc->n_exp_time;
}
else
{
@@ -237,7 +237,7 @@
-1);
gtk_combo_box_set_active_iter (cb, &iter);
if ( (! edc->n_is_relative) &&
- (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value != edc->n_exp_time) )
+ (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != edc->n_exp_time) )
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
"edit_dialog_expiration_absolute_radiobutton")),
@@ -245,14 +245,14 @@
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
"edit_dialog_expiration_relative_combobox")));
- at.abs_value = edc->n_exp_time;
+ at.abs_value_us = edc->n_exp_time;
}
else
{
/* select a sane default: right now */
at = GNUNET_TIME_absolute_get ();
}
- tp = (time_t) (at.abs_value / 1000LL); /* convert to seconds */
+ tp = (time_t) (at.abs_value_us / 1000000LL); /* convert to seconds */
ymd = gmtime (&tp);
cal = GTK_CALENDAR (gtk_builder_get_object (edc->builder,
"edit_dialog_expiration_absolute_calendar"));
@@ -327,7 +327,7 @@
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
"edit_dialog_expiration_never_radiobutton"))))
{
- edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value;
+ edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us;
edc->n_is_relative = TRUE; /* doesn't matter, but make sure it is
well-defined anyway */
}
@@ -349,7 +349,7 @@
GNUNET_break (GNUNET_YES ==
GNUNET_STRINGS_fancy_time_to_relative (rt_s,
&rt));
- edc->n_exp_time = rt.rel_value;
+ edc->n_exp_time = rt.rel_value_us;
edc->n_is_relative = TRUE;
}
@@ -387,7 +387,7 @@
GNUNET_break (GNUNET_OK ==
GNUNET_STRINGS_fancy_time_to_absolute (fancydate,
&atime));
- edc->n_exp_time = atime.abs_value;
+ edc->n_exp_time = atime.abs_value_us;
edc->n_is_relative = FALSE;
}
Modified: gnunet-gtk/src/setup/gnunet-setup-gns.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns.c 2013-08-11 21:21:56 UTC (rev
28501)
+++ gnunet-gtk/src/setup/gnunet-setup-gns.c 2013-08-11 21:22:35 UTC (rev
28502)
@@ -1847,16 +1847,16 @@
{
struct GNUNET_TIME_Relative rel_time;
- rel_time.rel_value = rd[c].expiration_time;
- exp_t = rel_time.rel_value;
+ rel_time.rel_value_us = rd[c].expiration_time;
+ exp_t = rel_time.rel_value_us;
exp = GNUNET_STRINGS_relative_time_to_string (rel_time, GNUNET_NO);
}
else
{
struct GNUNET_TIME_Absolute exp_abs;
- exp_abs.abs_value = rd[c].expiration_time;
- exp_t = exp_abs.abs_value;
+ exp_abs.abs_value_us = rd[c].expiration_time;
+ exp_t = exp_abs.abs_value_us;
exp = GNUNET_STRINGS_absolute_time_to_string (exp_abs);
}
/* value */
Modified: gnunet-gtk/src/statistics/gnunet-statistics-gtk.c
===================================================================
--- gnunet-gtk/src/statistics/gnunet-statistics-gtk.c 2013-08-11 21:21:56 UTC
(rev 28501)
+++ gnunet-gtk/src/statistics/gnunet-statistics-gtk.c 2013-08-11 21:22:35 UTC
(rev 28502)
@@ -149,7 +149,7 @@
GNUNET_asprintf (&id, "%s: %s", subsystem, name);
gtk_statistics_update_value (stats, id,
GNUNET_TIME_absolute_get_duration
- (start_time).rel_value / 1000LL, value);
+ (start_time).rel_value_us / 1000000LL, value);
GNUNET_free (id);
return GNUNET_OK;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28502 - in gnunet-gtk: contrib src/fs src/lib src/setup src/statistics,
gnunet <=