[geary/wip/attachment-filename-714549] CR fix

[Charles Lindsay <clindsay src gnome org>]

commit 433a80e6ca12895c5a16a74089da8bf436c847ff
Author: Charles Lindsay <chaz yorba org>
Date:   Thu Mar 6 14:47:11 2014 -0800

    CR fix

 src/engine/rfc822/rfc822-utils.vala |    9 ---------
 src/engine/rfc822/rfc822.vala       |    8 ++++++++
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/engine/rfc822/rfc822-utils.vala b/src/engine/rfc822/rfc822-utils.vala
index 0cdd6c1..7d94d83 100644
--- a/src/engine/rfc822/rfc822-utils.vala
+++ b/src/engine/rfc822/rfc822-utils.vala
@@ -11,8 +11,6 @@ namespace Geary.RFC822.Utils {
 // in UTF-8, and is unmolested by GMime.FilterHTML.
 public const char QUOTE_MARKER = '\x7f';
 
-private Regex? invalid_filename_character_re = null;
-
 public GMime.FilterCharset create_utf8_filter_charset(string from_charset) {
     GMime.FilterCharset? filter_charset = new GMime.FilterCharset(from_charset, "UTF-8");
     if (filter_charset == null) {
@@ -328,13 +326,6 @@ public string get_clean_attachment_filename(GMime.Part part) {
         /// Placeholder filename for attachments with no filename.
         filename = _("none");
     }
-    if (invalid_filename_character_re == null) {
-        try {
-            invalid_filename_character_re = new Regex("[/\\0]");
-        } catch (RegexError e) {
-            assert_not_reached();
-        }
-    }
     
     try {
         filename = invalid_filename_character_re.replace_literal(filename, filename.length, 0, "_");
diff --git a/src/engine/rfc822/rfc822.vala b/src/engine/rfc822/rfc822.vala
index 2a5d93d..ec8791e 100644
--- a/src/engine/rfc822/rfc822.vala
+++ b/src/engine/rfc822/rfc822.vala
@@ -8,11 +8,19 @@ namespace Geary.RFC822 {
 
 private int init_count = 0;
 
+internal Regex? invalid_filename_character_re = null;
+
 internal void init() {
     if (init_count++ != 0)
         return;
     
     GMime.init(GMime.ENABLE_RFC2047_WORKAROUNDS);
+    
+    try {
+        invalid_filename_character_re = new Regex("[/\\0]");
+    } catch (RegexError e) {
+        assert_not_reached();
+    }
 }
 
 }