aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-30 21:55:24 +00:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2016-07-13 00:52:37 +01:00
commit 1ec7aeee37
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/plugins.c
View File

@ -72,8 +72,6 @@
static GHashTable *plugins; static GHashTable *plugins;
static gchar* _get_plugins_dir(void);
void void
plugins_init(void) plugins_init(void)
{ {
@ -167,7 +165,7 @@ plugins_init(void)
gboolean gboolean
plugins_install(const char *const plugin_name, const char *const filename) plugins_install(const char *const plugin_name, const char *const filename)
{ {
char *plugins_dir = _get_plugins_dir(); char *plugins_dir = plugins_get_dir();
GString *target_path = g_string_new(plugins_dir); GString *target_path = g_string_new(plugins_dir);
free(plugins_dir); free(plugins_dir);
g_string_append(target_path, "/"); g_string_append(target_path, "/");
@ -279,16 +277,6 @@ plugins_reload(const char *const name)
return res; return res;
} }
static gchar*
_get_plugins_dir(void)
{
gchar *xdg_data = xdg_get_data_home();
GString *plugins_dir = g_string_new(xdg_data);
g_free(xdg_data);
g_string_append(plugins_dir, "/profanity/plugins");
return g_string_free(plugins_dir, FALSE);
}
void void
_plugins_unloaded_list_dir(const gchar *const dir, GSList **result) _plugins_unloaded_list_dir(const gchar *const dir, GSList **result)
{ {
@ -312,7 +300,7 @@ GSList*
plugins_unloaded_list(void) plugins_unloaded_list(void)
{ {
GSList *result = NULL; GSList *result = NULL;
char *plugins_dir = _get_plugins_dir(); char *plugins_dir = plugins_get_dir();
_plugins_unloaded_list_dir(plugins_dir, &result); _plugins_unloaded_list_dir(plugins_dir, &result);
free(plugins_dir); free(plugins_dir);
@ -893,13 +881,13 @@ plugins_shutdown(void)
disco_close(); disco_close();
} }
gchar * char*
plugins_get_dir(void) plugins_get_dir(void)
{ {
gchar *xdg_data = xdg_get_data_home(); gchar *xdg_data = xdg_get_data_home();
GString *plugins_dir = g_string_new(xdg_data); GString *plugins_dir = g_string_new(xdg_data);
g_string_append(plugins_dir, "/profanity/plugins"); g_string_append(plugins_dir, "/profanity/plugins");
gchar *result = strdup(plugins_dir->str); char *result = strdup(plugins_dir->str);
g_free(xdg_data); g_free(xdg_data);
g_string_free(plugins_dir, TRUE); g_string_free(plugins_dir, TRUE);