remove some debugging things
[booh] / bin / booh
index 6bfdd9c41b17c18702e25ab5a8944cad816af4a5..779abdb64d588646fc88ccff88d0353a66489725 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -700,7 +700,6 @@ def gen_real_thumbnail(type, origfile, destfile, xmldir, size, img, infotype)
         push_mousecursor_wait
         gen_real_thumbnail_core(type, origfile, destfile, xmldir, size, infotype)
         gtk_thread_protect {
-            puts "destroyed: " + img.destroyed?.to_s
             img.set(destfile)
             $modified_pixbufs[destfile] = { :orig => img.pixbuf, :pixbuf => img.pixbuf, :angle_to_orig => 0 }
         }
@@ -1692,32 +1691,32 @@ def backend_wait_message(parent, msg, infopipe_path, mode)
                     elements += sizes
                 end
                 element_counter = 0
-                gtk_thread_protect { puts "destroyed: " + pb1_1.destroyed?.to_s; pb1_1.fraction = 0 }
+                gtk_thread_protect { pb1_1.fraction = 0 }
                 if mode != 'one dir scan'
                     newtext = utf8(full_src_dir_to_rel($1, $2))
                     newtext = '/' if newtext == ''
-                    gtk_thread_protect { puts "destroyed: " + pb1_2.destroyed?.to_s; pb1_2.text = newtext }
+                    gtk_thread_protect { pb1_2.text = newtext }
                     directories_counter += 1
-                    gtk_thread_protect { puts "destroyed: " + pb1_2.destroyed?.to_s; pb1_2.fraction = directories_counter / directories }
+                    gtk_thread_protect { pb1_2.fraction = directories_counter / directories }
                 end
             elsif line =~ /^processing element$/
                 element_counter += 1
-                gtk_thread_protect { puts "destroyed: " + pb1_1.destroyed?.to_s; pb1_1.fraction = element_counter / elements }
+                gtk_thread_protect { pb1_1.fraction = element_counter / elements }
             elsif line =~ /^processing size$/
                 element_counter += 1
-                gtk_thread_protect { puts "destroyed: " + pb1_1.destroyed?.to_s; pb1_1.fraction = element_counter / elements }
+                gtk_thread_protect { pb1_1.fraction = element_counter / elements }
             elsif line =~ /^finished processing sizes$/
-                gtk_thread_protect { puts "destroyed: " + pb1_1.destroyed?.to_s; pb1_1.fraction = 1 }
+                gtk_thread_protect { pb1_1.fraction = 1 }
             elsif line =~ /^creating index.html$/
-                gtk_thread_protect { puts "destroyed: " + pb1_2.destroyed?.to_s; pb1_2.text = utf8(_("finished")) }
-                gtk_thread_protect { puts "destroyed: " + pb1_1.destroyed?.to_s; pb1_1.fraction = pb1_2.fraction = 1 }
+                gtk_thread_protect { pb1_2.text = utf8(_("finished")) }
+                gtk_thread_protect { pb1_1.fraction = pb1_2.fraction = 1 }
                 directories_counter = 0
             elsif line =~ /^index.html: (.+)\|(.+)/
                 newtext = utf8(full_src_dir_to_rel($1, $2))
                 newtext = '/' if newtext == ''
-                gtk_thread_protect { puts "destroyed: " + pb2.destroyed?.to_s; pb2.text = newtext }
+                gtk_thread_protect { pb2.text = newtext }
                 directories_counter += 1
-                gtk_thread_protect { puts "destroyed: " + pb2.destroyed?.to_s; pb2.fraction = directories_counter / directories }
+                gtk_thread_protect { pb2.fraction = directories_counter / directories }
             elsif line =~ /^die: (.*)$/
                 $diemsg = $1
             end
@@ -1751,7 +1750,7 @@ def call_backend(cmd, waitmsg, mode, params)
         msg 2, cmd
         if pid = fork
             id, exitstatus = Process.waitpid2(pid)
-            gtk_thread_protect { puts "destroyed: " + w8.destroyed?.to_s; w8.destroy }
+            gtk_thread_protect { w8.destroy }
             if exitstatus == 0
                 if params[:successmsg]
                     gtk_thread_protect { show_popup($main_window, params[:successmsg], { :linkurl => params[:successmsg_linkurl] }) }
@@ -2547,7 +2546,7 @@ def new_album
             if File.directory?(from_utf8(src_nb_calculated_for)) && src_nb_calculated_for != '/'
                 if File.readable?(from_utf8(src_nb_calculated_for))
                     src_nb_thread = Thread.new {
-                        gtk_thread_protect { puts "destroyed: " + src_nb.destroyed?.to_s; src_nb.set_markup(utf8(_("<span size='small'><i>processing...</i></span>"))) }
+                        gtk_thread_protect { src_nb.set_markup(utf8(_("<span size='small'><i>processing...</i></span>"))) }
                         total = { 'image' => 0, 'video' => 0, nil => 0 }
                         `find '#{from_utf8(src_nb_calculated_for)}' -type d -follow`.each { |dir|
                             if File.basename(dir) =~ /^\./
@@ -2561,7 +2560,7 @@ def new_album
                                 end
                             end
                         }
-                        gtk_thread_protect { puts "destroyed: " + src_nb.destroyed?.to_s; src_nb.set_markup(utf8(_("<span size='small'><i>%s images and %s videos</i></span>") % [ total['image'], total['video'] ])) }
+                        gtk_thread_protect { src_nb.set_markup(utf8(_("<span size='small'><i>%s images and %s videos</i></span>") % [ total['image'], total['video'] ])) }
                         src_nb_thread = nil
                     }
                 else