aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2018-01-16 07:53:22 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2018-01-16 07:53:22 +0000
commit5f403357ddf4202f0a0111a8bf906ef835a72c21 (patch)
tree0e8361d2420d80a74472123fc601dd35e3ed4afa
parentc660402460e9f7dc43e9f9644bc47e482c023c9f (diff)
fixed typos (#278).
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3605 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog8
-rw-r--r--libsylph/folder.c4
-rw-r--r--src/gtkutils.c4
-rw-r--r--src/import.c2
4 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4536baaa..414211a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
-2018-01-12
+2018-01-16
* version 3.7.0beta1
+2018-01-16
+
+ * libsylph/folder.c
+ src/gtkutils.c
+ src/import.c: fixed typos (thanks to Kentaro Hayashi) (#278).
+
2018-01-12
* src/summaryview.c: summary_mark_displayed_read(): reset current
diff --git a/libsylph/folder.c b/libsylph/folder.c
index f188dba5..6fffe2dc 100644
--- a/libsylph/folder.c
+++ b/libsylph/folder.c
@@ -1133,7 +1133,7 @@ gchar *folder_get_path(Folder *folder)
path = g_filename_from_utf8(LOCAL_FOLDER(folder)->rootpath,
-1, NULL, NULL, NULL);
if (!path) {
- g_warning("folder_get_path: faild to convert character set\n");
+ g_warning("folder_get_path: failed to convert character set\n");
path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
}
if (!g_path_is_absolute(path)) {
@@ -1184,7 +1184,7 @@ gchar *folder_item_get_path(FolderItem *item)
item_path = g_filename_from_utf8(item->path, -1,
NULL, NULL, NULL);
if (!item_path) {
- g_warning("folder_item_get_path: faild to convert character set\n");
+ g_warning("folder_item_get_path: failed to convert character set\n");
item_path = g_strdup(item->path);
}
#ifdef G_OS_WIN32
diff --git a/src/gtkutils.c b/src/gtkutils.c
index 8258094d..b1a488af 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -895,7 +895,7 @@ gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter *iter,
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n", error->message);
+ g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n", error->message);
g_error_free(error);
}
if (!wcs || items_written <= 0) return FALSE;
@@ -930,7 +930,7 @@ gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n", error->message);
+ g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n", error->message);
g_error_free(error);
}
if (!wcs || items_written <= 0) return FALSE;
diff --git a/src/import.c b/src/import.c
index 7201eedf..a59f11f2 100644
--- a/src/import.c
+++ b/src/import.c
@@ -734,7 +734,7 @@ static void import_filesel_cb(GtkWidget *widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("import_filesel_cb(): faild to convert characer set.");
+ g_warning("import_filesel_cb(): failed to convert characer set.");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(file_entry), utf8_filename);