aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Show Python version on --version

Browse Source 
issue #956
This commit is contained in:
James Booth 2017-08-10 22:17:05 +01:00
parent e9701cfafa
commit 17b4e45c57
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/cmd_funcs.c
View File

@ -6463,7 +6463,7 @@ gboolean
cmd_plugins_python_version(ProfWin *window, const char *const command, gchar **args) 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_string();
cons_show("Python version:"); cons_show("Python version:");
cons_show("%s", version); cons_show("%s", version);
#else #else

8
src/main.c
View File

@ -41,6 +41,10 @@
#include "gitversion.h" #include "gitversion.h"
#endif #endif
#ifdef HAVE_PYTHON
#include "plugins/python_plugins.h"
#endif
#include "profanity.h" #include "profanity.h"
#include "common.h" #include "common.h"
#include "command/cmd_defs.h" #include "command/cmd_defs.h"
@ -131,7 +135,9 @@ main(int argc, char **argv)
#endif #endif
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
g_print("Python plugins: Enabled\n"); gchar *python_version = python_get_version_number();
g_print("Python plugins: Enabled (%s)\n", python_version);
g_free(python_version);
#else #else
g_print("Python plugins: Disabled\n"); g_print("Python plugins: Disabled\n");
#endif #endif

13
src/plugins/python_plugins.c
View File

@ -74,11 +74,22 @@ _unref_module(PyObject *module)
} }
const char* const char*
python_get_version(void) python_get_version_string(void)
{ {
return Py_GetVersion(); return Py_GetVersion();
} }
gchar*
python_get_version_number(void)
{
const char *version_str = Py_GetVersion();
gchar **split = g_strsplit(version_str, " ", 0);
gchar *version_number = g_strdup(split[0]);
g_strfreev(split);
return version_number;
}
void void
python_env_init(void) python_env_init(void)
{ {

3
src/plugins/python_plugins.h
View File

@ -43,7 +43,8 @@ void python_check_error(void);
void allow_python_threads(); void allow_python_threads();
void disable_python_threads(); void disable_python_threads();
const char* python_get_version(void); const char* python_get_version_string(void);
gchar* python_get_version_number(void);
void python_init_hook(ProfPlugin *plugin, const char *const version, const char *const status, void python_init_hook(ProfPlugin *plugin, const char *const version, const char *const status,
const char *const account_name, const char *const fulljid); const char *const account_name, const char *const fulljid);