svnno****@sourc*****
svnno****@sourc*****
Sun Sep 27 08:57:27 JST 2009
Revision: 3849
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3849
Author: kous
Date: 2009-09-27 08:57:27 +0900 (Sun, 27 Sep 2009)
Log Message:
-----------
* ext/ruby/kz-rb-embed.c,
ext/ruby/kz-rb-window.c,
data/ext/ruby/kz/actions/move-to-anchor.rb,
data/ext/ruby/kz/actions/reload-without-fragment.rb,
data/ext/ruby/kz/actions/text-link.rb: url -> uri.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/data/ext/ruby/kz/actions/move-to-anchor.rb
kazehakase/trunk/data/ext/ruby/kz/actions/reload-without-fragment.rb
kazehakase/trunk/data/ext/ruby/kz/actions/text-link.rb
kazehakase/trunk/ext/ruby/kz-rb-embed.c
kazehakase/trunk/ext/ruby/kz-rb-window.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-09-26 23:53:01 UTC (rev 3848)
+++ kazehakase/trunk/ChangeLog 2009-09-26 23:57:27 UTC (rev 3849)
@@ -1,5 +1,11 @@
2009-09-27 Kouhei Sutou <kou****@cozmi*****>
+ * ext/ruby/kz-rb-embed.c,
+ ext/ruby/kz-rb-window.c,
+ data/ext/ruby/kz/actions/move-to-anchor.rb,
+ data/ext/ruby/kz/actions/reload-without-fragment.rb,
+ data/ext/ruby/kz/actions/text-link.rb: url -> uri.
+
* dbus/Makefile.am: add missing include path.
2009-09-11 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/data/ext/ruby/kz/actions/move-to-anchor.rb
===================================================================
--- kazehakase/trunk/data/ext/ruby/kz/actions/move-to-anchor.rb 2009-09-26 23:53:01 UTC (rev 3848)
+++ kazehakase/trunk/data/ext/ruby/kz/actions/move-to-anchor.rb 2009-09-26 23:57:27 UTC (rev 3849)
@@ -11,7 +11,7 @@
end
end
target_anchor = yield(anchors, index)
- kz.load_url(target_anchor.link) if target_anchor and target_anchor.link
+ kz.load_uri(target_anchor.link) if target_anchor and target_anchor.link
end
def act_move_to_previous_anchor(action, group, kz)
Modified: kazehakase/trunk/data/ext/ruby/kz/actions/reload-without-fragment.rb
===================================================================
--- kazehakase/trunk/data/ext/ruby/kz/actions/reload-without-fragment.rb 2009-09-26 23:53:01 UTC (rev 3848)
+++ kazehakase/trunk/data/ext/ruby/kz/actions/reload-without-fragment.rb 2009-09-26 23:57:27 UTC (rev 3849)
@@ -2,7 +2,7 @@
page = kz.current_page
if page and page.location
uri = page.location
- page.load_url(uri.gsub(/#.*$/, ''))
+ page.load_uri(uri.gsub(/#.*$/, ''))
kz.activate_action("Reload")
end
end
Modified: kazehakase/trunk/data/ext/ruby/kz/actions/text-link.rb
===================================================================
--- kazehakase/trunk/data/ext/ruby/kz/actions/text-link.rb 2009-09-26 23:53:01 UTC (rev 3848)
+++ kazehakase/trunk/data/ext/ruby/kz/actions/text-link.rb 2009-09-26 23:57:27 UTC (rev 3849)
@@ -23,7 +23,7 @@
if new_tab
kz.open_new_tab(normalized_uri)
else
- kz.load_url(normalized_uri)
+ kz.load_uri(normalized_uri)
end
end
end
Modified: kazehakase/trunk/ext/ruby/kz-rb-embed.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-embed.c 2009-09-26 23:53:01 UTC (rev 3848)
+++ kazehakase/trunk/ext/ruby/kz-rb-embed.c 2009-09-26 23:57:27 UTC (rev 3849)
@@ -1,7 +1,7 @@
/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
/*
- * Copyright (C) 2007 Kouhei Sutou <kou****@cozmi*****>
+ * Copyright (C) 2007-2009 Kouhei Sutou <kou****@cozmi*****>
* Copyright (C) 2006 Eriko Sato
*
* This program is free software; you can redistribute it and/or modify
@@ -40,9 +40,9 @@
}
static VALUE
-rb_kz_embed_load_url(VALUE self, VALUE url)
+rb_kz_embed_load_uri(VALUE self, VALUE url)
{
- kz_embed_load_url(_SELF(self), RVAL2CSTR(url));
+ kz_embed_load_uri(_SELF(self), RVAL2CSTR(url));
return self;
}
@@ -618,7 +618,7 @@
rb_define_method(cKzEmbed, "window", rb_kz_embed_get_window, 0);
- rb_define_method(cKzEmbed, "load_url", rb_kz_embed_load_url, 1);
+ rb_define_method(cKzEmbed, "load_uri", rb_kz_embed_load_uri, 1);
rb_define_method(cKzEmbed, "view_source",
rb_kz_embed_view_source, 1);
rb_define_method(cKzEmbed, "loading?", rb_kz_embed_is_loading, 0);
Modified: kazehakase/trunk/ext/ruby/kz-rb-window.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-window.c 2009-09-26 23:53:01 UTC (rev 3848)
+++ kazehakase/trunk/ext/ruby/kz-rb-window.c 2009-09-26 23:57:27 UTC (rev 3849)
@@ -94,8 +94,9 @@
}
static VALUE
-rb_kz_window_load_url(VALUE self, VALUE url)
+rb_kz_window_load_uri(VALUE self, VALUE url)
{
+ /* kz_window_load_url() should be kz_window_load_uri() */
kz_window_load_url(_SELF(self), RVAL2CSTR(url));
return self;
}
@@ -300,7 +301,7 @@
rb_define_method(cKzWindow, "close_all_tab",
rb_kz_window_close_all_tab, 0);
rb_define_method(cKzWindow, "move_tab", rb_kz_window_move_tab, 2);
- rb_define_method(cKzWindow, "load_url", rb_kz_window_load_url, 1);
+ rb_define_method(cKzWindow, "load_uri", rb_kz_window_load_uri, 1);
rb_define_method(cKzWindow, "store_state",
rb_kz_window_store_state, 0);
rb_define_method(cKzWindow, "restore_state",