SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor tidying up

This commit is contained in:
Arnavion 2014-12-08 21:24:59 -08:00
parent 65da34f19e
commit c1831cb19d
9 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/cfgfiles.c
View File

@ -308,9 +308,7 @@ get_xdir (void)
if (portable_mode () || SHGetKnownFolderPath (&FOLDERID_RoamingAppData, 0, NULL, &roaming_path_wide) != S_OK)
{
char *path;
path = g_win32_get_package_installation_directory_of_module (NULL);
char *path = g_win32_get_package_installation_directory_of_module (NULL);
if (path)
{
xdir = g_build_filename (path, "config", NULL);

15
src/common/text.c
View File

@ -393,9 +393,7 @@ log_close (session *sess)
static void
mkdir_p (char *filename)
{
char *dirname;
dirname = g_path_get_dirname (filename);
char *dirname = g_path_get_dirname (filename);
g_mkdir_with_parents (dirname, 0700);
@ -582,7 +580,7 @@ log_create_pathname (char *servname, char *channame, char *netname)
/* create all the subdirectories */
mkdir_p (fname);
return g_strdup(fname);
return g_strdup (fname);
}
static int
@ -711,15 +709,13 @@ log_write (session *sess, char *text, time_t ts)
log_open (sess);
/* change to a different log file? */
file = log_create_pathname (sess->server->servername, sess->channel,
server_get_network (sess->server, FALSE));
file = log_create_pathname (sess->server->servername, sess->channel, server_get_network (sess->server, FALSE));
if (file)
{
if (g_access (file, F_OK) != 0)
{
close (sess->logfd);
sess->logfd = log_open_file (sess->server->servername, sess->channel,
server_get_network (sess->server, FALSE));
sess->logfd = log_open_file (sess->server->servername, sess->channel, server_get_network (sess->server, FALSE));
}
g_free (file);
}
@ -905,7 +901,8 @@ PrintTextTimeStamp (session *sess, char *text, time_t timestamp)
{
text = "\n";
conv = NULL;
} else
}
else
{
int len = -1;
conv = text_validate ((char **)&text, &len);

12
src/common/url.c
View File

@ -587,18 +587,14 @@ re_url (void)
if (uri[i].flags & URI_PATH)
{
char *sep_escaped;
char *sep_escaped = g_regex_escape_string (uri[i].path_sep, strlen(uri[i].path_sep));
sep_escaped = g_regex_escape_string (uri[i].path_sep,
strlen(uri[i].path_sep));
g_string_append_printf (grist_gstr, "(" "%s" PATH ")?", sep_escaped);
g_string_append_printf(grist_gstr, "(" "%s" PATH ")?",
sep_escaped);
g_free(sep_escaped);
g_free (sep_escaped);
}
g_string_append(grist_gstr, ")");
g_string_append (grist_gstr, ")");
}
grist = g_string_free (grist_gstr, FALSE);

3
src/fe-gtk/fe-gtk.c
View File

@ -882,11 +882,10 @@ fe_confirm (const char *message, void (*yesproc)(void *), void (*noproc)(void *)
{
/* warning, assuming fe_confirm is used by DCC only! */
struct DCC *dcc = ud;
char *filepath;
if (dcc->file)
{
filepath = g_build_filename (prefs.hex_dcc_dir, dcc->file, NULL);
char *filepath = g_build_filename (prefs.hex_dcc_dir, dcc->file, NULL);
gtkutil_file_req (message, dcc_saveas_cb, ud, filepath, NULL,
FRF_WRITE|FRF_NOASKOVERWRITE|FRF_FILTERISINITIAL);
g_free (filepath);

3
src/fe-gtk/fkeys.c
View File

@ -596,7 +596,8 @@ key_dialog_save (GtkWidget *wid, gpointer userdata)
else
keybind_list = g_slist_append (keybind_list, kb);
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
}
if (key_save_kbs () == 0)

2
src/fe-gtk/maingui.c
View File

@ -2287,7 +2287,7 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
case WORD_EMAIL:
word[end] = 0;
word += start;
tmp = g_strdup_printf("mailto:%s", word + (ispunct (*word)? 1: 0));
tmp = g_strdup_printf ("mailto:%s", word + (ispunct (*word) ? 1 : 0));
menu_urlmenu (even, tmp);
g_free (tmp);
break;

10
src/fe-gtk/menu.c
View File

@ -403,12 +403,11 @@ toggle_cb (GtkWidget *item, char *pref_name)
static int
is_in_path (char *cmd)
{
char *prog = g_strdup (cmd + 1); /* 1st char is "!" */
char *path, *orig;
char *orig = g_strdup (cmd + 1); /* 1st char is "!" */
char *prog = orig;
char **argv;
int argc;
orig = prog; /* save for free()ing */
/* special-case these default entries. */
/* 123456789012345678 */
if (strncmp (prog, "gnome-terminal -x ", 18) == 0)
@ -417,15 +416,14 @@ is_in_path (char *cmd)
if (g_shell_parse_argv (prog, &argc, &argv, NULL))
{
path = g_find_program_in_path (argv[0]);
char *path = g_find_program_in_path (argv[0]);
g_strfreev (argv);
if (path)
{
g_free (path);
g_free (orig);
g_strfreev (argv);
return 1;
}
g_strfreev (argv);
}
g_free (orig);

3
src/fe-gtk/pixmaps.c
View File

@ -87,10 +87,9 @@ pixmap_load_from_file (char *filename)
static GdkPixbuf *
load_pixmap (const char *filename)
{
gchar *path;
GdkPixbuf *pixbuf;
path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S "%s.png", get_xdir (), filename);
gchar *path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S "%s.png", get_xdir (), filename);
pixbuf = gdk_pixbuf_new_from_file (path, 0);
g_free (path);

4
src/fe-gtk/plugingui.c
View File

@ -156,9 +156,7 @@ plugingui_load_cb (session *sess, char *file)
void
plugingui_load (void)
{
char *sub_dir;
sub_dir = g_build_filename (get_xdir(), "addons", NULL);
char *sub_dir = g_build_filename (get_xdir(), "addons", NULL);
gtkutil_file_req (_("Select a Plugin or Script to load"), plugingui_load_cb, current_sess,
sub_dir, "*."G_MODULE_SUFFIX";*.lua;*.pl;*.py;*.tcl;*.js", FRF_FILTERISINITIAL|FRF_EXTENSIONS);