2007-05-05 [wwp] 2.9.1cvs44

	* src/messageview.c
	* src/mh.c
	* src/prefs_actions.c
	* src/prefs_gtk.c
	* src/summaryview.c
	* src/common/xml.c
		Fix "faild" typos everywhere and capitalization of
		some g_warnings.

diff --git a/ChangeLog b/ChangeLog
index 44007c44ff3f351c0378f88d83da4904eee3715a..071eba49ec923854c213564c0b7cb55a900556f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-05 [wwp]       2.9.1cvs44
+
+       * src/messageview.c
+       * src/mh.c
+       * src/prefs_actions.c
+       * src/prefs_gtk.c
+       * src/summaryview.c
+       * src/common/xml.c
+               Fix "faild" typos everywhere and capitalization of
+               some g_warnings.
+
 2007-05-04 [colin]     2.9.1cvs43
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 450b66af350536e3d349cd9f45fbb53c75c0d0c3..0e84b89f4cdf78bcf836381c6405899f5e80f332 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2571,3 +2571,4 @@
 ( cvs diff -u -r 1.204.2.132 -r 1.204.2.133 src/prefs_common.c;  cvs diff -u -r 1.59.2.55 -r 1.59.2.56 src/prefs_filtering.c;  cvs diff -u -r 1.12.2.40 -r 1.12.2.41 src/prefs_template.c;  cvs diff -u -r 1.2.4.18 -r 1.2.4.19 src/common/template.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/template.h;  cvs diff -u -r 1.5.2.57 -r 1.5.2.58 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.34 -r 1.4.2.35 src/gtk/gtkutils.h;  ) > 2.9.1cvs41.patchset
 ( cvs diff -u -r 1.395.2.299 -r 1.395.2.300 src/summaryview.c;  cvs diff -u -r 1.274.2.188 -r 1.274.2.189 src/mainwindow.c;  ) > 2.9.1cvs42.patchset
 ( cvs diff -u -r 1.382.2.375 -r 1.382.2.376 src/compose.c;  cvs diff -u -r 1.10.2.13 -r 1.10.2.14 src/privacy.c;  cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/privacy.h;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/plugins/pgpmime/pgpmime.c;  ) > 2.9.1cvs43.patchset
+( cvs diff -u -r 1.94.2.132 -r 1.94.2.133 src/messageview.c;  cvs diff -u -r 1.79.2.54 -r 1.79.2.55 src/mh.c;  cvs diff -u -r 1.60.2.45 -r 1.60.2.46 src/prefs_actions.c;  cvs diff -u -r 1.10.2.29 -r 1.10.2.30 src/prefs_gtk.c;  cvs diff -u -r 1.395.2.300 -r 1.395.2.301 src/summaryview.c;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/common/xml.c;  ) > 2.9.1cvs44.patchset

diff --git a/configure.ac b/configure.ac
index fcc676ecae3f184f0b1ac34a8dd1733d774dd1c6..56e48655306b3247b5af3ef82319f0bd932bb768 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/xml.c b/src/common/xml.c
index e8ef62121fafbf2fe69d9922d7765d387abe1176..ee2a1c6bab088df03d50957ce0ec02c4cd48a4b0 100644 (file)
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -549,7 +549,7 @@ gint xml_file_put_escape_str(FILE *fp, const gchar *str)
 
        tmpstr = conv_codeset_strdup(str, src_codeset, dest_codeset);
        if (!tmpstr) {
-               g_warning("xml_file_put_escape_str(): Faild to convert character set.");
+               g_warning("xml_file_put_escape_str(): Failed to convert character set.");
                tmpstr = g_strdup(str);
        }
 

diff --git a/src/messageview.c b/src/messageview.c
index dbfcc8df4a9e0ba2080989ce4bfa63845306a0ff..afdc55e10ccafe29b5a16c7f22a648a1c973ca1e 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1178,7 +1178,7 @@ static void messageview_save_as(MessageView *messageview)
                                               conv_get_locale_charset_str(),
                                               CS_UTF_8);
                if (!filename) {
-                       g_warning("messageview_save_as(): faild to convert character set.");
+                       g_warning("messageview_save_as(): failed to convert character set.");
                        filename = g_strdup(oldstr);
                }
                dest = filesel_select_file_save(_("Save as"), filename);

diff --git a/src/mh.c b/src/mh.c
index 1c39984230f1aa3b46f4a9527109317a2d38a158..480887597fee1071236cf608ca882461ee9d876b 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1159,7 +1159,7 @@ static gchar *mh_filename_from_utf8(const gchar *path)
        gchar *real_path = g_filename_from_utf8(path, -1, NULL, NULL, NULL);
 
        if (!real_path) {
-               g_warning("mh_filename_from_utf8: faild to convert character set\n");
+               g_warning("mh_filename_from_utf8: failed to convert character set\n");
                real_path = g_strdup(path);
        }
 
@@ -1170,7 +1170,7 @@ static gchar *mh_filename_to_utf8(const gchar *path)
 {
        gchar *utf8path = g_filename_to_utf8(path, -1, NULL, NULL, NULL);
        if (!utf8path) {
-               g_warning("mh_filename_to_utf8: faild to convert character set\n");
+               g_warning("mh_filename_to_utf8: failed to convert character set\n");
                utf8path = g_strdup(path);
        }
 

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index b8b84767289177aab57ef55902ec09f14a84a32c..ec3b17163f7a2dd40f9b33fea42ea0c1e3330f8c 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -381,7 +381,7 @@ void prefs_actions_read_config(void)
 
                tmp = conv_codeset_strdup(buf, src_codeset, dest_codeset);
                if (!tmp) {
-                       g_warning("Faild to convert character set of action configuration\n");
+                       g_warning("Failed to convert character set of action configuration\n");
                        tmp = g_strdup(buf);
                }
 
@@ -408,7 +408,7 @@ void prefs_actions_write_config(void)
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
        if ((pfile= prefs_write_open(rcpath)) == NULL) {
-               g_warning("failed to write configuration to file\n");
+               g_warning("Failed to write configuration to file\n");
                g_free(rcpath);
                return;
        }
@@ -421,7 +421,7 @@ void prefs_actions_write_config(void)
 
                act = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
                if (!act) {
-                       g_warning("Faild to convert character set of action configuration\n");
+                       g_warning("Failed to convert character set of action configuration\n");
                        act = g_strdup(act);
                }
 

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index 4973165e1f45b15908b60f44a0aeb96649e6ba14..2127455dac237ce04f4ecaf59c722fcba12c9773 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -181,7 +181,7 @@ void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
                                tmp = g_strdup("");
                        }
                        if (!tmp) {
-                               g_warning("failed to convert character set.");
+                               g_warning("Failed to convert character set.");
                                tmp = g_strdup(value);
                        }
                        g_free(*((gchar **)param[i].data));
@@ -237,7 +237,7 @@ void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
 #define TRY(func) \
 if (!(func)) \
 { \
-       g_warning("failed to write configuration to file\n"); \
+       g_warning("Failed to write configuration to file\n"); \
        if (orig_fp) fclose(orig_fp); \
        prefs_file_close_revert(pfile); \
        g_free(rcpath); \
@@ -265,7 +265,7 @@ void prefs_write_config(PrefParam *param, const gchar *label,
        }
 
        if ((pfile = prefs_write_open(rcpath)) == NULL) {
-               g_warning("failed to write configuration to file\n");
+               g_warning("Failed to write configuration to file\n");
                if (orig_fp) fclose(orig_fp);
                g_free(rcpath);
                return;
@@ -321,7 +321,7 @@ void prefs_write_config(PrefParam *param, const gchar *label,
 
        if (orig_fp) fclose(orig_fp);
        if (prefs_file_close(pfile) < 0)
-               g_warning("failed to write configuration to file\n");
+               g_warning("Failed to write configuration to file\n");
        g_free(rcpath);
 
        debug_print("Configuration is saved.\n");
@@ -439,7 +439,7 @@ void prefs_set_default(PrefParam *param)
                                                                    CS_INTERNAL)
                                                : g_strdup("");
                                        if (!tmp) {
-                                               g_warning("faild to convert character set.");
+                                               g_warning("Failed to convert character set.");
                                                tmp = g_strdup(envstr);
                                        }
                                        *((gchar **)param[i].data) = tmp;
@@ -1061,7 +1061,7 @@ static gboolean prefs_read_config_from_cache(PrefParam *param, const gchar *labe
        sections_table = g_hash_table_lookup(whole_cache, rcfile);
        
        if (sections_table == NULL) {
-               g_warning("can't find %s in the whole cache\n", rcfile);
+               g_warning("Can't find %s in the whole cache\n", rcfile);
                return FALSE;
        }
        values_table = g_hash_table_lookup(sections_table, label);

diff --git a/src/summaryview.c b/src/summaryview.c
index c97691e8e32d185e8b28d49a6bc8a16a6b817a20..793313ed3a95f0602f581d4104525305754565f2 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4215,7 +4215,7 @@ void summary_save_as(SummaryView *summaryview)
                                               conv_get_locale_charset_str(),
                                               CS_UTF_8);
                if (!filename) {
-                       g_warning("summary_save_as(): faild to convert character set.");
+                       g_warning("summary_save_as(): failed to convert character set.");
                        filename = g_strdup(oldstr);
                }
                dest = filesel_select_file_save(_("Save as"), filename);