diff options
author | James Booth <boothj5@gmail.com> | 2016-07-24 01:22:29 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2016-07-24 01:22:29 +0100 |
commit | 47dfa6c3fc6368a908984d8b3a3840276fe3c9c7 (patch) | |
tree | c0adb41e528eea0542f7c066c0e4728eab0d342f /src/plugins | |
parent | d44472049b6c4bf4ff96315182ad214db693057f (diff) | |
parent | 4ecb4019a616406444e16f53c8ffdbfe8070b2d2 (diff) | |
download | profani-tty-47dfa6c3fc6368a908984d8b3a3840276fe3c9c7.tar.gz |
Merge branch 'master' into python3
Conflicts: .gitignore
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/api.c | 2 | ||||
-rw-r--r-- | src/plugins/api.h | 2 | ||||
-rw-r--r-- | src/plugins/autocompleters.c | 2 | ||||
-rw-r--r-- | src/plugins/autocompleters.h | 2 | ||||
-rw-r--r-- | src/plugins/c_api.c | 3 | ||||
-rw-r--r-- | src/plugins/c_api.h | 2 | ||||
-rw-r--r-- | src/plugins/c_plugins.c | 2 | ||||
-rw-r--r-- | src/plugins/c_plugins.h | 2 | ||||
-rw-r--r-- | src/plugins/callbacks.c | 2 | ||||
-rw-r--r-- | src/plugins/callbacks.h | 2 | ||||
-rw-r--r-- | src/plugins/disco.c | 2 | ||||
-rw-r--r-- | src/plugins/disco.h | 2 | ||||
-rw-r--r-- | src/plugins/plugins.c | 2 | ||||
-rw-r--r-- | src/plugins/plugins.h | 2 | ||||
-rw-r--r-- | src/plugins/profapi.c | 2 | ||||
-rw-r--r-- | src/plugins/profapi.h | 2 | ||||
-rw-r--r-- | src/plugins/python_api.c | 2 | ||||
-rw-r--r-- | src/plugins/python_api.h | 2 | ||||
-rw-r--r-- | src/plugins/python_plugins.c | 2 | ||||
-rw-r--r-- | src/plugins/python_plugins.h | 2 | ||||
-rw-r--r-- | src/plugins/settings.c | 2 | ||||
-rw-r--r-- | src/plugins/settings.h | 2 | ||||
-rw-r--r-- | src/plugins/themes.c | 2 | ||||
-rw-r--r-- | src/plugins/themes.h | 2 |
24 files changed, 25 insertions, 24 deletions
diff --git a/src/plugins/api.c b/src/plugins/api.c index 44182440..e0abeceb 100644 --- a/src/plugins/api.c +++ b/src/plugins/api.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/plugins/api.h b/src/plugins/api.h index b87b9bc5..126facb5 100644 --- a/src/plugins/api.h +++ b/src/plugins/api.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/plugins/autocompleters.c b/src/plugins/autocompleters.c index ab4a70b7..a4dd80e7 100644 --- a/src/plugins/autocompleters.c +++ b/src/plugins/autocompleters.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/plugins/autocompleters.h b/src/plugins/autocompleters.h index 1350ba7c..08b06962 100644 --- a/src/plugins/autocompleters.h +++ b/src/plugins/autocompleters.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/plugins/c_api.c b/src/plugins/c_api.c index 22a2fde4..066f0f56 100644 --- a/src/plugins/c_api.c +++ b/src/plugins/c_api.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 @@ -33,6 +33,7 @@ */ #include <stdlib.h> +#include <string.h> #include <glib.h> #include "log.h" diff --git a/src/plugins/c_api.h b/src/plugins/c_api.h index b822b4ac..2f541e2f 100644 --- a/src/plugins/c_api.h +++ b/src/plugins/c_api.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/plugins/c_plugins.c b/src/plugins/c_plugins.c index 1a4b8754..b9fc74e9 100644 --- a/src/plugins/c_plugins.c +++ b/src/plugins/c_plugins.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/plugins/c_plugins.h b/src/plugins/c_plugins.h index f4f88752..a042fbc1 100644 --- a/src/plugins/c_plugins.h +++ b/src/plugins/c_plugins.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/plugins/callbacks.c b/src/plugins/callbacks.c index c7ea471b..bfe8a3c6 100644 --- a/src/plugins/callbacks.c +++ b/src/plugins/callbacks.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/plugins/callbacks.h b/src/plugins/callbacks.h index 72e5d4e2..8620e47b 100644 --- a/src/plugins/callbacks.h +++ b/src/plugins/callbacks.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/plugins/disco.c b/src/plugins/disco.c index 1d47ad9a..ac9aff6e 100644 --- a/src/plugins/disco.c +++ b/src/plugins/disco.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/plugins/disco.h b/src/plugins/disco.h index 9c7975c2..2f7799ab 100644 --- a/src/plugins/disco.h +++ b/src/plugins/disco.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/plugins/plugins.c b/src/plugins/plugins.c index 23d90fd3..a90940e0 100644 --- a/src/plugins/plugins.c +++ b/src/plugins/plugins.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/plugins/plugins.h b/src/plugins/plugins.h index 28f00ab4..c5cc56c2 100644 --- a/src/plugins/plugins.h +++ b/src/plugins/plugins.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/plugins/profapi.c b/src/plugins/profapi.c index 20b8c26b..bbe570df 100644 --- a/src/plugins/profapi.c +++ b/src/plugins/profapi.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/plugins/profapi.h b/src/plugins/profapi.h index 87bfd6d3..cde726f7 100644 --- a/src/plugins/profapi.h +++ b/src/plugins/profapi.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/plugins/python_api.c b/src/plugins/python_api.c index d65b35e0..0a350335 100644 --- a/src/plugins/python_api.c +++ b/src/plugins/python_api.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/plugins/python_api.h b/src/plugins/python_api.h index 09c52037..27c17a3d 100644 --- a/src/plugins/python_api.h +++ b/src/plugins/python_api.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/plugins/python_plugins.c b/src/plugins/python_plugins.c index 73e2a1ed..61c7573f 100644 --- a/src/plugins/python_plugins.c +++ b/src/plugins/python_plugins.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/plugins/python_plugins.h b/src/plugins/python_plugins.h index facf3ff2..f3ab7bce 100644 --- a/src/plugins/python_plugins.h +++ b/src/plugins/python_plugins.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/plugins/settings.c b/src/plugins/settings.c index 08d982d0..d75152a8 100644 --- a/src/plugins/settings.c +++ b/src/plugins/settings.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/plugins/settings.h b/src/plugins/settings.h index 6fb66844..2c91b0c9 100644 --- a/src/plugins/settings.h +++ b/src/plugins/settings.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/plugins/themes.c b/src/plugins/themes.c index 229bfd8f..60e1f11a 100644 --- a/src/plugins/themes.c +++ b/src/plugins/themes.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/plugins/themes.h b/src/plugins/themes.h index 6dfcfe41..9c3c4a8c 100644 --- a/src/plugins/themes.h +++ b/src/plugins/themes.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 |