[GNUnet-SVN] r31214 - in gnunet: contrib src/gns src/nse

[gnunet]

Author: grothoff
Date: 2013-12-09 14:51:16 +0100 (Mon, 09 Dec 2013)
New Revision: 31214

Modified:
   gnunet/contrib/gns-bcd.tex
   gnunet/src/gns/gnunet-bcd.c
   gnunet/src/nse/gnunet-service-nse.c
Log:
-update bcd template and adjust code accordingly

Modified: gnunet/contrib/gns-bcd.tex
===================================================================
--- gnunet/contrib/gns-bcd.tex  2013-12-09 13:45:39 UTC (rev 31213)
+++ gnunet/contrib/gns-bcd.tex  2013-12-09 13:51:16 UTC (rev 31214)
@@ -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}
 }

Modified: gnunet/src/gns/gnunet-bcd.c
===================================================================
--- gnunet/src/gns/gnunet-bcd.c 2013-12-09 13:45:39 UTC (rev 31213)
+++ gnunet/src/gns/gnunet-bcd.c 2013-12-09 13:51:16 UTC (rev 31214)
@@ -215,7 +215,7 @@
       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);

Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2013-12-09 13:45:39 UTC (rev 31213)
+++ gnunet/src/nse/gnunet-service-nse.c 2013-12-09 13:51:16 UTC (rev 31214)
@@ -959,7 +959,8 @@
       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);