Ruby GTK3移行後のメインリポジトリ
リビジョン | 71da614a8707e8b0617d283839c3e5cf807cced8 (tree) |
---|---|
日時 | 2015-03-16 23:50:08 |
作者 | Shyouzou Sugitani <shy@user...> |
コミッター | Shyouzou Sugitani |
update sakura.rb
@@ -958,10 +958,9 @@ module Sakura | ||
958 | 958 | def proc(arg=self) |
959 | 959 | @vanished_count += 1 |
960 | 960 | @ghost_time = 0 |
961 | -### FIXME | |
962 | -# GLib.idle_add( | |
963 | -# lambda a: @parent.handle_request('NOTIFY', 'vanish_sakura', *a), | |
964 | -# [arg, nil]) | |
961 | + GLib::Idle.add([arg, nil]){|a, args| | |
962 | + @parent.handle_request('NOTIFY', 'vanish_sakura', a, args) | |
963 | + } | |
965 | 964 | end |
966 | 965 | enqueue_event('OnVanishSelected', proc=proc) |
967 | 966 | @vanished = 1 ## FIXME |
@@ -983,7 +982,7 @@ module Sakura | ||
983 | 982 | end |
984 | 983 | |
985 | 984 | def notify_deiconified() |
986 | - if not @cantalk | |
985 | + if @cantalk == 0 | |
987 | 986 | @cantalk = 1 |
988 | 987 | @parent.handle_request('NOTIFY', 'select_current_sakura') |
989 | 988 | if not @passivemode |
@@ -1805,7 +1804,7 @@ module Sakura | ||
1805 | 1804 | host, show_sstp_marker, use_translator, \ |
1806 | 1805 | @sstp_entry_db, @sstp_request_handler = \ |
1807 | 1806 | script_queue.pop(0) |
1808 | - if @cantalk | |
1807 | + if @cantalk != 0 | |
1809 | 1808 | if show_sstp_marker |
1810 | 1809 | @balloon.show_sstp_message(sender, host) |
1811 | 1810 | else |