mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into configure
This commit is contained in:
commit
2af8e9f117
@ -1,9 +1,11 @@
|
|||||||
|
dist: trusty
|
||||||
|
sudo: required
|
||||||
language: c
|
language: c
|
||||||
install:
|
install:
|
||||||
- lsb_release -a
|
- lsb_release -a
|
||||||
- uname -a
|
- uname -a
|
||||||
- sudo apt-get update
|
- sudo apt-get update
|
||||||
- sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev
|
- sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev
|
||||||
- git clone git://github.com/boothj5/libmesode.git
|
- git clone git://github.com/boothj5/libmesode.git
|
||||||
- cd libmesode
|
- cd libmesode
|
||||||
- mkdir m4
|
- mkdir m4
|
||||||
|
@ -9,8 +9,11 @@
|
|||||||
- Add prof.get_room_nick plugins api function
|
- Add prof.get_room_nick plugins api function
|
||||||
- Add main.help.header theme option
|
- Add main.help.header theme option
|
||||||
- Look for system TLS certificate path by default (/tls certpath)
|
- Look for system TLS certificate path by default (/tls certpath)
|
||||||
|
- Use service discovery to set account muc property
|
||||||
|
- Allow clearing account muc and resource properties
|
||||||
- Allow plugins to complete file paths with prof.filepath_completer_add function
|
- Allow plugins to complete file paths with prof.filepath_completer_add function
|
||||||
- Add encryption settings functions to plugins api
|
- Add encryption settings functions to plugins api
|
||||||
|
- Allow plugins to block message sending on pre message send hooks
|
||||||
- Bug fixes: https://github.com/boothj5/profanity/milestone/15?closed=1
|
- Bug fixes: https://github.com/boothj5/profanity/milestone/15?closed=1
|
||||||
|
|
||||||
0.5.0
|
0.5.0
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Profanity
|
Profanity
|
||||||
Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
|
|
||||||
Profanity is free software: you can redistribute it and/or modify
|
Profanity is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -245,7 +245,7 @@ endif
|
|||||||
|
|
||||||
man_MANS = $(man_sources)
|
man_MANS = $(man_sources)
|
||||||
|
|
||||||
EXTRA_DIST = $(man_sources) $(icons_sources) $(themes_sources) $(script_sources) profrc.example LICENSE.txt
|
EXTRA_DIST = $(man_sources) $(icons_sources) $(themes_sources) $(script_sources) profrc.example LICENSE.txt README.md CHANGELOG
|
||||||
|
|
||||||
if INCLUDE_GIT_VERSION
|
if INCLUDE_GIT_VERSION
|
||||||
EXTRA_DIST += .git/HEAD .git/index
|
EXTRA_DIST += .git/HEAD .git/index
|
||||||
|
@ -48,7 +48,7 @@ master_doc = 'index'
|
|||||||
|
|
||||||
# General information about the project.
|
# General information about the project.
|
||||||
project = u'Profanity Python Plugins API'
|
project = u'Profanity Python Plugins API'
|
||||||
copyright = u'2016, boothj5'
|
copyright = u'2016 - 2017, boothj5'
|
||||||
author = u'boothj5'
|
author = u'boothj5'
|
||||||
|
|
||||||
# The version info for the project you're documenting, acts as replacement for
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
|
@ -151,8 +151,8 @@ AS_IF([test "x$ncurses_cv_wget_wch" != xyes],
|
|||||||
[AC_MSG_ERROR([ncurses does not support wide characters])])
|
[AC_MSG_ERROR([ncurses does not support wide characters])])
|
||||||
|
|
||||||
### Check for other profanity dependencies
|
### Check for other profanity dependencies
|
||||||
PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
|
PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40], [],
|
||||||
[AC_MSG_ERROR([glib 2.26 or higher is required for profanity])])
|
[AC_MSG_ERROR([glib 2.40 or higher is required for profanity])])
|
||||||
PKG_CHECK_MODULES([curl], [libcurl], [],
|
PKG_CHECK_MODULES([curl], [libcurl], [],
|
||||||
[AC_CHECK_LIB([curl], [main], [],
|
[AC_CHECK_LIB([curl], [main], [],
|
||||||
[AC_MSG_ERROR([libcurl is required for profanity])])])
|
[AC_MSG_ERROR([libcurl is required for profanity])])])
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.TH Profanity 1 "August 2016" "Profanity XMPP client"
|
.TH Profanity 1 "January 2017" "Profanity XMPP client"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
Profanity \- a simple console based XMPP chat client.
|
Profanity \- a simple console based XMPP chat client.
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -62,7 +62,7 @@ or by sending a mail directly to:
|
|||||||
.br
|
.br
|
||||||
.PP
|
.PP
|
||||||
.SH LICENSE
|
.SH LICENSE
|
||||||
Copyright (C) 2012 \- 2016 James Booth <boothj5web@gmail.com>.
|
Copyright (C) 2012 \- 2017 James Booth <boothj5web@gmail.com>.
|
||||||
License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>
|
License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>
|
||||||
This is free software; you are free to change and redistribute it.
|
This is free software; you are free to change and redistribute it.
|
||||||
There is NO WARRANTY, to the extent permitted by law.
|
There is NO WARRANTY, to the extent permitted by law.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* cmd_ac.c
|
* cmd_ac.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -184,6 +184,7 @@ static Autocomplete console_ac;
|
|||||||
static Autocomplete console_msg_ac;
|
static Autocomplete console_msg_ac;
|
||||||
static Autocomplete autoping_ac;
|
static Autocomplete autoping_ac;
|
||||||
static Autocomplete plugins_ac;
|
static Autocomplete plugins_ac;
|
||||||
|
static Autocomplete plugins_sourcepath_ac;
|
||||||
static Autocomplete plugins_load_ac;
|
static Autocomplete plugins_load_ac;
|
||||||
static Autocomplete plugins_unload_ac;
|
static Autocomplete plugins_unload_ac;
|
||||||
static Autocomplete plugins_reload_ac;
|
static Autocomplete plugins_reload_ac;
|
||||||
@ -714,6 +715,11 @@ cmd_ac_init(void)
|
|||||||
autocomplete_add(plugins_ac, "unload");
|
autocomplete_add(plugins_ac, "unload");
|
||||||
autocomplete_add(plugins_ac, "reload");
|
autocomplete_add(plugins_ac, "reload");
|
||||||
autocomplete_add(plugins_ac, "python_version");
|
autocomplete_add(plugins_ac, "python_version");
|
||||||
|
autocomplete_add(plugins_ac, "sourcepath");
|
||||||
|
|
||||||
|
plugins_sourcepath_ac = autocomplete_new();
|
||||||
|
autocomplete_add(plugins_sourcepath_ac, "set");
|
||||||
|
autocomplete_add(plugins_sourcepath_ac, "clear");
|
||||||
|
|
||||||
filepath_ac = autocomplete_new();
|
filepath_ac = autocomplete_new();
|
||||||
|
|
||||||
@ -1011,6 +1017,7 @@ cmd_ac_reset(ProfWin *window)
|
|||||||
autocomplete_reset(console_msg_ac);
|
autocomplete_reset(console_msg_ac);
|
||||||
autocomplete_reset(autoping_ac);
|
autocomplete_reset(autoping_ac);
|
||||||
autocomplete_reset(plugins_ac);
|
autocomplete_reset(plugins_ac);
|
||||||
|
autocomplete_reset(plugins_sourcepath_ac);
|
||||||
autocomplete_reset(blocked_ac);
|
autocomplete_reset(blocked_ac);
|
||||||
autocomplete_reset(tray_ac);
|
autocomplete_reset(tray_ac);
|
||||||
autocomplete_reset(presence_ac);
|
autocomplete_reset(presence_ac);
|
||||||
@ -2025,10 +2032,21 @@ _plugins_autocomplete(ProfWin *window, const char *const input)
|
|||||||
{
|
{
|
||||||
char *result = NULL;
|
char *result = NULL;
|
||||||
|
|
||||||
|
if (strncmp(input, "/plugins sourcepath set ", 24) == 0) {
|
||||||
|
return cmd_ac_complete_filepath(input, "/plugins sourcepath set");
|
||||||
|
}
|
||||||
|
|
||||||
if (strncmp(input, "/plugins install ", 17) == 0) {
|
if (strncmp(input, "/plugins install ", 17) == 0) {
|
||||||
return cmd_ac_complete_filepath(input, "/plugins install");
|
return cmd_ac_complete_filepath(input, "/plugins install");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (strncmp(input, "/plugins sourcepath ", 20) == 0) {
|
||||||
|
result = autocomplete_param_with_ac(input, "/plugins sourcepath", plugins_sourcepath_ac, TRUE);
|
||||||
|
if (result) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (strncmp(input, "/plugins load ", 14) == 0) {
|
if (strncmp(input, "/plugins load ", 14) == 0) {
|
||||||
if (plugins_load_ac == NULL) {
|
if (plugins_load_ac == NULL) {
|
||||||
plugins_load_ac = autocomplete_new();
|
plugins_load_ac = autocomplete_new();
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* cmd_ac.h
|
* cmd_ac.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* cmd_defs.c
|
* cmd_defs.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -576,7 +576,7 @@ static struct cmd_t command_defs[] =
|
|||||||
CMD_SYN(
|
CMD_SYN(
|
||||||
"/leave")
|
"/leave")
|
||||||
CMD_DESC(
|
CMD_DESC(
|
||||||
"Leave the current chat room.")
|
"Leave the current chat or room.")
|
||||||
CMD_NOARGS
|
CMD_NOARGS
|
||||||
CMD_NOEXAMPLES
|
CMD_NOEXAMPLES
|
||||||
},
|
},
|
||||||
@ -1580,7 +1580,7 @@ static struct cmd_t command_defs[] =
|
|||||||
CMD_EXAMPLES(
|
CMD_EXAMPLES(
|
||||||
"/alias add friends /who online friends",
|
"/alias add friends /who online friends",
|
||||||
"/alias add /q /quit",
|
"/alias add /q /quit",
|
||||||
"/alias a /away \"I'm in a meeting.\"",
|
"/alias add a /away \"I'm in a meeting.\"",
|
||||||
"/alias remove q",
|
"/alias remove q",
|
||||||
"/alias list")
|
"/alias list")
|
||||||
},
|
},
|
||||||
@ -2046,26 +2046,38 @@ static struct cmd_t command_defs[] =
|
|||||||
},
|
},
|
||||||
|
|
||||||
{ "/plugins",
|
{ "/plugins",
|
||||||
parse_args, 0, 2, NULL,
|
parse_args, 0, 3, NULL,
|
||||||
CMD_NOSUBFUNCS
|
CMD_SUBFUNCS(
|
||||||
|
{ "sourcepath", cmd_plugins_sourcepath },
|
||||||
|
{ "install", cmd_plugins_install },
|
||||||
|
{ "load", cmd_plugins_load },
|
||||||
|
{ "unload", cmd_plugins_unload },
|
||||||
|
{ "reload", cmd_plugins_reload },
|
||||||
|
{ "python_version", cmd_plugins_python_version })
|
||||||
CMD_MAINFUNC(cmd_plugins)
|
CMD_MAINFUNC(cmd_plugins)
|
||||||
CMD_NOTAGS
|
CMD_NOTAGS
|
||||||
CMD_SYN(
|
CMD_SYN(
|
||||||
"/plugins",
|
"/plugins",
|
||||||
"/plugins install <path>",
|
"/plugins sourcepath set <path>",
|
||||||
"/plugins unload <plugin>",
|
"/plugins sourcepath clear",
|
||||||
"/plugins load <plugin>",
|
"/plugins install [<path>]",
|
||||||
|
"/plugins unload [<plugin>]",
|
||||||
|
"/plugins load [<plugin>]",
|
||||||
"/plugins reload [<plugin>]",
|
"/plugins reload [<plugin>]",
|
||||||
"/plugins python_version")
|
"/plugins python_version")
|
||||||
CMD_DESC(
|
CMD_DESC(
|
||||||
"Manage plugins. Passing no arguments lists currently loaded plugins.")
|
"Manage plugins. Passing no arguments lists currently loaded plugins.")
|
||||||
CMD_ARGS(
|
CMD_ARGS(
|
||||||
{ "install <file>", "Install file to plugins directory, and load or reload the plugin." },
|
{ "sourcepath set <path>", "Set the default path to install plugins from, will be used if no arg is passed to /plugins install." },
|
||||||
{ "load <plugin>", "Load a plugin that already exists in the plugin directory." },
|
{ "sourcepath clear", "Clear the default plugins source path." },
|
||||||
{ "unload <plugin>", "Unload a loaded plugin." },
|
{ "install [<path>]", "Install a plugin, or all plugins found in a directory (recursive). Passing no argument will use the sourcepath if one is set." },
|
||||||
|
{ "load [<plugin>]", "Load a plugin that already exists in the plugin directory, passing no argument loads all found plugins." },
|
||||||
|
{ "unload [<plugin>]", "Unload a loaded plugin, passing no argument will unload all plugins." },
|
||||||
{ "reload [<plugin>]", "Reload a plugin, passing no argument will reload all plugins." },
|
{ "reload [<plugin>]", "Reload a plugin, passing no argument will reload all plugins." },
|
||||||
{ "python_version", "Show the Python interpreter version." })
|
{ "python_version", "Show the Python interpreter version." })
|
||||||
CMD_EXAMPLES(
|
CMD_EXAMPLES(
|
||||||
|
"/plugins sourcepath set /home/meee/projects/profanity-plugins",
|
||||||
|
"/plugins install",
|
||||||
"/plugins install /home/steveharris/Downloads/metal.py",
|
"/plugins install /home/steveharris/Downloads/metal.py",
|
||||||
"/plugins load browser.py",
|
"/plugins load browser.py",
|
||||||
"/plugins unload say.py",
|
"/plugins unload say.py",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* cmd_defs.h
|
* cmd_defs.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* cmd_funcs.c
|
* cmd_funcs.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -4756,24 +4756,14 @@ cmd_clear(ProfWin *window, const char *const command, gchar **args)
|
|||||||
gboolean
|
gboolean
|
||||||
cmd_leave(ProfWin *window, const char *const command, gchar **args)
|
cmd_leave(ProfWin *window, const char *const command, gchar **args)
|
||||||
{
|
{
|
||||||
jabber_conn_status_t conn_status = connection_get_status();
|
if (window->type != WIN_MUC && window->type != WIN_CHAT && window->type != WIN_PRIVATE) {
|
||||||
int index = wins_get_current_num();
|
cons_show("The /leave command is only valid in chat, or chat room windows.");
|
||||||
|
|
||||||
if (window->type != WIN_MUC) {
|
|
||||||
cons_show("You can only use the /leave command in a chat room.");
|
|
||||||
cons_alert();
|
cons_alert();
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// handle leaving rooms, or chat
|
// use /close behaviour
|
||||||
if (conn_status == JABBER_CONNECTED) {
|
return cmd_close(window, "/leave", args);
|
||||||
ui_close_connected_win(index);
|
|
||||||
}
|
|
||||||
|
|
||||||
// close the window
|
|
||||||
ui_close_win(index);
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
@ -6212,44 +6202,91 @@ cmd_xa(ProfWin *window, const char *const command, gchar **args)
|
|||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
cmd_plugins(ProfWin *window, const char *const command, gchar **args)
|
cmd_plugins_sourcepath(ProfWin *window, const char *const command, gchar **args)
|
||||||
{
|
{
|
||||||
if (g_strcmp0(args[0], "install") == 0) {
|
if (args[1] == NULL) {
|
||||||
char *filename = args[1];
|
char *sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH);
|
||||||
if (filename == NULL) {
|
if (sourcepath) {
|
||||||
|
cons_show("Current plugins sourcepath: %s", sourcepath);
|
||||||
|
prefs_free_string(sourcepath);
|
||||||
|
} else {
|
||||||
|
cons_show("Plugins sourcepath not currently set.");
|
||||||
|
}
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (g_strcmp0(args[1], "clear") == 0) {
|
||||||
|
prefs_set_string(PREF_PLUGINS_SOURCEPATH, NULL);
|
||||||
|
cons_show("Plugins sourcepath cleared.");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (g_strcmp0(args[1], "set") == 0) {
|
||||||
|
char *path = args[2];
|
||||||
|
if (path == NULL) {
|
||||||
cons_bad_cmd_usage(command);
|
cons_bad_cmd_usage(command);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// expand ~ to $HOME
|
// expand ~ to $HOME
|
||||||
if (filename[0] == '~' && filename[1] == '/') {
|
if (path[0] == '~' && path[1] == '/') {
|
||||||
if (asprintf(&filename, "%s/%s", getenv("HOME"), filename+2) == -1) {
|
if (asprintf(&path, "%s/%s", getenv("HOME"), path+2) == -1) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
filename = strdup(filename);
|
path = strdup(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access(filename, R_OK) != 0) {
|
if (!is_dir(path)) {
|
||||||
cons_show("File not found: %s", filename);
|
cons_show("Plugins sourcepath must be a directory.");
|
||||||
free(filename);
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_regular_file(filename)) {
|
cons_show("Setting plugins sourcepath: %s", path);
|
||||||
cons_show("Not a file: %s", filename);
|
prefs_set_string(PREF_PLUGINS_SOURCEPATH, path);
|
||||||
free(filename);
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!g_str_has_suffix(filename, ".py") && !g_str_has_suffix(filename, ".so")) {
|
cons_bad_cmd_usage(command);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
cmd_plugins_install(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
{
|
||||||
|
char *path = args[1];
|
||||||
|
if (path == NULL) {
|
||||||
|
char* sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH);
|
||||||
|
if (sourcepath) {
|
||||||
|
path = strdup(sourcepath);
|
||||||
|
prefs_free_string(sourcepath);
|
||||||
|
} else {
|
||||||
|
cons_show("Either a path must be provided or the sourcepath property must be set, see /help plugins");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
} else if (path[0] == '~' && path[1] == '/') {
|
||||||
|
if (asprintf(&path, "%s/%s", getenv("HOME"), path+2) == -1) {
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
path = strdup(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (access(path, R_OK) != 0) {
|
||||||
|
cons_show("File not found: %s", path);
|
||||||
|
free(path);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_regular_file(path)) {
|
||||||
|
if (!g_str_has_suffix(path, ".py") && !g_str_has_suffix(path, ".so")) {
|
||||||
cons_show("Plugins must have one of the following extensions: '.py' '.so'");
|
cons_show("Plugins must have one of the following extensions: '.py' '.so'");
|
||||||
free(filename);
|
free(path);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
gchar *plugin_name = g_path_get_basename(filename);
|
gchar *plugin_name = g_path_get_basename(path);
|
||||||
gboolean result = plugins_install(plugin_name, filename);
|
gboolean result = plugins_install(plugin_name, path);
|
||||||
if (result) {
|
if (result) {
|
||||||
cons_show("Plugin installed: %s", plugin_name);
|
cons_show("Plugin installed: %s", plugin_name);
|
||||||
} else {
|
} else {
|
||||||
@ -6257,13 +6294,62 @@ cmd_plugins(ProfWin *window, const char *const command, gchar **args)
|
|||||||
}
|
}
|
||||||
g_free(plugin_name);
|
g_free(plugin_name);
|
||||||
|
|
||||||
free(filename);
|
free(path);
|
||||||
return TRUE;
|
|
||||||
} else if (g_strcmp0(args[0], "load") == 0) {
|
|
||||||
if (args[1] == NULL) {
|
|
||||||
cons_bad_cmd_usage(command);
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (is_dir(path)) {
|
||||||
|
PluginsInstallResult* result = plugins_install_all(path);
|
||||||
|
if (result->installed || result->failed) {
|
||||||
|
if (result->installed) {
|
||||||
|
cons_show("");
|
||||||
|
cons_show("Installed plugins:");
|
||||||
|
GSList *curr = result->installed;
|
||||||
|
while (curr) {
|
||||||
|
cons_show(" %s", curr->data);
|
||||||
|
curr = g_slist_next(curr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (result->failed) {
|
||||||
|
cons_show("");
|
||||||
|
cons_show("Failed installs:");
|
||||||
|
GSList *curr = result->failed;
|
||||||
|
while (curr) {
|
||||||
|
cons_show(" %s", curr->data);
|
||||||
|
curr = g_slist_next(curr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
cons_show("No plugins found in: %s", path);
|
||||||
|
}
|
||||||
|
free(path);
|
||||||
|
plugins_free_install_result(result);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
cons_show("Argument must be a file or directory.");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
cmd_plugins_load(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
{
|
||||||
|
if (args[1] == NULL) {
|
||||||
|
GSList *loaded = plugins_load_all();
|
||||||
|
if (loaded) {
|
||||||
|
cons_show("Loaded plugins:");
|
||||||
|
GSList *curr = loaded;
|
||||||
|
while (curr) {
|
||||||
|
cons_show(" %s", curr->data);
|
||||||
|
curr = g_slist_next(curr);
|
||||||
|
}
|
||||||
|
g_slist_free_full(loaded, g_free);
|
||||||
|
} else {
|
||||||
|
cons_show("No plugins loaded.");
|
||||||
|
}
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean res = plugins_load(args[1]);
|
gboolean res = plugins_load(args[1]);
|
||||||
if (res) {
|
if (res) {
|
||||||
cons_show("Loaded plugin: %s", args[1]);
|
cons_show("Loaded plugin: %s", args[1]);
|
||||||
@ -6272,11 +6358,21 @@ cmd_plugins(ProfWin *window, const char *const command, gchar **args)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
} else if (g_strcmp0(args[0], "unload") == 0) {
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
cmd_plugins_unload(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
{
|
||||||
if (args[1] == NULL) {
|
if (args[1] == NULL) {
|
||||||
cons_bad_cmd_usage(command);
|
gboolean res = plugins_unload_all();
|
||||||
|
if (res) {
|
||||||
|
cons_show("Unloaded all plugins.");
|
||||||
|
} else {
|
||||||
|
cons_show("No plugins unloaded.");
|
||||||
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean res = plugins_unload(args[1]);
|
gboolean res = plugins_unload(args[1]);
|
||||||
if (res) {
|
if (res) {
|
||||||
cons_show("Unloaded plugin: %s", args[1]);
|
cons_show("Unloaded plugin: %s", args[1]);
|
||||||
@ -6285,21 +6381,30 @@ cmd_plugins(ProfWin *window, const char *const command, gchar **args)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
} else if (g_strcmp0(args[0], "reload") == 0) {
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
cmd_plugins_reload(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
{
|
||||||
if (args[1] == NULL) {
|
if (args[1] == NULL) {
|
||||||
plugins_reload_all();
|
plugins_reload_all();
|
||||||
cons_show("Reloaded all plugins");
|
cons_show("Reloaded all plugins");
|
||||||
} else {
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean res = plugins_reload(args[1]);
|
gboolean res = plugins_reload(args[1]);
|
||||||
if (res) {
|
if (res) {
|
||||||
cons_show("Reloaded plugin: %s", args[1]);
|
cons_show("Reloaded plugin: %s", args[1]);
|
||||||
} else {
|
} else {
|
||||||
cons_show("Failed to reload plugin: %s", args[1]);
|
cons_show("Failed to reload plugin: %s", args[1]);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
} else if (g_strcmp0(args[0], "python_version") == 0) {
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
cmd_plugins_python_version(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
{
|
||||||
#ifdef HAVE_PYTHON
|
#ifdef HAVE_PYTHON
|
||||||
const char *version = python_get_version();
|
const char *version = python_get_version();
|
||||||
cons_show("Python version:");
|
cons_show("Python version:");
|
||||||
@ -6308,8 +6413,11 @@ cmd_plugins(ProfWin *window, const char *const command, gchar **args)
|
|||||||
cons_show("This build does not support pytyon plugins.");
|
cons_show("This build does not support pytyon plugins.");
|
||||||
#endif
|
#endif
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
gboolean
|
||||||
|
cmd_plugins(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
{
|
||||||
GList *plugins = plugins_loaded_list();
|
GList *plugins = plugins_loaded_list();
|
||||||
if (plugins == NULL) {
|
if (plugins == NULL) {
|
||||||
cons_show("No plugins installed.");
|
cons_show("No plugins installed.");
|
||||||
@ -6326,7 +6434,6 @@ cmd_plugins(ProfWin *window, const char *const command, gchar **args)
|
|||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
cmd_pgp(ProfWin *window, const char *const command, gchar **args)
|
cmd_pgp(ProfWin *window, const char *const command, gchar **args)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* cmd_funcs.h
|
* cmd_funcs.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -158,7 +158,15 @@ gboolean cmd_script(ProfWin *window, const char *const command, gchar **args);
|
|||||||
gboolean cmd_export(ProfWin *window, const char *const command, gchar **args);
|
gboolean cmd_export(ProfWin *window, const char *const command, gchar **args);
|
||||||
gboolean cmd_charset(ProfWin *window, const char *const command, gchar **args);
|
gboolean cmd_charset(ProfWin *window, const char *const command, gchar **args);
|
||||||
gboolean cmd_console(ProfWin *window, const char *const command, gchar **args);
|
gboolean cmd_console(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
|
||||||
gboolean cmd_plugins(ProfWin *window, const char *const command, gchar **args);
|
gboolean cmd_plugins(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
gboolean cmd_plugins_sourcepath(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
gboolean cmd_plugins_install(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
gboolean cmd_plugins_load(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
gboolean cmd_plugins_unload(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
gboolean cmd_plugins_reload(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
gboolean cmd_plugins_python_version(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
|
||||||
gboolean cmd_blocked(ProfWin *window, const char *const command, gchar **args);
|
gboolean cmd_blocked(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
|
||||||
gboolean cmd_account(ProfWin *window, const char *const command, gchar **args);
|
gboolean cmd_account(ProfWin *window, const char *const command, gchar **args);
|
||||||
|
114
src/common.c
114
src/common.c
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* common.c
|
* common.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -67,54 +67,6 @@ static unsigned long unique_id = 0;
|
|||||||
|
|
||||||
static size_t _data_callback(void *ptr, size_t size, size_t nmemb, void *data);
|
static size_t _data_callback(void *ptr, size_t size, size_t nmemb, void *data);
|
||||||
|
|
||||||
// taken from glib 2.30.3
|
|
||||||
gchar*
|
|
||||||
p_utf8_substring(const gchar *str, glong start_pos, glong end_pos)
|
|
||||||
{
|
|
||||||
gchar *start, *end, *out;
|
|
||||||
|
|
||||||
start = g_utf8_offset_to_pointer (str, start_pos);
|
|
||||||
end = g_utf8_offset_to_pointer (start, end_pos - start_pos);
|
|
||||||
|
|
||||||
out = g_malloc (end - start + 1);
|
|
||||||
memcpy (out, start, end - start);
|
|
||||||
out[end - start] = 0;
|
|
||||||
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
p_slist_free_full(GSList *items, GDestroyNotify free_func)
|
|
||||||
{
|
|
||||||
g_slist_foreach (items, (GFunc) free_func, NULL);
|
|
||||||
g_slist_free (items);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
p_list_free_full(GList *items, GDestroyNotify free_func)
|
|
||||||
{
|
|
||||||
g_list_foreach (items, (GFunc) free_func, NULL);
|
|
||||||
g_list_free (items);
|
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
|
||||||
p_hash_table_add(GHashTable *hash_table, gpointer key)
|
|
||||||
{
|
|
||||||
// doesn't handle when key exists, but value == NULL
|
|
||||||
gpointer found = g_hash_table_lookup(hash_table, key);
|
|
||||||
g_hash_table_replace(hash_table, key, key);
|
|
||||||
|
|
||||||
return (found == NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
|
||||||
p_hash_table_contains(GHashTable *hash_table, gconstpointer key)
|
|
||||||
{
|
|
||||||
// doesn't handle when key exists, but value == NULL
|
|
||||||
gpointer found = g_hash_table_lookup(hash_table, key);
|
|
||||||
return (found != NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
create_dir(char *name)
|
create_dir(char *name)
|
||||||
{
|
{
|
||||||
@ -509,13 +461,18 @@ prof_occurrences(const char *const needle, const char *const haystack, int offse
|
|||||||
return *result;
|
return *result;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_str_has_prefix(&haystack[offset], needle)) {
|
gchar *haystack_curr = g_utf8_offset_to_pointer(haystack, offset);
|
||||||
|
if (g_str_has_prefix(haystack_curr, needle)) {
|
||||||
if (whole_word) {
|
if (whole_word) {
|
||||||
char *prev = g_utf8_prev_char(&haystack[offset]);
|
gchar *needle_last_ch = g_utf8_offset_to_pointer(needle, g_utf8_strlen(needle, -1)- 1);
|
||||||
char *next = g_utf8_next_char(&haystack[offset] + strlen(needle) - 1);
|
int needle_last_ch_len = mblen(needle_last_ch, MB_CUR_MAX);
|
||||||
gunichar prevu = g_utf8_get_char(prev);
|
|
||||||
gunichar nextu = g_utf8_get_char(next);
|
gchar *haystack_before_ch = g_utf8_prev_char(haystack_curr);
|
||||||
if (!g_unichar_isalnum(prevu) && !g_unichar_isalnum(nextu)) {
|
gchar *haystack_after_ch = g_utf8_next_char(haystack_curr + strlen(needle) - needle_last_ch_len);
|
||||||
|
|
||||||
|
gunichar before = g_utf8_get_char(haystack_before_ch);
|
||||||
|
gunichar after = g_utf8_get_char(haystack_after_ch);
|
||||||
|
if (!g_unichar_isalnum(before) && !g_unichar_isalnum(after)) {
|
||||||
*result = g_slist_append(*result, GINT_TO_POINTER(offset));
|
*result = g_slist_append(*result, GINT_TO_POINTER(offset));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -523,10 +480,53 @@ prof_occurrences(const char *const needle, const char *const haystack, int offse
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (haystack[offset+1] != '\0') {
|
offset++;
|
||||||
*result = prof_occurrences(needle, haystack, offset+1, whole_word, result);
|
if (g_strcmp0(g_utf8_offset_to_pointer(haystack, offset), "\0") != 0) {
|
||||||
|
*result = prof_occurrences(needle, haystack, offset, whole_word, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
return *result;
|
return *result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
is_regular_file(const char *path)
|
||||||
|
{
|
||||||
|
struct stat st;
|
||||||
|
stat(path, &st);
|
||||||
|
return S_ISREG(st.st_mode);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
is_dir(const char *path)
|
||||||
|
{
|
||||||
|
struct stat st;
|
||||||
|
stat(path, &st);
|
||||||
|
return S_ISDIR(st.st_mode);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
get_file_paths_recursive(const char *path, GSList **contents)
|
||||||
|
{
|
||||||
|
if (!is_dir(path)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
GDir* directory = g_dir_open(path, 0, NULL);
|
||||||
|
const gchar *entry = g_dir_read_name(directory);
|
||||||
|
while (entry) {
|
||||||
|
GString *full = g_string_new(path);
|
||||||
|
if (!g_str_has_suffix(full->str, "/")) {
|
||||||
|
g_string_append(full, "/");
|
||||||
|
}
|
||||||
|
g_string_append(full, entry);
|
||||||
|
|
||||||
|
if (is_dir(full->str)) {
|
||||||
|
get_file_paths_recursive(full->str, contents);
|
||||||
|
} else if (is_regular_file(full->str)) {
|
||||||
|
*contents = g_slist_append(*contents, full->str);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_string_free(full, FALSE);
|
||||||
|
entry = g_dir_read_name(directory);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
26
src/common.h
26
src/common.h
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* common.h
|
* common.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -40,20 +40,6 @@
|
|||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#if !GLIB_CHECK_VERSION(2,28,0)
|
|
||||||
#define g_slist_free_full(items, free_func) p_slist_free_full(items, free_func)
|
|
||||||
#define g_list_free_full(items, free_func) p_list_free_full(items, free_func)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !GLIB_CHECK_VERSION(2,30,0)
|
|
||||||
#define g_utf8_substring(str, start_pos, end_pos) p_utf8_substring(str, start_pos, end_pos)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !GLIB_CHECK_VERSION(2,32,0)
|
|
||||||
#define g_hash_table_add(hash_table, key) p_hash_table_add(hash_table, key)
|
|
||||||
#define g_hash_table_contains(hash_table, key) p_hash_table_contains(hash_table, key)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef NOTIFY_CHECK_VERSION
|
#ifndef NOTIFY_CHECK_VERSION
|
||||||
#define notify_notification_new(summary, body, icon) notify_notification_new(summary, body, icon, NULL)
|
#define notify_notification_new(summary, body, icon) notify_notification_new(summary, body, icon, NULL)
|
||||||
#endif
|
#endif
|
||||||
@ -94,12 +80,6 @@ typedef enum {
|
|||||||
RESOURCE_XA
|
RESOURCE_XA
|
||||||
} resource_presence_t;
|
} resource_presence_t;
|
||||||
|
|
||||||
gchar* p_utf8_substring(const gchar *str, glong start_pos, glong end_pos);
|
|
||||||
void p_slist_free_full(GSList *items, GDestroyNotify free_func);
|
|
||||||
void p_list_free_full(GList *items, GDestroyNotify free_func);
|
|
||||||
gboolean p_hash_table_add(GHashTable *hash_table, gpointer key);
|
|
||||||
gboolean p_hash_table_contains(GHashTable *hash_table, gconstpointer key);
|
|
||||||
|
|
||||||
gboolean create_dir(char *name);
|
gboolean create_dir(char *name);
|
||||||
gboolean mkdir_recursive(const char *dir);
|
gboolean mkdir_recursive(const char *dir);
|
||||||
gboolean copy_file(const char *const src, const char *const target);
|
gboolean copy_file(const char *const src, const char *const target);
|
||||||
@ -123,4 +103,8 @@ gboolean is_notify_enabled(void);
|
|||||||
GSList* prof_occurrences(const char *const needle, const char *const haystack, int offset, gboolean whole_word,
|
GSList* prof_occurrences(const char *const needle, const char *const haystack, int offset, gboolean whole_word,
|
||||||
GSList **result);
|
GSList **result);
|
||||||
|
|
||||||
|
int is_regular_file(const char *path);
|
||||||
|
int is_dir(const char *path);
|
||||||
|
void get_file_paths_recursive(const char *directory, GSList **contents);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* account.c
|
* account.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* account.h
|
* account.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* accounts.c
|
* accounts.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* accounts.h
|
* accounts.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* conflists.c
|
* conflists.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* conflists.h
|
* conflists.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* files.c
|
* files.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* files.h
|
* files.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* preferences.c
|
* preferences.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -59,6 +59,7 @@
|
|||||||
#define PREF_GROUP_OTR "otr"
|
#define PREF_GROUP_OTR "otr"
|
||||||
#define PREF_GROUP_PGP "pgp"
|
#define PREF_GROUP_PGP "pgp"
|
||||||
#define PREF_GROUP_MUC "muc"
|
#define PREF_GROUP_MUC "muc"
|
||||||
|
#define PREF_GROUP_PLUGINS "plugins"
|
||||||
|
|
||||||
#define INPBLOCK_DEFAULT 1000
|
#define INPBLOCK_DEFAULT 1000
|
||||||
|
|
||||||
@ -665,27 +666,27 @@ prefs_get_tray_timer(void)
|
|||||||
gchar**
|
gchar**
|
||||||
prefs_get_plugins(void)
|
prefs_get_plugins(void)
|
||||||
{
|
{
|
||||||
if (!g_key_file_has_group(prefs, "plugins")) {
|
if (!g_key_file_has_group(prefs, PREF_GROUP_PLUGINS)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (!g_key_file_has_key(prefs, "plugins", "load", NULL)) {
|
if (!g_key_file_has_key(prefs, PREF_GROUP_PLUGINS, "load", NULL)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return g_key_file_get_string_list(prefs, "plugins", "load", NULL, NULL);
|
return g_key_file_get_string_list(prefs, PREF_GROUP_PLUGINS, "load", NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
prefs_add_plugin(const char *const name)
|
prefs_add_plugin(const char *const name)
|
||||||
{
|
{
|
||||||
conf_string_list_add(prefs, "plugins", "load", name);
|
conf_string_list_add(prefs, PREF_GROUP_PLUGINS, "load", name);
|
||||||
_save_prefs();
|
_save_prefs();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
prefs_remove_plugin(const char *const name)
|
prefs_remove_plugin(const char *const name)
|
||||||
{
|
{
|
||||||
conf_string_list_remove(prefs, "plugins", "load", name);
|
conf_string_list_remove(prefs, PREF_GROUP_PLUGINS, "load", name);
|
||||||
_save_prefs();
|
_save_prefs();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1614,6 +1615,8 @@ _get_group(preference_t pref)
|
|||||||
return PREF_GROUP_PGP;
|
return PREF_GROUP_PGP;
|
||||||
case PREF_BOOKMARK_INVITE:
|
case PREF_BOOKMARK_INVITE:
|
||||||
return PREF_GROUP_MUC;
|
return PREF_GROUP_MUC;
|
||||||
|
case PREF_PLUGINS_SOURCEPATH:
|
||||||
|
return PREF_GROUP_PLUGINS;
|
||||||
default:
|
default:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -1814,6 +1817,8 @@ _get_key(preference_t pref)
|
|||||||
return "console.chat";
|
return "console.chat";
|
||||||
case PREF_BOOKMARK_INVITE:
|
case PREF_BOOKMARK_INVITE:
|
||||||
return "bookmark.invite";
|
return "bookmark.invite";
|
||||||
|
case PREF_PLUGINS_SOURCEPATH:
|
||||||
|
return "sourcepath";
|
||||||
default:
|
default:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* preferences.h
|
* preferences.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -141,6 +141,7 @@ typedef enum {
|
|||||||
PREF_CONSOLE_PRIVATE,
|
PREF_CONSOLE_PRIVATE,
|
||||||
PREF_CONSOLE_CHAT,
|
PREF_CONSOLE_CHAT,
|
||||||
PREF_BOOKMARK_INVITE,
|
PREF_BOOKMARK_INVITE,
|
||||||
|
PREF_PLUGINS_SOURCEPATH,
|
||||||
} preference_t;
|
} preference_t;
|
||||||
|
|
||||||
typedef struct prof_alias_t {
|
typedef struct prof_alias_t {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* scripts.c
|
* scripts.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* scripts.h
|
* scripts.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* theme.c
|
* theme.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -104,6 +104,7 @@ theme_init(const char *const theme_name)
|
|||||||
g_hash_table_insert(defaults, strdup("statusbar.brackets"), strdup("cyan"));
|
g_hash_table_insert(defaults, strdup("statusbar.brackets"), strdup("cyan"));
|
||||||
g_hash_table_insert(defaults, strdup("statusbar.active"), strdup("cyan"));
|
g_hash_table_insert(defaults, strdup("statusbar.active"), strdup("cyan"));
|
||||||
g_hash_table_insert(defaults, strdup("statusbar.new"), strdup("white"));
|
g_hash_table_insert(defaults, strdup("statusbar.new"), strdup("white"));
|
||||||
|
g_hash_table_insert(defaults, strdup("statusbar.time"), strdup("white"));
|
||||||
g_hash_table_insert(defaults, strdup("me"), strdup("yellow"));
|
g_hash_table_insert(defaults, strdup("me"), strdup("yellow"));
|
||||||
g_hash_table_insert(defaults, strdup("them"), strdup("green"));
|
g_hash_table_insert(defaults, strdup("them"), strdup("green"));
|
||||||
g_hash_table_insert(defaults, strdup("receipt.sent"), strdup("red"));
|
g_hash_table_insert(defaults, strdup("receipt.sent"), strdup("red"));
|
||||||
@ -755,6 +756,7 @@ theme_attrs(theme_item_t attrs)
|
|||||||
case THEME_STATUS_BRACKET: _theme_prep_fgnd("statusbar.brackets", lookup_str, &bold); break;
|
case THEME_STATUS_BRACKET: _theme_prep_fgnd("statusbar.brackets", lookup_str, &bold); break;
|
||||||
case THEME_STATUS_ACTIVE: _theme_prep_fgnd("statusbar.active", lookup_str, &bold); break;
|
case THEME_STATUS_ACTIVE: _theme_prep_fgnd("statusbar.active", lookup_str, &bold); break;
|
||||||
case THEME_STATUS_NEW: _theme_prep_fgnd("statusbar.new", lookup_str, &bold); break;
|
case THEME_STATUS_NEW: _theme_prep_fgnd("statusbar.new", lookup_str, &bold); break;
|
||||||
|
case THEME_STATUS_TIME: _theme_prep_fgnd("statusbar.time", lookup_str, &bold); break;
|
||||||
case THEME_ME: _theme_prep_fgnd("me", lookup_str, &bold); break;
|
case THEME_ME: _theme_prep_fgnd("me", lookup_str, &bold); break;
|
||||||
case THEME_THEM: _theme_prep_fgnd("them", lookup_str, &bold); break;
|
case THEME_THEM: _theme_prep_fgnd("them", lookup_str, &bold); break;
|
||||||
case THEME_RECEIPT_SENT: _theme_prep_fgnd("receipt.sent", lookup_str, &bold); break;
|
case THEME_RECEIPT_SENT: _theme_prep_fgnd("receipt.sent", lookup_str, &bold); break;
|
||||||
@ -843,6 +845,7 @@ theme_attrs(theme_item_t attrs)
|
|||||||
case THEME_STATUS_BRACKET:
|
case THEME_STATUS_BRACKET:
|
||||||
case THEME_STATUS_ACTIVE:
|
case THEME_STATUS_ACTIVE:
|
||||||
case THEME_STATUS_NEW:
|
case THEME_STATUS_NEW:
|
||||||
|
case THEME_STATUS_TIME:
|
||||||
_theme_prep_bgnd("statusbar", "blue", lookup_str);
|
_theme_prep_bgnd("statusbar", "blue", lookup_str);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* theme.h
|
* theme.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -69,6 +69,7 @@ typedef enum {
|
|||||||
THEME_STATUS_BRACKET,
|
THEME_STATUS_BRACKET,
|
||||||
THEME_STATUS_ACTIVE,
|
THEME_STATUS_ACTIVE,
|
||||||
THEME_STATUS_NEW,
|
THEME_STATUS_NEW,
|
||||||
|
THEME_STATUS_TIME,
|
||||||
THEME_ME,
|
THEME_ME,
|
||||||
THEME_THEM,
|
THEME_THEM,
|
||||||
THEME_ROOMINFO,
|
THEME_ROOMINFO,
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* tlscerts.c
|
* tlscerts.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* tlscerts.h
|
* tlscerts.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* client_events.c
|
* client_events.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* client_events.h
|
* client_events.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* server_events.c
|
* server_events.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* server_events.h
|
* server_events.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* log.c
|
* log.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* log.h
|
* log.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* main.c
|
* main.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -90,7 +90,7 @@ main(int argc, char **argv)
|
|||||||
g_print("Profanity, version %s\n", PACKAGE_VERSION);
|
g_print("Profanity, version %s\n", PACKAGE_VERSION);
|
||||||
}
|
}
|
||||||
|
|
||||||
g_print("Copyright (C) 2012 - 2016 James Booth <%s>.\n", PACKAGE_BUGREPORT);
|
g_print("Copyright (C) 2012 - 2017 James Booth <%s>.\n", PACKAGE_BUGREPORT);
|
||||||
g_print("License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>\n");
|
g_print("License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>\n");
|
||||||
g_print("\n");
|
g_print("\n");
|
||||||
g_print("This is free software; you are free to change and redistribute it.\n");
|
g_print("This is free software; you are free to change and redistribute it.\n");
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* otr.c
|
* otr.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* otr.h
|
* otr.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* otrlib.h
|
* otrlib.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* otrlibv3.c
|
* otrlibv3.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* otrlibv4.c
|
* otrlibv4.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* gpg.c
|
* gpg.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* gpg.h
|
* gpg.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* api.c
|
* api.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* api.h
|
* api.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* autocompleters.c
|
* autocompleters.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* autocompleters.h
|
* autocompleters.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* c_api.c
|
* c_api.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* c_api.h
|
* c_api.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* c_plugins.c
|
* c_plugins.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* c_plugins.h
|
* c_plugins.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* callbacks.c
|
* callbacks.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* callbacks.h
|
* callbacks.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* disco.c
|
* disco.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* disco.h
|
* disco.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* plugins.c
|
* plugins.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -129,6 +129,43 @@ plugins_init(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
plugins_free_install_result(PluginsInstallResult *result)
|
||||||
|
{
|
||||||
|
if (!result) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
g_slist_free_full(result->installed, free);
|
||||||
|
g_slist_free_full(result->failed, free);
|
||||||
|
}
|
||||||
|
|
||||||
|
PluginsInstallResult*
|
||||||
|
plugins_install_all(const char *const path)
|
||||||
|
{
|
||||||
|
PluginsInstallResult *result = malloc(sizeof(PluginsInstallResult));
|
||||||
|
result->installed = NULL;
|
||||||
|
result->failed = NULL;
|
||||||
|
GSList *contents = NULL;
|
||||||
|
get_file_paths_recursive(path, &contents);
|
||||||
|
|
||||||
|
GSList *curr = contents;
|
||||||
|
while (curr) {
|
||||||
|
if (g_str_has_suffix(curr->data, ".py") || g_str_has_suffix(curr->data, ".so")) {
|
||||||
|
gchar *plugin_name = g_path_get_basename(curr->data);
|
||||||
|
if (plugins_install(plugin_name, curr->data)) {
|
||||||
|
result->installed = g_slist_append(result->installed, strdup(curr->data));
|
||||||
|
} else {
|
||||||
|
result->failed = g_slist_append(result->failed, strdup(curr->data));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
curr = g_slist_next(curr);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_slist_free_full(contents, g_free);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
plugins_install(const char *const plugin_name, const char *const filename)
|
plugins_install(const char *const plugin_name, const char *const filename)
|
||||||
{
|
{
|
||||||
@ -153,6 +190,23 @@ plugins_install(const char *const plugin_name, const char *const filename)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GSList*
|
||||||
|
plugins_load_all(void)
|
||||||
|
{
|
||||||
|
GSList *plugins = plugins_unloaded_list();
|
||||||
|
GSList *loaded = NULL;
|
||||||
|
GSList *curr = plugins;
|
||||||
|
while (curr) {
|
||||||
|
if (plugins_load(curr->data)) {
|
||||||
|
loaded = g_slist_append(loaded, strdup(curr->data));
|
||||||
|
}
|
||||||
|
curr = g_slist_next(curr);
|
||||||
|
}
|
||||||
|
g_slist_free_full(plugins, g_free);
|
||||||
|
|
||||||
|
return loaded;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
plugins_load(const char *const name)
|
plugins_load(const char *const name)
|
||||||
{
|
{
|
||||||
@ -190,6 +244,32 @@ plugins_load(const char *const name)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
plugins_unload_all(void)
|
||||||
|
{
|
||||||
|
gboolean result = FALSE;
|
||||||
|
GList *plugin_names = g_hash_table_get_keys(plugins);
|
||||||
|
GList *plugin_names_dup = NULL;
|
||||||
|
GList *curr = plugin_names;
|
||||||
|
while (curr) {
|
||||||
|
plugin_names_dup = g_list_append(plugin_names_dup, strdup(curr->data));
|
||||||
|
curr = g_list_next(curr);
|
||||||
|
}
|
||||||
|
g_list_free(plugin_names);
|
||||||
|
|
||||||
|
curr = plugin_names_dup;
|
||||||
|
while (curr) {
|
||||||
|
if (plugins_unload(curr->data)) {
|
||||||
|
result = TRUE;
|
||||||
|
}
|
||||||
|
curr = g_list_next(curr);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_list_free_full(plugin_names_dup, free);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
plugins_unload(const char *const name)
|
plugins_unload(const char *const name)
|
||||||
{
|
{
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* plugins.h
|
* plugins.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -42,6 +42,11 @@ typedef enum {
|
|||||||
LANG_C
|
LANG_C
|
||||||
} lang_t;
|
} lang_t;
|
||||||
|
|
||||||
|
typedef struct prof_plugins_install_t {
|
||||||
|
GSList *installed;
|
||||||
|
GSList *failed;
|
||||||
|
} PluginsInstallResult;
|
||||||
|
|
||||||
typedef struct prof_plugin_t {
|
typedef struct prof_plugin_t {
|
||||||
char *name;
|
char *name;
|
||||||
lang_t lang;
|
lang_t lang;
|
||||||
@ -107,9 +112,14 @@ char* plugins_autocomplete(const char *const input);
|
|||||||
void plugins_reset_autocomplete(void);
|
void plugins_reset_autocomplete(void);
|
||||||
void plugins_shutdown(void);
|
void plugins_shutdown(void);
|
||||||
|
|
||||||
|
void plugins_free_install_result(PluginsInstallResult *result);
|
||||||
|
|
||||||
gboolean plugins_install(const char *const plugin_name, const char *const filename);
|
gboolean plugins_install(const char *const plugin_name, const char *const filename);
|
||||||
|
PluginsInstallResult* plugins_install_all(const char *const path);
|
||||||
gboolean plugins_load(const char *const name);
|
gboolean plugins_load(const char *const name);
|
||||||
|
GSList* plugins_load_all(void);
|
||||||
gboolean plugins_unload(const char *const name);
|
gboolean plugins_unload(const char *const name);
|
||||||
|
gboolean plugins_unload_all(void);
|
||||||
gboolean plugins_reload(const char *const name);
|
gboolean plugins_reload(const char *const name);
|
||||||
void plugins_reload_all(void);
|
void plugins_reload_all(void);
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* prof_api.c
|
* prof_api.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* prof_api.h
|
* prof_api.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* python_api.c
|
* python_api.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* python_api.h
|
* python_api.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* python_plugins.c
|
* python_plugins.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* python_plugins.h
|
* python_plugins.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* settings.c
|
* settings.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* settings.h
|
* settings.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* themes.c
|
* themes.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* themes.h
|
* themes.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* profanity.c
|
* profanity.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* profanity.h
|
* profanity.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* autocomplete.c
|
* autocomplete.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -35,6 +35,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <glib.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "tools/autocomplete.h"
|
#include "tools/autocomplete.h"
|
||||||
@ -330,10 +331,17 @@ autocomplete_param_no_with_func(const char *const input, char *command, int arg_
|
|||||||
static gchar*
|
static gchar*
|
||||||
_search_from(Autocomplete ac, GSList *curr, gboolean quote)
|
_search_from(Autocomplete ac, GSList *curr, gboolean quote)
|
||||||
{
|
{
|
||||||
|
gchar *search_str_ascii = g_str_to_ascii(ac->search_str, NULL);
|
||||||
|
gchar *search_str_lower = g_ascii_strdown(search_str_ascii, -1);
|
||||||
|
g_free(search_str_ascii);
|
||||||
|
|
||||||
while(curr) {
|
while(curr) {
|
||||||
|
gchar *curr_ascii = g_str_to_ascii(curr->data, NULL);
|
||||||
|
gchar *curr_lower = g_ascii_strdown(curr_ascii, -1);
|
||||||
|
g_free(curr_ascii);
|
||||||
|
|
||||||
// match found
|
// match found
|
||||||
if (strncmp(curr->data, ac->search_str, strlen(ac->search_str)) == 0) {
|
if (strncmp(curr_lower, search_str_lower, strlen(search_str_lower)) == 0) {
|
||||||
|
|
||||||
// set pointer to last found
|
// set pointer to last found
|
||||||
ac->last_found = curr;
|
ac->last_found = curr;
|
||||||
@ -347,16 +355,22 @@ _search_from(Autocomplete ac, GSList *curr, gboolean quote)
|
|||||||
gchar *result = quoted->str;
|
gchar *result = quoted->str;
|
||||||
g_string_free(quoted, FALSE);
|
g_string_free(quoted, FALSE);
|
||||||
|
|
||||||
|
g_free(search_str_lower);
|
||||||
|
g_free(curr_lower);
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
// otherwise just return the string
|
// otherwise just return the string
|
||||||
} else {
|
} else {
|
||||||
|
g_free(search_str_lower);
|
||||||
|
g_free(curr_lower);
|
||||||
return strdup(curr->data);
|
return strdup(curr->data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_free(curr_lower);
|
||||||
curr = g_slist_next(curr);
|
curr = g_slist_next(curr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_free(search_str_lower);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* autocomplete.h
|
* autocomplete.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* http_upload.c
|
* http_upload.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -52,6 +52,7 @@
|
|||||||
#include "config/preferences.h"
|
#include "config/preferences.h"
|
||||||
#include "ui/ui.h"
|
#include "ui/ui.h"
|
||||||
#include "ui/window.h"
|
#include "ui/window.h"
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
#define FALLBACK_MIMETYPE "application/octet-stream"
|
#define FALLBACK_MIMETYPE "application/octet-stream"
|
||||||
#define FALLBACK_CONTENTTYPE_HEADER "Content-Type: application/octet-stream"
|
#define FALLBACK_CONTENTTYPE_HEADER "Content-Type: application/octet-stream"
|
||||||
@ -330,10 +331,3 @@ off_t file_size(const char* const filename)
|
|||||||
stat(filename, &st);
|
stat(filename, &st);
|
||||||
return st.st_size;
|
return st.st_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
int is_regular_file(const char *filename)
|
|
||||||
{
|
|
||||||
struct stat st;
|
|
||||||
stat(filename, &st);
|
|
||||||
return S_ISREG(st.st_mode);
|
|
||||||
}
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* http_upload.h
|
* http_upload.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -62,6 +62,5 @@ void* http_file_put(void *userdata);
|
|||||||
|
|
||||||
char* file_mime_type(const char* const file_name);
|
char* file_mime_type(const char* const file_name);
|
||||||
off_t file_size(const char* const file_name);
|
off_t file_size(const char* const file_name);
|
||||||
int is_regular_file(const char *filename);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* parser.c
|
* parser.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* parser.h
|
* parser.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* tinyurl.c
|
* tinyurl.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* tinyurl.h
|
* tinyurl.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* buffer.c
|
* buffer.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* buffer.h
|
* buffer.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* chatwin.c
|
* chatwin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* console.c
|
* console.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -412,7 +412,7 @@ cons_about(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
win_println(console, THEME_DEFAULT, '-', "Copyright (C) 2012 - 2016 James Booth <%s>.", PACKAGE_BUGREPORT);
|
win_println(console, THEME_DEFAULT, '-', "Copyright (C) 2012 - 2017 James Booth <%s>.", PACKAGE_BUGREPORT);
|
||||||
win_println(console, THEME_DEFAULT, '-', "License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>");
|
win_println(console, THEME_DEFAULT, '-', "License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>");
|
||||||
win_println(console, THEME_DEFAULT, '-', "");
|
win_println(console, THEME_DEFAULT, '-', "");
|
||||||
win_println(console, THEME_DEFAULT, '-', "This is free software; you are free to change and redistribute it.");
|
win_println(console, THEME_DEFAULT, '-', "This is free software; you are free to change and redistribute it.");
|
||||||
@ -2224,6 +2224,7 @@ cons_theme_properties(void)
|
|||||||
_cons_theme_bar_prop(THEME_STATUS_BRACKET, "statusbar.brackets");
|
_cons_theme_bar_prop(THEME_STATUS_BRACKET, "statusbar.brackets");
|
||||||
_cons_theme_bar_prop(THEME_STATUS_ACTIVE, "statusbar.active");
|
_cons_theme_bar_prop(THEME_STATUS_ACTIVE, "statusbar.active");
|
||||||
_cons_theme_bar_prop(THEME_STATUS_NEW, "statusbar.new");
|
_cons_theme_bar_prop(THEME_STATUS_NEW, "statusbar.new");
|
||||||
|
_cons_theme_bar_prop(THEME_STATUS_TIME, "statusbar.time");
|
||||||
|
|
||||||
_cons_theme_prop(THEME_TIME, "main.time");
|
_cons_theme_prop(THEME_TIME, "main.time");
|
||||||
_cons_theme_prop(THEME_TEXT, "main.text");
|
_cons_theme_prop(THEME_TEXT, "main.text");
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* core.c
|
* core.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* inputwin.c
|
* inputwin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* inputwin.c
|
* inputwin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* mucconfwin.c
|
* mucconfwin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* mucwin.c
|
* mucwin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* notifier.c
|
* notifier.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* occupantswin.c
|
* occupantswin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* privwin.c
|
* privwin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* rosterwin.c
|
* rosterwin.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* screen.c
|
* screen.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* screen.h
|
* screen.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* statusbar.c
|
* statusbar.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
@ -459,6 +459,7 @@ _status_bar_draw(void)
|
|||||||
last_time = g_date_time_new_now(tz);
|
last_time = g_date_time_new_now(tz);
|
||||||
|
|
||||||
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
|
||||||
|
int time_attrs = theme_attrs(THEME_STATUS_TIME);
|
||||||
|
|
||||||
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
|
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
|
||||||
if (g_strcmp0(time_pref, "off") != 0) {
|
if (g_strcmp0(time_pref, "off") != 0) {
|
||||||
@ -468,7 +469,9 @@ _status_bar_draw(void)
|
|||||||
wattron(status_bar, bracket_attrs);
|
wattron(status_bar, bracket_attrs);
|
||||||
mvwaddch(status_bar, 0, 1, '[');
|
mvwaddch(status_bar, 0, 1, '[');
|
||||||
wattroff(status_bar, bracket_attrs);
|
wattroff(status_bar, bracket_attrs);
|
||||||
|
wattron(status_bar, time_attrs);
|
||||||
mvwprintw(status_bar, 0, 2, date_fmt);
|
mvwprintw(status_bar, 0, 2, date_fmt);
|
||||||
|
wattroff(status_bar, time_attrs);
|
||||||
wattron(status_bar, bracket_attrs);
|
wattron(status_bar, bracket_attrs);
|
||||||
mvwaddch(status_bar, 0, 2 + len, ']');
|
mvwaddch(status_bar, 0, 2 + len, ']');
|
||||||
wattroff(status_bar, bracket_attrs);
|
wattroff(status_bar, bracket_attrs);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* statusbar.h
|
* statusbar.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* titlebar.c
|
* titlebar.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* titlebar.h
|
* titlebar.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* tray.c
|
* tray.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* tray.h
|
* tray.h
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
|
* Copyright (C) 2012 - 2017 James Booth <boothj5@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of Profanity.
|
* This file is part of Profanity.
|
||||||
*
|
*
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user