svnno****@sourc*****
svnno****@sourc*****
Sat Feb 21 22:14:45 JST 2009
Revision: 3746
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3746
Author: ikezoe
Date: 2009-02-21 22:14:45 +0900 (Sat, 21 Feb 2009)
Log Message:
-----------
fix compiler warnings.
Modified Paths:
--------------
kazehakase/trunk/ext/ruby/kz-rb-downloader.c
kazehakase/trunk/ext/ruby/kz-rb-embed.c
kazehakase/trunk/ext/ruby/kz-rb-notebook.c
kazehakase/trunk/ext/ruby/kz-rb-window.c
Modified: kazehakase/trunk/ext/ruby/kz-rb-downloader.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-downloader.c 2009-02-21 13:14:44 UTC (rev 3745)
+++ kazehakase/trunk/ext/ruby/kz-rb-downloader.c 2009-02-21 13:14:45 UTC (rev 3746)
@@ -43,9 +43,9 @@
}
static VALUE
-rb_kz_dl_get_string(VALUE self)
+rb_kz_dl_get_buffer(VALUE self)
{
- return CSTR2RVAL(kz_downloader_get_string(_SELF(self)));
+ return CSTR2RVAL(kz_downloader_get_buffer(_SELF(self)));
}
static VALUE
@@ -84,7 +84,7 @@
rb_define_method(cKzDownloader, "cancel", rb_kz_dl_cancel, 0);
rb_define_method(cKzDownloader, "to_file", rb_kz_dl_to_file, 0);
rb_define_method(cKzDownloader, "to_buffer", rb_kz_dl_to_buffer, 0);
- rb_define_method(cKzDownloader, "string", rb_kz_dl_get_string, 0);
+ rb_define_method(cKzDownloader, "string", rb_kz_dl_get_buffer, 0);
rb_define_method(cKzDownloader, "size", rb_kz_dl_get_size, 0);
rb_define_method(cKzDownloader, "percent", rb_kz_dl_get_percent, 0);
rb_define_method(cKzDownloader, "current_progress",
Modified: kazehakase/trunk/ext/ruby/kz-rb-embed.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-embed.c 2009-02-21 13:14:44 UTC (rev 3745)
+++ kazehakase/trunk/ext/ruby/kz-rb-embed.c 2009-02-21 13:14:45 UTC (rev 3746)
@@ -26,6 +26,7 @@
#define _SELF(obj) (KZ_EMBED(RVAL2GOBJ(obj)))
#define RVAL2KZBOOKMARK(obj) (KZ_BOOKMARK(RVAL2GOBJ(obj)))
+#define RVAL2KZBOOKMARKFOLDER(obj) (KZ_BOOKMARK_FOLDER(RVAL2GOBJ(obj)))
#define RVAL2KZNAVI(obj) (KZ_NAVI(RVAL2GOBJ(obj)))
#define RVAL2KZNAVLINK(obj) (RVAL2GENUM(obj, KZ_TYPE_EMBED_NAV_LINK))
#define RVAL2KZRF(obj) (RVAL2GENUM(obj, KZ_TYPE_EMBED_RELOAD_FLAG))
@@ -475,12 +476,12 @@
static VALUE
rb_kz_embed_create_thumbnail(int argc, VALUE *argv, VALUE self)
{
- EggPixbufThumbSize size;
+ EggPixbufThumbnailSize size;
VALUE rb_size;
rb_scan_args(argc, argv, "01", &rb_size);
if (NIL_P(rb_size))
- size = EGG_PIXBUF_THUMB_LARGE;
+ size = EGG_PIXBUF_THUMBNAIL_LARGE;
else
size = NUM2INT(rb_size); /* FIXME */
kz_embed_create_thumbnail(_SELF(self), size);
@@ -540,14 +541,14 @@
static VALUE
rb_kz_embed_set_history(VALUE self, VALUE history)
{
- kz_embed_set_history(_SELF(self), RVAL2KZBOOKMARK(history));
+ kz_embed_set_history(_SELF(self), RVAL2KZBOOKMARKFOLDER(history));
return self;
}
static VALUE
rb_kz_embed_get_history(VALUE self, VALUE history)
{
- kz_embed_get_history(_SELF(self), RVAL2KZBOOKMARK(history));
+ kz_embed_get_history(_SELF(self), RVAL2KZBOOKMARKFOLDER(history));
return self;
}
Modified: kazehakase/trunk/ext/ruby/kz-rb-notebook.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-notebook.c 2009-02-21 13:14:44 UTC (rev 3745)
+++ kazehakase/trunk/ext/ruby/kz-rb-notebook.c 2009-02-21 13:14:45 UTC (rev 3746)
@@ -22,6 +22,7 @@
#define _SELF(obj) RVAL2KZNB(obj)
#define RVAL2GDKSD(obj) RVAL2GENUM(obj, GDK_TYPE_SCROLL_DIRECTION)
+#define RVAL2KZEMBED(obj) (KZ_EMBED(RVAL2GOBJ(obj)))
static VALUE
rb_kz_notebook_new(VALUE self, VALUE kz)
@@ -61,7 +62,7 @@
rb_kz_notebook_close_tab(VALUE self, VALUE widget)
{
gboolean result;
- result = kz_notebook_close_tab(_SELF(self), RVAL2GTKWIDGET(widget));
+ result = kz_notebook_close_tab(_SELF(self), RVAL2KZEMBED(widget));
return CBOOL2RVAL(result);
}
Modified: kazehakase/trunk/ext/ruby/kz-rb-window.c
===================================================================
--- kazehakase/trunk/ext/ruby/kz-rb-window.c 2009-02-21 13:14:44 UTC (rev 3745)
+++ kazehakase/trunk/ext/ruby/kz-rb-window.c 2009-02-21 13:14:45 UTC (rev 3746)
@@ -24,6 +24,8 @@
#define RVAL2GTKACTION(obj) (GTK_ACTION(RVAL2GOBJ(obj)))
#define RVAL2GNODE(obj) (GTK_GNODE(RVAL2GOBJ(obj)))
#define RVAL2KZBOOKMARK(obj) (KZ_BOOKMARK(RVAL2GOBJ(obj)))
+#define RVAL2KZBOOKMARKFOLDER(obj) (KZ_BOOKMARK_FOLDER(RVAL2GOBJ(obj)))
+#define RVAL2KZEMBED(obj) (KZ_EMBED(RVAL2GOBJ(obj)))
static ID id_default;
@@ -73,7 +75,7 @@
static VALUE
rb_kz_window_close_tab(VALUE self, VALUE widget)
{
- kz_window_close_tab(_SELF(self), RVAL2GTKWIDGET(widget));
+ kz_window_close_tab(_SELF(self), RVAL2KZEMBED(widget));
return self;
}
@@ -154,7 +156,7 @@
{
GtkWidget *Widget;
Widget = kz_window_get_tab_label(_SELF(self),
- RVAL2GTKWIDGET(widget));
+ RVAL2KZEMBED(widget));
return GOBJ2RVAL(Widget);
}
@@ -197,7 +199,7 @@
static VALUE
rb_kz_window_append_closed_tab(VALUE self, VALUE bookmark)
{
- kz_window_append_closed_tab(_SELF(self), RVAL2KZBOOKMARK(bookmark));
+ kz_window_append_closed_tab(_SELF(self), RVAL2KZBOOKMARKFOLDER(bookmark));
return self;
}
@@ -263,13 +265,13 @@
static VALUE
rb_kz_window_nth_page(VALUE self, VALUE n)
{
- return GOBJ2RVAL(KZ_WINDOW_NTH_PAGE(_SELF(self), NUM2INT(n)));
+ return GOBJ2RVAL(KZ_WINDOW_NTH_EMBED(_SELF(self), NUM2INT(n)));
}
static VALUE
rb_kz_window_current_page(VALUE self)
{
- return GOBJ2RVAL(KZ_WINDOW_CURRENT_PAGE(_SELF(self)));
+ return GOBJ2RVAL(KZ_WINDOW_CURRENT_EMBED(_SELF(self)));
}
void