g_signal_handlers_block_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
+
+ g_signal_handlers_block_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(text_inserted),
+ compose);
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning("Can't get text part\n");
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
gtk_text_buffer_insert(textbuf, &iter, buf, -1);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
}
fclose(fp);
}
compose_attach_parts(compose, msginfo);
+ g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(text_inserted),
+ compose);
g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
FILE *fp;
off_t size;
gint row;
+ gchar *name;
if (!is_file_exist(file)) {
g_warning("File %s doesn't exist\n", file);
if (!g_ascii_strcasecmp(content_type, "message/rfc822")) {
MsgInfo *msginfo;
MsgFlags flags = {0, 0};
- const gchar *name;
if (procmime_get_encoding_for_file(file) == ENC_7BIT)
ainfo->encoding = ENC_7BIT;
if (msginfo && msginfo->subject)
name = msginfo->subject;
else
- name = g_basename(filename ? filename : file);
+ name = g_path_get_basename(filename ? filename : file);
ainfo->name = g_strdup_printf(_("Message: %s"), name);
procmime_get_encoding_for_file(file);
else
ainfo->encoding = ENC_BASE64;
- ainfo->name = g_strdup
- (g_basename(filename ? filename : file));
+ name = g_path_get_basename(filename ? filename : file);
+ ainfo->name = g_strdup(name);
}
+ g_free(name);
} else {
ainfo->content_type = procmime_get_mime_type(file);
if (!ainfo->content_type) {
ainfo->encoding = procmime_get_encoding_for_file(file);
else
ainfo->encoding = ENC_BASE64;
- ainfo->name = g_strdup(g_basename(filename ? filename : file));
+ name = g_path_get_basename(filename ? filename : file);
+ ainfo->name = g_strdup(name);
+ g_free(name);
}
if (!strcmp(ainfo->content_type, "unknown")) {
compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
/* Subject */
- str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+ str = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
- gchar *tmpstr;
-
- tmpstr = g_strdup(str);
- if (tmpstr == NULL) {
- g_string_free(header, TRUE);
- return NULL;
- }
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
strlen("Subject: "), FALSE);
g_string_append_printf(header, "Subject: %s\n", buf);
}
- g_free(tmpstr);
}
+ g_free(str);
/* Message-ID */
if (compose->account->gen_msgid) {
g_free(tmp);
entry_str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
- Xstrdup_a(headervalue, entry_str, return -1);
+ Xstrdup_a(headervalue, entry_str, return NULL);
subst_char(headervalue, '\r', ' ');
subst_char(headervalue, '\n', ' ');
string = std_headers;
for ( tmp = file_list; tmp; tmp = tmp->next) {
gchar *file = (gchar *) tmp->data;
gchar *filedup = g_strdup(file);
- const gchar *shortfile = g_basename(filedup);
+ gchar *shortfile = g_path_get_basename(filedup);
ComposeInsertResult res;
res = compose_insert_file(compose, file);
alertpanel_error(_("File '%s' contained invalid characters\n"
"for the current encoding, insertion may be incorrect."), shortfile);
}
+ g_free(shortfile);
g_free(filedup);
g_free(file);
}
static void activate_privacy_system(Compose *compose, PrefsAccount *account)
{
- /* TODO
- if (account->default_gnupg_mode)
- compose->gnupg_mode = GNUPG_MODE_INLINE;
- else
- compose->gnupg_mode = GNUPG_MODE_DETACH;
- */
+ g_free(compose->privacy_system);
+ compose->privacy_system = g_strdup(account->default_privacy_system);
compose_update_privacy_system_menu_item(compose);
}