aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Removed files.c

Browse Source
This commit is contained in:
James Booth 2013-02-02 22:33:05 +00:00
parent 7398d565d7
commit 3d0e0d7ea4
8 changed files with 73 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -2,8 +2,7 @@ bin_PROGRAMS = profanity
profanity_SOURCES = src/contact.c src/contact.h src/log.c src/common.c \
src/contact_list.c src/log.h src/profanity.c src/common.h \
src/contact_list.h src/main.c src/profanity.h src/chat_session.c \
src/chat_session.h src/muc.c src/muc.h src/files.c src/files.h \
src/jid.h src/jid.c \
src/chat_session.h src/muc.c src/muc.h src/jid.h src/jid.c \
src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \
src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \
src/xmpp/stanza.h src/xmpp/message.h src/xmpp/iq.h src/xmpp/presence.h \

1
src/config/accounts.c
View File

@ -28,7 +28,6 @@
#include "accounts.h"
#include "common.h"
#include "files.h"
#include "jid.h"
#include "log.h"
#include "tools/autocomplete.h"

1
src/config/preferences.c
View File

@ -33,7 +33,6 @@
#endif
#include "common.h"
#include "files.h"
#include "log.h"
#include "preferences.h"
#include "tools/autocomplete.h"

1
src/config/theme.c
View File

@ -33,7 +33,6 @@
#endif
#include "common.h"
#include "files.h"
#include "log.h"
#include "theme.h"

101
src/files.c
View File

@ -1,101 +0,0 @@
/*
* files.c
*
* Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Profanity is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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/>.
*
*/
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <glib.h>
#include "common.h"
static void _files_create_config_directory(void);
static void _files_create_data_directory(void);
static void _files_create_chatlog_directory(void);
static void _files_create_log_directory(void);
static void _files_create_themes_directory(void);
void
files_create_directories(void)
{
_files_create_config_directory();
_files_create_data_directory();
_files_create_chatlog_directory();
_files_create_log_directory();
_files_create_themes_directory();
}
static void
_files_create_config_directory(void)
{
gchar *xdg_config = xdg_get_config_home();
GString *prof_conf_dir = g_string_new(xdg_config);
g_string_append(prof_conf_dir, "/profanity");
mkdir_recursive(prof_conf_dir->str);
g_free(xdg_config);
g_string_free(prof_conf_dir, TRUE);
}
static void
_files_create_data_directory(void)
{
gchar *xdg_data = xdg_get_data_home();
GString *prof_data_dir = g_string_new(xdg_data);
g_string_append(prof_data_dir, "/profanity");
mkdir_recursive(prof_data_dir->str);
g_free(xdg_data);
g_string_free(prof_data_dir, TRUE);
}
static void
_files_create_chatlog_directory(void)
{
gchar *xdg_data = xdg_get_data_home();
GString *chatlogs_dir = g_string_new(xdg_data);
g_string_append(chatlogs_dir, "/profanity/chatlogs");
mkdir_recursive(chatlogs_dir->str);
g_free(xdg_data);
g_string_free(chatlogs_dir, TRUE);
}
static void
_files_create_log_directory(void)
{
gchar *xdg_data = xdg_get_data_home();
GString *chatlogs_dir = g_string_new(xdg_data);
g_string_append(chatlogs_dir, "/profanity/logs");
mkdir_recursive(chatlogs_dir->str);
g_free(xdg_data);
g_string_free(chatlogs_dir, TRUE);
}
static void
_files_create_themes_directory(void)
{
gchar *xdg_config = xdg_get_config_home();
GString *themes_dir = g_string_new(xdg_config);
g_string_append(themes_dir, "/profanity/themes");
mkdir_recursive(themes_dir->str);
g_free(xdg_config);
g_string_free(themes_dir, TRUE);
}

28
src/files.h
View File

@ -1,28 +0,0 @@
/*
* files.h
*
* Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Profanity is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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/>.
*
*/
#ifndef FILES_H
#define FILES_H
void files_create_directories(void);
#endif

1
src/log.c
View File

@ -33,7 +33,6 @@
#include "common.h"
#include "config/preferences.h"
#include "files.h"
#define PROF "prof"

74
src/profanity.c
View File

@ -39,7 +39,6 @@
#include "common.h"
#include "contact.h"
#include "contact_list.h"
#include "files.h"
#include "log.h"
#include "muc.h"
#include "ui/ui.h"
@ -50,6 +49,12 @@ static gboolean _process_input(char *inp);
static void _handle_idle_time(void);
static void _init(const int disable_tls, char *log_level);
static void _shutdown(void);
static void _create_directories(void);
static void _create_config_directory(void);
static void _create_data_directory(void);
static void _create_chatlog_directory(void);
static void _create_log_directory(void);
static void _create_themes_directory(void);
static gboolean idle = FALSE;
@ -515,7 +520,7 @@ _init(const int disable_tls, char *log_level)
setlocale(LC_ALL, "");
// ignore SIGPIPE
signal(SIGPIPE, SIG_IGN);
files_create_directories();
_create_directories();
log_level_t prof_log_level = _get_log_level(log_level);
log_init(prof_log_level);
if (strcmp(PACKAGE_STATUS, "development") == 0) {
@ -552,3 +557,68 @@ _shutdown(void)
cmd_close();
log_close();
}
static void
_create_directories(void)
{
_create_config_directory();
_create_data_directory();
_create_chatlog_directory();
_create_log_directory();
_create_themes_directory();
}
static void
_create_config_directory(void)
{
gchar *xdg_config = xdg_get_config_home();
GString *prof_conf_dir = g_string_new(xdg_config);
g_string_append(prof_conf_dir, "/profanity");
mkdir_recursive(prof_conf_dir->str);
g_free(xdg_config);
g_string_free(prof_conf_dir, TRUE);
}
static void
_create_data_directory(void)
{
gchar *xdg_data = xdg_get_data_home();
GString *prof_data_dir = g_string_new(xdg_data);
g_string_append(prof_data_dir, "/profanity");
mkdir_recursive(prof_data_dir->str);
g_free(xdg_data);
g_string_free(prof_data_dir, TRUE);
}
static void
_create_chatlog_directory(void)
{
gchar *xdg_data = xdg_get_data_home();
GString *chatlogs_dir = g_string_new(xdg_data);
g_string_append(chatlogs_dir, "/profanity/chatlogs");
mkdir_recursive(chatlogs_dir->str);
g_free(xdg_data);
g_string_free(chatlogs_dir, TRUE);
}
static void
_create_log_directory(void)
{
gchar *xdg_data = xdg_get_data_home();
GString *chatlogs_dir = g_string_new(xdg_data);
g_string_append(chatlogs_dir, "/profanity/logs");
mkdir_recursive(chatlogs_dir->str);
g_free(xdg_data);
g_string_free(chatlogs_dir, TRUE);
}
static void
_create_themes_directory(void)
{
gchar *xdg_config = xdg_get_config_home();
GString *themes_dir = g_string_new(xdg_config);
g_string_append(themes_dir, "/profanity/themes");
mkdir_recursive(themes_dir->str);
g_free(xdg_config);
g_string_free(themes_dir, TRUE);
}