diff options
-rw-r--r-- | contrib/gns-bcd.tex | 11 | ||||
-rw-r--r-- | src/gns/gnunet-bcd.c | 2 | ||||
-rw-r--r-- | src/nse/gnunet-service-nse.c | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/contrib/gns-bcd.tex b/contrib/gns-bcd.tex index 6b46336fe..5fb3533a9 100644 --- a/contrib/gns-bcd.tex +++ b/contrib/gns-bcd.tex | |||
@@ -18748,7 +18748,6 @@ | |||
18748 | \draw[-,line width=1pt,MyBlack] [yshift=-2mm](\width,-\height) to [yshift=-3mm](\width,-\height); | 18748 | \draw[-,line width=1pt,MyBlack] [yshift=-2mm](\width,-\height) to [yshift=-3mm](\width,-\height); |
18749 | 18749 | ||
18750 | 18750 | ||
18751 | \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{gnunet-logo.pdf}}; | ||
18752 | \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-16mm) {\orga}; | 18751 | \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-16mm) {\orga}; |
18753 | \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-21.5mm) {\ifthenelse{\equal{#1}{english}}{\departmenten}{\departmentde}}; | 18752 | \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-21.5mm) {\ifthenelse{\equal{#1}{english}}{\departmenten}{\departmentde}}; |
18754 | \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-24.0mm) {\ifthenelse{\equal{#1}{english}}{\subdepartmenten}{\subdepartmentde}}; | 18753 | \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-24.0mm) {\ifthenelse{\equal{#1}{english}}{\subdepartmenten}{\subdepartmentde}}; |
@@ -18775,15 +18774,17 @@ | |||
18775 | } | 18774 | } |
18776 | 18775 | ||
18777 | \ifthenelse{\equal{\gns}{}\or\equal{#1}{english}}{ | 18776 | \ifthenelse{\equal{\gns}{}\or\equal{#1}{english}}{ |
18777 | \node[rectangle,draw=white,minimum height=7pt,text width=120mm,inner sep=0pt] at (62mm,-2mm) {\gns}; | ||
18778 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-21.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}}; | 18778 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-21.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}}; |
18779 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-24.0mm) {\fontsize{8pt}{8pt}\selectfont \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}}; | 18779 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-24.0mm) {\fontsize{8pt}{8pt}\selectfont \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}}; |
18780 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-29.0mm) {\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}}; | 18780 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-29.0mm) {\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}}; |
18781 | } | 18781 | } |
18782 | { | 18782 | { |
18783 | \node[rectangle,draw=black,line width=1pt,inner sep=0pt] at (12.5mm,-14.75mm) {\begin{pspicture}(17mm,17mm) \psbarcode{\gns}{}{qrcode}\end{pspicture}}; | 18783 | \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{gnunet-logo.pdf}}; |
18784 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-32.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}}; | 18784 | \node[rectangle,draw=white,line width=1pt,inner sep=0pt] at (17mm,-17mm) {\begin{pspicture}(15mm,15mm) \psbarcode{gnunet://gns/\gns}{eclevel=Q}{qrcode}\end{pspicture}}; |
18785 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\fontsize{8pt}{8pt}\selectfont \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}}; | 18785 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}}; |
18786 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-41.5mm) {\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}}; | 18786 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-41.5mm) {\fontsize{8pt}{8pt}\selectfont \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}}; |
18787 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-47.0mm) {\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}}; | ||
18787 | } | 18788 | } |
18788 | \end{tikzpicture} | 18789 | \end{tikzpicture} |
18789 | } | 18790 | } |
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index c6404f8c4..4e018c12d 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c | |||
@@ -215,7 +215,7 @@ access_handler_callback (void *cls, struct MHD_Connection *connection, | |||
215 | GNUNET_free (gpg1); | 215 | GNUNET_free (gpg1); |
216 | } | 216 | } |
217 | FPRINTF (f, | 217 | FPRINTF (f, |
218 | "\\def\\gns{gnunet://gns/%s/%s}\n", | 218 | "\\def\\gns{%s/%s}\n", |
219 | gnskey, | 219 | gnskey, |
220 | (NULL == gns_nick) ? "" : gns_nick); | 220 | (NULL == gns_nick) ? "" : gns_nick); |
221 | FCLOSE (f); | 221 | FCLOSE (f); |
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 366770cad..f392dda92 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -959,7 +959,8 @@ verify_message_crypto (const struct GNUNET_NSE_FloodMessage *incoming_flood) | |||
959 | check_proof_of_work (&incoming_flood->origin.public_key, | 959 | check_proof_of_work (&incoming_flood->origin.public_key, |
960 | incoming_flood->proof_of_work)) | 960 | incoming_flood->proof_of_work)) |
961 | { | 961 | { |
962 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Proof of work invalid: %llu!\n", | 962 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
963 | "Proof of work invalid: %llu!\n", | ||
963 | (unsigned long long) | 964 | (unsigned long long) |
964 | GNUNET_ntohll (incoming_flood->proof_of_work)); | 965 | GNUNET_ntohll (incoming_flood->proof_of_work)); |
965 | GNUNET_break_op (0); | 966 | GNUNET_break_op (0); |