fix some utf8 problems with filenames

diff --git a/bin/booh-gui b/bin/booh-gui
index ebe8a228fb3e153345cc06e7e7f0f9ca8c4f6d3c..34bc045dd96592e323ff3d6adce48def9452871b 100755 (executable)
--- a/bin/booh-gui
+++ b/bin/booh-gui
@@ -952,7 +952,7 @@ def change_dir
                                             Gtk::FileChooser::ACTION_OPEN,
                                             nil,
                                             [Gtk::Stock::OPEN, Gtk::Dialog::RESPONSE_ACCEPT], [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL])
-            fc.set_current_folder(xmldir.attributes['path'])
+            fc.set_current_folder(from_utf8(xmldir.attributes['path']))
             fc.transient_for = $main_window
             fc.preview_widget = preview = Gtk::Alignment.new(0.5, 0.5, 0, 0).add(f = Gtk::Frame.new.set_shadow_type(Gtk::SHADOW_ETCHED_OUT))
             f.add(preview_img = Gtk::Image.new)

diff --git a/lib/booh/booh-lib.rb b/lib/booh/booh-lib.rb
index 8eda1e45a967d6049b3da8f7fba6faf7214255bf..dbea713a088995abecd47e397ec74eb4f0a9f2a9 100644 (file)
--- a/lib/booh/booh-lib.rb
+++ b/lib/booh/booh-lib.rb
@@ -327,7 +327,7 @@ module Booh
 
     def find_subalbum_caption_info(xmldir)
         type = find_subalbum_info_type(xmldir)
-        return from_utf8(xmldir.attributes["#{type}-captionfile"]), xmldir.attributes["#{type}-caption"]
+        return [ from_utf8(xmldir.attributes["#{type}-captionfile"]), xmldir.attributes["#{type}-caption"] ]
     end
 
     def file_size(path)