gnunet

commit d00711efe0479e56f21c6e959bcaeae3e43bfeff
parent 5aaf8bbb055d5eac5de37f0b7be615d4d258965e
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon,  9 Dec 2013 13:51:16 +0000

-update bcd template and adjust code accordingly

Diffstat:
M
contrib/gns-bcd.tex
 | 
11
++++++-----
M
src/gns/gnunet-bcd.c
 | 
2
+-
M
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
@@ -18748,7 +18748,6 @@
             \draw[-,line width=1pt,MyBlack] [yshift=-2mm](\width,-\height) to [yshift=-3mm](\width,-\height);
 
 
-            \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{gnunet-logo.pdf}};
             \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-16mm) {\orga};
             \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}};
             \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 @@
             }
 
             \ifthenelse{\equal{\gns}{}\or\equal{#1}{english}}{
+                \node[rectangle,draw=white,minimum height=7pt,text width=120mm,inner sep=0pt] at (62mm,-2mm) {\gns};
                 \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-21.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
                 \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}};
                 \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}}};
             }
             {
-                \node[rectangle,draw=black,line width=1pt,inner sep=0pt] at (12.5mm,-14.75mm) {\begin{pspicture}(17mm,17mm) \psbarcode{\gns}{}{qrcode}\end{pspicture}};
-                \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-32.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
-                \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}};
-                \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}}};
+                \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{gnunet-logo.pdf}};
+                \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}};
+                \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
+                \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}};
+                \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}}};
             }
     \end{tikzpicture}
 }
diff --git 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,
       GNUNET_free (gpg1);
     }
     FPRINTF (f,
-             "\\def\\gns{gnunet://gns/%s/%s}\n",
+             "\\def\\gns{%s/%s}\n",
              gnskey,
              (NULL == gns_nick) ? "" : gns_nick);
     FCLOSE (f);
diff --git 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)
       check_proof_of_work (&incoming_flood->origin.public_key,
                            incoming_flood->proof_of_work))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Proof of work invalid: %llu!\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Proof of work invalid: %llu!\n",
                 (unsigned long long)
                 GNUNET_ntohll (incoming_flood->proof_of_work));
     GNUNET_break_op (0);