コミット: e44fe56ab4dde3de2f16fd7746e3ea6a6acedff0 - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

コミットメタ情報

• リビジョン: e44fe56ab4dde3de2f16fd7746e3ea6a6acedff0 (tree)
• 日時: 2015-05-25 21:08:33
• 作者: Shyouzou Sugitani <shy@user...>
• コミッター: Shyouzou Sugitani

ログメッセージ

assorted fixes(26)

変更サマリ

• modified: lib/ninix/sstp.rb
• modified: lib/ninix_main.rb

差分

--- a/lib/ninix/sstp.rb
+++ b/lib/ninix/sstp.rb
@@ -32,15 +32,6 @@ module SSTP
       @request_handler = nil
     end
 
-#    def shutdown_request(request)
-#      if @request_handler != nil
-#        # XXX: send_* methods can be called from outside of the handler
-#        pass # keep alive
-#      else
-#        super(request) #AsynchronousSSTPServer.shutdown_request(self, request)
-#      end
-#    end
-
     def set_responsible(parent)
       @parent = parent
     end
@@ -67,10 +58,8 @@ module SSTP
       begin
         @request_handler.send_response(code)
         if data != nil
-#          @request_handler.wfile.write(data)
           @request_handler.write(data) # FIXME
         end
-#        @request_handler.force_finish()
         @request_handler.shutdown(Socket::SHUT_WR) # XXX
       rescue #except IOError:
         #pass
@@ -116,16 +105,6 @@ module SSTP
       end
     end
 
-#    def force_finish
-#      BaseSSTPRequestHandler.finish(self)
-#    end
-
-#    def finish
-#      if @server.request_handler == nil
-#        BaseSSTPRequestHandler.finish(self)
-#      end
-#    end
-
     # SEND
     def do_SEND_1_0
       handle_send(1.0)
@@ -268,7 +247,7 @@ module SSTP
     end
 
     def get_script_odict
-      script_odict = {} #OrderedDict()
+      script_odict = {} # Ordered Hash
       if_ghost = nil
       for item in @headers
         name, value = item

--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -27,7 +27,6 @@
 #import importlib
 #import locale
 #import multiprocessing
-#from collections import OrderedDict
 
 #if os.name == 'nt': # locale setting for windows
 #    lang = os.getenv('LANG')
@@ -684,7 +683,7 @@ module Ninix_Main
       @__menu = Menu::Menu.new
       @__menu.set_responsible(self)
       @__menu_owner = nil
-      @ghosts = {} # OrderedDict
+      @ghosts = {} # Ordered Hash
       odict_baseinfo = Home.search_ghosts()
       for key, value in odict_baseinfo
         holon = Ghost.new(key)
@@ -692,7 +691,7 @@ module Ninix_Main
         @ghosts[key] = holon 
         holon.baseinfo = value
       end
-      @balloons = {} # OrderedDict
+      @balloons = {} # Ordered Hash
       odict_baseinfo = Home.search_balloons()
       for key, value in odict_baseinfo
         meme = BalloonMeme.new(key)
@@ -1061,7 +1060,7 @@ module Ninix_Main
     end
 
     def create_balloon_menu
-      balloon_menuitems = {} # OrderedDict()
+      balloon_menuitems = {} # Ordered Hash
       for key in @balloons.keys
         balloon_menuitems[key] = @balloons[key].menuitem
       end