[X2go-Commits] pinentry-x2go.git - master (branch) updated: 0.7.5.1-4-g7295764

X2Go dev team git-admin at x2go.org
Wed Jun 13 15:05:36 CEST 2012


The branch, master has been updated
       via  72957640b97caee20329b4681d3cf97503c43a53 (commit)
      from  c726abf576fa5516c78d2c58fcef870d2ad1971d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 72957640b97caee20329b4681d3cf97503c43a53
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 13 15:05:20 2012 +0200

    Replace string pinentry-qt with pinentry-x2go.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog       |    1 +
 pinentry-x2go/main.cpp |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5f70312..8d72377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pinentry-x2go (0.7.5.2-0~x2go1) UNRELEASED; urgency=low
       cruft.
     - Make code tree fully build with autotools, see README file for further
       info.
+    - Replace string pinentry-qt with pinentry-x2go.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 13 Oct 2011 02:03:51 +0200
 
diff --git a/pinentry-x2go/main.cpp b/pinentry-x2go/main.cpp
index 363021b..cade908 100644
--- a/pinentry-x2go/main.cpp
+++ b/pinentry-x2go/main.cpp
@@ -131,7 +131,7 @@ int
 main (int argc, char *argv[])
 {
     pin_is_known=false;
-    pinentry_init ("pinentry-qt");
+    pinentry_init ("pinentry-x2go");
     QString gpghome=getenv("GNUPGHOME");
     QString cardid=getenv("CARDAPPID");
     if(QFile::exists(gpghome+"/pins"))
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
         *new_argv = (char*)malloc (n);
     if (!new_argv || !*new_argv)
     {
-        fprintf (stderr, "pinentry-qt: can't fixup argument list: %s\n",
+        fprintf (stderr, "pinentry-x2go: can't fixup argument list: %s\n",
                  strerror (errno));
         exit (EXIT_FAILURE);
 
@@ -224,7 +224,7 @@ main (int argc, char *argv[])
     /* Consumes all arguments.  */
     if (pinentry_parse_opts (argc, argv))
     {
-        printf ("pinentry-qt (pinentry) " VERSION "\n");
+        printf ("pinentry-x2go (pinentry) " VERSION "\n");
         exit (EXIT_SUCCESS);
     }
 


hooks/post-receive
-- 
pinentry-x2go.git (PinEntry Dialog (Qt) for X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).




More information about the x2go-commits mailing list