about summary refs log tree commit diff stats
path: root/src/xmpp
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-07-24 01:22:29 +0100
committerJames Booth <boothj5@gmail.com>2016-07-24 01:22:29 +0100
commit47dfa6c3fc6368a908984d8b3a3840276fe3c9c7 (patch)
treec0adb41e528eea0542f7c066c0e4728eab0d342f /src/xmpp
parentd44472049b6c4bf4ff96315182ad214db693057f (diff)
parent4ecb4019a616406444e16f53c8ffdbfe8070b2d2 (diff)
downloadprofani-tty-47dfa6c3fc6368a908984d8b3a3840276fe3c9c7.tar.gz
Merge branch 'master' into python3
Conflicts:
	.gitignore
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/blocking.c2
-rw-r--r--src/xmpp/blocking.h2
-rw-r--r--src/xmpp/bookmark.c2
-rw-r--r--src/xmpp/bookmark.h2
-rw-r--r--src/xmpp/capabilities.c2
-rw-r--r--src/xmpp/capabilities.h2
-rw-r--r--src/xmpp/connection.c2
-rw-r--r--src/xmpp/connection.h2
-rw-r--r--src/xmpp/form.c2
-rw-r--r--src/xmpp/form.h2
-rw-r--r--src/xmpp/iq.c2
-rw-r--r--src/xmpp/iq.h2
-rw-r--r--src/xmpp/message.c2
-rw-r--r--src/xmpp/message.h2
-rw-r--r--src/xmpp/presence.c2
-rw-r--r--src/xmpp/presence.h2
-rw-r--r--src/xmpp/roster.c2
-rw-r--r--src/xmpp/roster.h2
-rw-r--r--src/xmpp/session.c2
-rw-r--r--src/xmpp/session.h2
-rw-r--r--src/xmpp/stanza.c2
-rw-r--r--src/xmpp/stanza.h2
-rw-r--r--src/xmpp/xmpp.h2
23 files changed, 23 insertions, 23 deletions
diff --git a/src/xmpp/blocking.c b/src/xmpp/blocking.c
index 92e7dffc..39cfb65a 100644
--- a/src/xmpp/blocking.c
+++ b/src/xmpp/blocking.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/blocking.h b/src/xmpp/blocking.h
index f541cef1..14ae68b6 100644
--- a/src/xmpp/blocking.h
+++ b/src/xmpp/blocking.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c
index 6fbe1903..69c74b2e 100644
--- a/src/xmpp/bookmark.c
+++ b/src/xmpp/bookmark.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/bookmark.h b/src/xmpp/bookmark.h
index 4895c706..a4e243f1 100644
--- a/src/xmpp/bookmark.h
+++ b/src/xmpp/bookmark.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c
index 7ba0565d..2a8aff0e 100644
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h
index 929e21dd..d5d3d777 100644
--- a/src/xmpp/capabilities.h
+++ b/src/xmpp/capabilities.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 07b528ef..e9ad22b9 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h
index 2465afd6..b7250d14 100644
--- a/src/xmpp/connection.h
+++ b/src/xmpp/connection.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/form.c b/src/xmpp/form.c
index b4005f6a..bc0c9da9 100644
--- a/src/xmpp/form.c
+++ b/src/xmpp/form.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/form.h b/src/xmpp/form.h
index dc2ab38d..8ae8e75a 100644
--- a/src/xmpp/form.h
+++ b/src/xmpp/form.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index 8f49a0d6..954faf5d 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/iq.h b/src/xmpp/iq.h
index b460003d..1c9474fb 100644
--- a/src/xmpp/iq.h
+++ b/src/xmpp/iq.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 4d49ba98..9b485954 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/message.h b/src/xmpp/message.h
index b886144f..c6561bca 100644
--- a/src/xmpp/message.h
+++ b/src/xmpp/message.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 6ca5127c..eed95fe1 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/presence.h b/src/xmpp/presence.h
index 501bf058..f16f2201 100644
--- a/src/xmpp/presence.h
+++ b/src/xmpp/presence.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index 2420c307..0449499b 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/roster.h b/src/xmpp/roster.h
index fbadf85b..49acf9a6 100644
--- a/src/xmpp/roster.h
+++ b/src/xmpp/roster.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/session.c b/src/xmpp/session.c
index 93548d89..faffe653 100644
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/session.h b/src/xmpp/session.h
index 62337386..dcd276b3 100644
--- a/src/xmpp/session.h
+++ b/src/xmpp/session.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index db6dd76f..9174bcd2 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h
index 3f369092..49be2d56 100644
--- a/src/xmpp/stanza.h
+++ b/src/xmpp/stanza.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 890df2f3..f9f8d409 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under