소스 검색

Don't set profanity gpg key by default so that screen refresh bug doesn't happen

Bob Mottram 7 년 전
부모
커밋
f748e4ebcc
1개의 변경된 파일10개의 추가작업 그리고 2개의 파일을 삭제
  1. 10
    2
      src/freedombone-app-profanity

+ 10
- 2
src/freedombone-app-profanity 파일 보기

@@ -285,7 +285,11 @@ function install_profanity {
285 285
         echo 'enabled=true' >> $XMPP_CLIENT_ACCOUNTS
286 286
         echo "jid=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> $XMPP_CLIENT_ACCOUNTS
287 287
         echo "server=$XMPP_ONION_HOSTNAME" >> $XMPP_CLIENT_ACCOUNTS
288
-        echo "pgp.keyid=$MY_GPG_PUBLIC_KEY_ID" >> $XMPP_CLIENT_ACCOUNTS
288
+        # There is a bug where profanity doesn't refresh the screen
289
+        # after gpg-agent has asked for a password, so for now
290
+        # don't set the gpg key by default
291
+        #echo "pgp.keyid=$MY_GPG_PUBLIC_KEY_ID" >> $XMPP_CLIENT_ACCOUNTS
292
+        echo "pgp.keyid=" >> $XMPP_CLIENT_ACCOUNTS
289 293
         echo 'resource=profanity' >> $XMPP_CLIENT_ACCOUNTS
290 294
         echo "muc.service=chat.${DEFAULT_DOMAIN_NAME}" >> $XMPP_CLIENT_ACCOUNTS
291 295
         echo "muc.nick=${MY_USERNAME}" >> $XMPP_CLIENT_ACCOUNTS
@@ -310,7 +314,11 @@ function install_profanity {
310 314
         fi
311 315
         echo "jid=${MY_USERNAME}@${XMPP_ONION_HOSTNAME}" >> $XMPP_CLIENT_ACCOUNTS
312 316
         echo "server=$XMPP_ONION_HOSTNAME" >> $XMPP_CLIENT_ACCOUNTS
313
-        echo "pgp.keyid=$MY_GPG_PUBLIC_KEY_ID" >> $XMPP_CLIENT_ACCOUNTS
317
+        # There is a bug where profanity doesn't refresh the screen
318
+        # after gpg-agent has asked for a password, so for now
319
+        # don't set the gpg key by default
320
+        #echo "pgp.keyid=$MY_GPG_PUBLIC_KEY_ID" >> $XMPP_CLIENT_ACCOUNTS
321
+        echo "pgp.keyid=" >> $XMPP_CLIENT_ACCOUNTS
314 322
         echo 'resource=profanity' >> $XMPP_CLIENT_ACCOUNTS
315 323
         echo "muc.service=${XMPP_ONION_HOSTNAME}" >> $XMPP_CLIENT_ACCOUNTS
316 324
         echo "muc.nick=${MY_USERNAME}" >> $XMPP_CLIENT_ACCOUNTS