diff options
| author | toshi <toshi@03aab468-d3d2-4883-8b12-f661bbf03fa8> | 2012-04-15 19:59:43 +0000 |
|---|---|---|
| committer | toshi <toshi@03aab468-d3d2-4883-8b12-f661bbf03fa8> | 2012-04-15 19:59:43 +0000 |
| commit | f6e140ed8da5094a3cd1df19508017186de58069 (patch) | |
| tree | 20e33cd89ee56266ed84761fa47efb7b45888857 /core | |
| parent | 56f8cfbc06504a719431255b3d51a79fd2a43bed (diff) | |
| parent | 08b05978e33d3f355af9bac3d951121b9dbbfcc1 (diff) | |
| download | mikutter-f6e140ed8da5094a3cd1df19508017186de58069.tar.gz | |
Merge remote-tracking branch 'remotes/0.1'
git-svn-id: svn://toshia.dip.jp/mikutter/trunk@740 03aab468-d3d2-4883-8b12-f661bbf03fa8
Diffstat (limited to 'core')
| -rw-r--r-- | core/addon/bugreport.rb | 2 | ||||
| -rw-r--r-- | core/config.rb | 2 | ||||
| -rw-r--r-- | core/mui/cairo_miracle_painter.rb | 5 | ||||
| -rw-r--r-- | core/utils.rb | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/core/addon/bugreport.rb b/core/addon/bugreport.rb index fe13531f..3f879aeb 100644 --- a/core/addon/bugreport.rb +++ b/core/addon/bugreport.rb @@ -99,7 +99,7 @@ Module.new do def self.revision begin - open('|env LANG=C svn info').read.match(/Revision\s*:\s*(\d+)/)[1] + open('|env LC_ALL=C svn info').read.match(/Revision\s*:\s*(\d+)/)[1] rescue '' end end diff --git a/core/config.rb b/core/config.rb index ab07dfbe..5b9bc765 100644 --- a/core/config.rb +++ b/core/config.rb @@ -39,7 +39,7 @@ module CHIConfig # 再起動後に、前回取得したポストを取得しない NeverRetrieveOverlappedMumble = false - REVISION = 710 + REVISION = 723 # このソフトのバージョン。 VERSION = [0,1,1, ((/Last Changed Rev\s*:\s*(\d+)/.match(`sh -c 'LC_ALL=C svn info ../'`)[1] || REVISION).to_i rescue REVISION)] diff --git a/core/mui/cairo_miracle_painter.rb b/core/mui/cairo_miracle_painter.rb index 8180213a..8dc29923 100644 --- a/core/mui/cairo_miracle_painter.rb +++ b/core/mui/cairo_miracle_painter.rb @@ -130,9 +130,8 @@ class Gdk::MiraclePainter < Gtk::Object l = message.links.segment_by_index(index) l[:callback].call(l) if l end end when 3 - menu_pop(e) - end - end + @tree.get_ancestor(Gtk::Window).set_focus(@tree) + menu_pop(e) end end # 座標 ( _x_ , _y_ ) にマウスオーバーイベントを発生させる def point_moved(x, y) diff --git a/core/utils.rb b/core/utils.rb index d499c00b..36b4bb45 100644 --- a/core/utils.rb +++ b/core/utils.rb @@ -86,7 +86,7 @@ def gen_counter(count=0, increment=1) # ファイルの内容を文字列に読み込む def file_get_contents(fn) - open(fn, 'r'){ |input| + open(fn, 'r:utf-8'){ |input| input.read } end |