svnno****@sourc*****
svnno****@sourc*****
Sat Feb 14 10:40:31 JST 2009
Revision: 3675
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3675
Author: ikezoe
Date: 2009-02-14 10:40:31 +0900 (Sat, 14 Feb 2009)
Log Message:
-----------
* src/*.c: Use XX_CLASS macros instead of casting directory.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/bookmarks/kz-bookmark-bar.c
kazehakase/trunk/src/bookmarks/kz-bookmark-base-menu-item.c
kazehakase/trunk/src/bookmarks/kz-bookmark-edit-win.c
kazehakase/trunk/src/bookmarks/kz-bookmark-edit.c
kazehakase/trunk/src/bookmarks/kz-bookmark-editor.c
kazehakase/trunk/src/bookmarks/kz-bookmark-file.c
kazehakase/trunk/src/bookmarks/kz-bookmark-folder-menu-item.c
kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c
kazehakase/trunk/src/bookmarks/kz-bookmark-item.c
kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item-list.c
kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item.c
kazehakase/trunk/src/bookmarks/kz-bookmark.c
kazehakase/trunk/src/bookmarks/kz-bookmarks-view.c
kazehakase/trunk/src/bookmarks/kz-proxy-folder.c
kazehakase/trunk/src/bookmarks/kz-root-bookmark.c
kazehakase/trunk/src/bookmarks/kz-session.c
kazehakase/trunk/src/bookmarks/kz-smart-bookmark.c
kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c
kazehakase/trunk/src/dialogs/kz-links-dialog.c
kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c
kazehakase/trunk/src/dialogs/kz-print-dialog.c
kazehakase/trunk/src/dialogs/kz-prompt-dialog.c
kazehakase/trunk/src/kz-app.c
kazehakase/trunk/src/kz-autoscroller.c
kazehakase/trunk/src/kz-download-box.c
kazehakase/trunk/src/kz-downloader-group.c
kazehakase/trunk/src/kz-downloader.c
kazehakase/trunk/src/kz-favicon.c
kazehakase/trunk/src/kz-feed-info.c
kazehakase/trunk/src/kz-gesture.c
kazehakase/trunk/src/kz-navi.c
kazehakase/trunk/src/kz-notebook.c
kazehakase/trunk/src/kz-popup-preview.c
kazehakase/trunk/src/kz-popup-tablist.c
kazehakase/trunk/src/kz-prefs-win.c
kazehakase/trunk/src/kz-profile.c
kazehakase/trunk/src/kz-proxy-item.c
kazehakase/trunk/src/kz-sidebar.c
kazehakase/trunk/src/kz-statusbar.c
kazehakase/trunk/src/kz-tab-label.c
kazehakase/trunk/src/kz-thumbnails-view.c
kazehakase/trunk/src/kz-window.c
kazehakase/trunk/src/kz-xml.c
kazehakase/trunk/src/net/kz-file.c
kazehakase/trunk/src/net/kz-http.c
kazehakase/trunk/src/net/kz-io.c
kazehakase/trunk/src/net/kz-xmlrpc.c
kazehakase/trunk/src/sidebar/kz-bookmarks-sidebar.c
kazehakase/trunk/src/sidebar/kz-downloader-sidebar.c
kazehakase/trunk/src/sidebar/kz-tabtree.c
kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c
kazehakase/trunk/src/widget/kz-dlist.c
kazehakase/trunk/src/widget/kz-entry.c
kazehakase/trunk/src/widget/kz-thumbnail.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/ChangeLog 2009-02-14 01:40:31 UTC (rev 3675)
@@ -2,6 +2,7 @@
* src/generate-def.mk: Extract all symbols.
* src/utils/utils.[ch]: Workaround for exporting kz_win32_base_path.
+ * src/*.c: Use XX_CLASS macros instead of casting directory.
2009-02-13 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-bar.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-bar.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-bar.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -133,8 +133,8 @@
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- gobject_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
/* GObject class */
gobject_class->constructor = constructor;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-base-menu-item.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-base-menu-item.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-base-menu-item.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -59,9 +59,8 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
- /* GObject signals */
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
gobject_class->get_property = get_property;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-edit-win.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-edit-win.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-edit-win.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -38,8 +38,8 @@
GObjectClass *object_class;
GtkDialogClass *dialog_class;
- object_class = (GObjectClass *) klass;
- dialog_class = (GtkDialogClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
+ dialog_class = GTK_DIALOG_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-edit.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-edit.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-edit.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -89,7 +89,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->dispose = dispose;
}
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-editor.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-editor.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-editor.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -83,8 +83,8 @@
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- gobject_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-file.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-file.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-file.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -133,7 +133,7 @@
ADD_BOOKMARK_FILE_TYPE(kz_hinadi_get_file_types);
}
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-folder-menu-item.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-folder-menu-item.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-folder-menu-item.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -48,7 +48,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
/* GObject signals */
gobject_class->constructor = constructor;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-folder.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -81,7 +81,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-item.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-item.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-item.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -132,9 +132,9 @@
GtkWidgetClass *widget_class;
GtkToolItemClass *tool_item_class;
- gobject_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
- tool_item_class = (GtkToolItemClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
+ tool_item_class = GTK_TOOL_ITEM_CLASS(klass);
/* GObject signals */
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item-list.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item-list.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item-list.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -74,7 +74,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
/* GObject signals */
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-menu-item.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -47,11 +47,10 @@
GtkWidgetClass *widget_class;
GtkMenuItemClass *menu_class;
- gobject_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
- menu_class = (GtkMenuItemClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
+ menu_class = GTK_MENU_ITEM_CLASS(klass);
- /* GObject signals */
gobject_class->constructor = constructor;
widget_class->button_release_event = button_release;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -73,8 +73,7 @@
{
GObjectClass *object_class;
- kz_bookmark_parent_class = g_type_class_peek_parent (klass);
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/bookmarks/kz-bookmarks-view.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmarks-view.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-bookmarks-view.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -120,7 +120,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/bookmarks/kz-proxy-folder.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-proxy-folder.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-proxy-folder.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -66,7 +66,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->constructor = constructor;
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/bookmarks/kz-root-bookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-root-bookmark.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-root-bookmark.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -34,7 +34,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
}
Modified: kazehakase/trunk/src/bookmarks/kz-session.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-session.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-session.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -51,8 +51,8 @@
KzBookmarkFileClass *bookmark_file_class;
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
- bookmark_file_class = (KzBookmarkFileClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
+ bookmark_file_class = KZ_BOOKMARK_FILE_CLASS(klass);
bookmark_file_class->update = kz_bookmark_file_update;
Modified: kazehakase/trunk/src/bookmarks/kz-smart-bookmark.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-smart-bookmark.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/bookmarks/kz-smart-bookmark.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -63,7 +63,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/dialogs/kz-copy-format-dialog.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -85,8 +85,8 @@
GObjectClass *gobject_class;
GtkDialogClass *dialog_class;
- gobject_class = (GObjectClass *) klass;
- dialog_class = (GtkDialogClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ dialog_class = GTK_DIALOG_CLASS(klass);
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/dialogs/kz-links-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-links-dialog.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/dialogs/kz-links-dialog.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -87,8 +87,8 @@
GObjectClass *gobject_class;
GtkDialogClass *dialog_class;
- gobject_class = (GObjectClass *) klass;
- dialog_class = (GtkDialogClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ dialog_class = GTK_DIALOG_CLASS(klass);
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/dialogs/kz-password-manager-dialog.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -67,8 +67,8 @@
GObjectClass *gobject_class;
GtkDialogClass *dialog_class;
- gobject_class = (GObjectClass *) klass;
- dialog_class = (GtkDialogClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ dialog_class = GTK_DIALOG_CLASS(klass);
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/dialogs/kz-print-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-print-dialog.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/dialogs/kz-print-dialog.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -88,7 +88,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/dialogs/kz-prompt-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-prompt-dialog.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/dialogs/kz-prompt-dialog.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -122,7 +122,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-app.c
===================================================================
--- kazehakase/trunk/src/kz-app.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-app.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -154,8 +154,7 @@
{
GObjectClass *object_class;
- kz_app_parent_class = g_type_class_peek_parent(klass);
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->constructor = constructor;
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-autoscroller.c
===================================================================
--- kazehakase/trunk/src/kz-autoscroller.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-autoscroller.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -79,7 +79,7 @@
GtkWidget *icon_img;
gchar *icon_name;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-download-box.c
===================================================================
--- kazehakase/trunk/src/kz-download-box.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-download-box.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -81,11 +81,9 @@
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- kz_download_box_parent_class = g_type_class_peek_parent (klass);
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
- gobject_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
-
/* GObject signals */
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/kz-downloader-group.c
===================================================================
--- kazehakase/trunk/src/kz-downloader-group.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-downloader-group.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -66,10 +66,8 @@
{
GObjectClass *gobject_class;
- kz_downloader_group_parent_class = g_type_class_peek_parent (klass);
+ gobject_class = G_OBJECT_CLASS(klass);
- gobject_class = (GObjectClass *) klass;
-
/* GObject class */
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/kz-downloader.c
===================================================================
--- kazehakase/trunk/src/kz-downloader.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-downloader.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -73,7 +73,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->constructor = constructor;
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-favicon.c
===================================================================
--- kazehakase/trunk/src/kz-favicon.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-favicon.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -77,8 +77,7 @@
{
GObjectClass *object_class;
- kz_favicon_parent_class = g_type_class_peek_parent (klass);
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-feed-info.c
===================================================================
--- kazehakase/trunk/src/kz-feed-info.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-feed-info.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -38,13 +38,9 @@
kz_feed_info_class_init (KzFeedInfoClass *klass)
{
GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
- kz_feed_info_parent_class = g_type_class_peek_parent(klass);
+ gobject_class = G_OBJECT_CLASS(klass);
- gobject_class = (GObjectClass *)klass;
- widget_class = (GtkWidgetClass *)klass;
-
/* GtkObject signals */
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/kz-gesture.c
===================================================================
--- kazehakase/trunk/src/kz-gesture.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-gesture.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -52,7 +52,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-navi.c
===================================================================
--- kazehakase/trunk/src/kz-navi.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-navi.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -20,8 +20,7 @@
{
GObjectClass *object_class;
- kz_navi_parent_class = g_type_class_peek_parent(klass);
- object_class = (GObjectClass *)klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
}
Modified: kazehakase/trunk/src/kz-notebook.c
===================================================================
--- kazehakase/trunk/src/kz-notebook.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-notebook.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -18,13 +18,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include "kz-notebook.h"
+
#include <string.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include "gtk-utils.h"
#include "kz-tab-label.h"
-#include "kz-notebook.h"
#include "kz-actions.h"
static const gpointer KZ_NOTEBOOK_GROUP = "KzNotebookGroup";
@@ -96,9 +97,9 @@
GtkWidgetClass *widget_class;
GtkNotebookClass *notebook_class;
- gobject_class = (GObjectClass *)klass;
- widget_class = (GtkWidgetClass *)klass;
- notebook_class = (GtkNotebookClass *)klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
+ notebook_class = GTK_NOTEBOOK_CLASS(klass);
/* GtkObject signals */
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-popup-preview.c
===================================================================
--- kazehakase/trunk/src/kz-popup-preview.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-popup-preview.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -112,7 +112,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-popup-tablist.c
===================================================================
--- kazehakase/trunk/src/kz-popup-tablist.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-popup-tablist.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -83,8 +83,7 @@
{
GObjectClass *object_class;
- kz_popup_tablist_parent_class = g_type_class_peek_parent (klass);
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/kz-prefs-win.c
===================================================================
--- kazehakase/trunk/src/kz-prefs-win.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-prefs-win.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -114,9 +114,9 @@
GtkDialogClass *dialog_class;
GtkWidgetClass *widget_class;
- object_class = (GObjectClass *) klass;
- dialog_class = (GtkDialogClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
+ dialog_class = GTK_DIALOG_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-profile.c
===================================================================
--- kazehakase/trunk/src/kz-profile.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-profile.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -65,7 +65,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-proxy-item.c
===================================================================
--- kazehakase/trunk/src/kz-proxy-item.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-proxy-item.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -55,7 +55,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/kz-sidebar.c
===================================================================
--- kazehakase/trunk/src/kz-sidebar.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-sidebar.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -85,7 +85,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->dispose = kz_sidebar_dispose;
gobject_class->set_property = kz_sidebar_set_property;
Modified: kazehakase/trunk/src/kz-statusbar.c
===================================================================
--- kazehakase/trunk/src/kz-statusbar.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-statusbar.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -92,12 +92,9 @@
kz_statusbar_class_init (KzStatusbarClass *klass)
{
GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
- gobject_class = (GObjectClass *)klass;
- widget_class = (GtkWidgetClass *)klass;
+ gobject_class = G_OBJECT_CLASS(klass);
- /* GtkObject signals */
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/kz-tab-label.c
===================================================================
--- kazehakase/trunk/src/kz-tab-label.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-tab-label.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -148,8 +148,8 @@
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- gobject_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
/* GtkObject signals */
gobject_class->constructor = constructor;
Modified: kazehakase/trunk/src/kz-thumbnails-view.c
===================================================================
--- kazehakase/trunk/src/kz-thumbnails-view.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-thumbnails-view.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -79,8 +79,8 @@
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- object_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
object_class->dispose = dispose;
Modified: kazehakase/trunk/src/kz-window.c
===================================================================
--- kazehakase/trunk/src/kz-window.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-window.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -282,12 +282,12 @@
kz_window_class_init (KzWindowClass *klass)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
+ GtkObjectClass *gtk_object_class;
GtkWidgetClass *widget_class;
- gobject_class = (GObjectClass *) klass;
- object_class = (GtkObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ gtk_object_class = GTK_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
kz_window_signals[APPEND_TAB_SIGNAL]
= g_signal_new("append-tab",
@@ -320,7 +320,7 @@
GTK_TYPE_WIDGET, G_TYPE_INT);
/* GtkObject signals */
- object_class->destroy = destroy;
+ gtk_object_class->destroy = destroy;
/* GtkWidget signals */
widget_class->delete_event = delete_event;
Modified: kazehakase/trunk/src/kz-xml.c
===================================================================
--- kazehakase/trunk/src/kz-xml.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/kz-xml.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -47,7 +47,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
g_type_class_add_private (object_class, sizeof(KzXMLPrivate));
Modified: kazehakase/trunk/src/net/kz-file.c
===================================================================
--- kazehakase/trunk/src/net/kz-file.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/net/kz-file.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -60,8 +60,8 @@
GObjectClass *object_class;
KzIOClass *io_class;
- object_class = (GObjectClass *) klass;
- io_class = (KzIOClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
+ io_class = KZ_IO_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/net/kz-http.c
===================================================================
--- kazehakase/trunk/src/net/kz-http.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/net/kz-http.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -202,8 +202,8 @@
GObjectClass *object_class;
KzIOClass *io_class;
- object_class = (GObjectClass *) klass;
- io_class = (KzIOClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
+ io_class = KZ_IO_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/net/kz-io.c
===================================================================
--- kazehakase/trunk/src/net/kz-io.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/net/kz-io.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -134,7 +134,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/net/kz-xmlrpc.c
===================================================================
--- kazehakase/trunk/src/net/kz-xmlrpc.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/net/kz-xmlrpc.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -66,7 +66,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *) klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;
object_class->set_property = set_property;
Modified: kazehakase/trunk/src/sidebar/kz-bookmarks-sidebar.c
===================================================================
--- kazehakase/trunk/src/sidebar/kz-bookmarks-sidebar.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/sidebar/kz-bookmarks-sidebar.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -79,7 +79,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/sidebar/kz-downloader-sidebar.c
===================================================================
--- kazehakase/trunk/src/sidebar/kz-downloader-sidebar.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/sidebar/kz-downloader-sidebar.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -81,7 +81,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/sidebar/kz-tabtree.c
===================================================================
--- kazehakase/trunk/src/sidebar/kz-tabtree.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/sidebar/kz-tabtree.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -155,7 +155,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c
===================================================================
--- kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/sidebar/kz-thumbnails-sidebar.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -98,7 +98,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->constructor = constructor;
gobject_class->dispose = dispose;
Modified: kazehakase/trunk/src/widget/kz-dlist.c
===================================================================
--- kazehakase/trunk/src/widget/kz-dlist.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/widget/kz-dlist.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -88,7 +88,7 @@
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
gobject_class->dispose = dispose;
gobject_class->set_property = set_property;
Modified: kazehakase/trunk/src/widget/kz-entry.c
===================================================================
--- kazehakase/trunk/src/widget/kz-entry.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/widget/kz-entry.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -92,10 +92,9 @@
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- gobject_class = (GObjectClass *) klass;
+ gobject_class = G_OBJECT_CLASS(klass);
+ widget_class = GTK_WIDGET_CLASS(klass);
- widget_class = (GtkWidgetClass *) klass;
-
gobject_class->finalize = finalize;
gobject_class->set_property = set_property;
gobject_class->get_property = get_property;
Modified: kazehakase/trunk/src/widget/kz-thumbnail.c
===================================================================
--- kazehakase/trunk/src/widget/kz-thumbnail.c 2009-02-14 01:11:05 UTC (rev 3674)
+++ kazehakase/trunk/src/widget/kz-thumbnail.c 2009-02-14 01:40:31 UTC (rev 3675)
@@ -45,7 +45,7 @@
{
GObjectClass *object_class;
- object_class = (GObjectClass *)klass;
+ object_class = G_OBJECT_CLASS(klass);
object_class->dispose = dispose;