need to keep caption in UTF8 always because it might contain
authorgc <gc>
Mon, 2 Jan 2006 17:46:16 +0000 (17:46 +0000)
committergc <gc>
Mon, 2 Jan 2006 17:46:16 +0000 (17:46 +0000)
characters impossible to encode with default encoding

bin/booh

index a91dbac968e7b88115a9bc97e69eacfb880c4b81..f59d3da5b8ab1fd02097ab5ad0b528df1bd09ca7 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -951,7 +951,7 @@ def add_thumbnail(autotable, filename, type, thumbnail_img, caption)
     tooltips.set_tip(evtbox, utf8(type == 'video' ? (_("%s (video - %s KB)") % [tipname, commify(file_size(fullpath)/1024)]) : tipname), nil)
 
     frame2, textview = create_editzone($autotable_sw, 1, img)
-    textview.buffer.text = utf8(caption)
+    textview.buffer.text = caption
     textview.set_justification(Gtk::Justification::CENTER)
 
     vbox = Gtk::VBox.new(false, 5)
@@ -2315,7 +2315,7 @@ def change_dir
             #- element (image or video) of this album
             dest_img = build_full_dest_filename(element.attributes['filename']).sub(/\.[^\.]+$/, '') + "-#{$default_size['thumbnails']}.jpg"
             msg 3, "dest_img: #{dest_img}"
-            add_thumbnail($autotable, element.attributes['filename'], element.name, dest_img, from_utf8(element.attributes['caption']))
+            add_thumbnail($autotable, element.attributes['filename'], element.name, dest_img, element.attributes['caption'])
             total[element.name] += 1
         end
         if element.name == 'dir' && !element.attributes['deleted']