svnno****@sourc*****
svnno****@sourc*****
Fri Feb 13 08:44:27 JST 2009
Revision: 3657
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3657
Author: ikezoe
Date: 2009-02-13 08:44:27 +0900 (Fri, 13 Feb 2009)
Log Message:
-----------
* src/kz-object.h: typedef for KzWindow.
* src/kz-window.h: Use kz_notebook_get_nth_page instead of
gtk_notebook_get_nth_page.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/Makefile.am
kazehakase/trunk/src/kz-notebook.h
kazehakase/trunk/src/kz-tab-label.h
kazehakase/trunk/src/kz-window.h
Added Paths:
-----------
kazehakase/trunk/src/kz-objects.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-02-12 23:01:40 UTC (rev 3656)
+++ kazehakase/trunk/ChangeLog 2009-02-12 23:44:27 UTC (rev 3657)
@@ -3,6 +3,9 @@
* libegg/pixbufthumbail, src/*: Use latest EggPixbufThumbnail.
* src/libegg: Removed.
* */Makefile.am: Adjust the latest directory.
+ * src/kz-object.h: typedef for KzWindow.
+ * src/kz-window.h: Use kz_notebook_get_nth_page instead of
+ gtk_notebook_get_nth_page.
2009-02-12 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/Makefile.am
===================================================================
--- kazehakase/trunk/src/Makefile.am 2009-02-12 23:01:40 UTC (rev 3656)
+++ kazehakase/trunk/src/Makefile.am 2009-02-12 23:44:27 UTC (rev 3657)
@@ -99,39 +99,40 @@
kazehakase_LDFLAGS = -R$(MOZILLA_HOME)
endif
-libkazehakase_public_h_sources = \
- kazehakase.h \
- kz-app.h \
- kz-module.h \
- kz-module-impl.h \
- kz-embed.h \
- kz-embed-event.h \
- kz-embed-prefs.h \
- kz-gesture.h \
- kz-tab-label.h \
- kz-icons.h \
- kz-prefs-win.h \
- kz-sidebar.h \
- kz-window.h \
- kz-profile.h \
- kz-xml.h \
- kz-downloader.h \
- kz-downloader-group.h \
- kz-download-box.h \
- kz-feed-info.h \
- kz-navi.h \
- kz-notebook.h \
- kz-proxy-menu.h \
- kz-proxy-item.h \
- kz-favicon.h \
- kz-langinfo.h \
- kz-thumbnails-view.h \
- kz-autoscroller.h \
- kz-popup-preview.h \
- kz-popup-tablist.h \
- kz-search.h \
- kz-statusbar.h \
- kz-migemo.h \
+libkazehakase_public_h_sources = \
+ kazehakase.h \
+ kz-objects.h \
+ kz-app.h \
+ kz-module.h \
+ kz-module-impl.h \
+ kz-embed.h \
+ kz-embed-event.h \
+ kz-embed-prefs.h \
+ kz-gesture.h \
+ kz-tab-label.h \
+ kz-icons.h \
+ kz-prefs-win.h \
+ kz-sidebar.h \
+ kz-window.h \
+ kz-profile.h \
+ kz-xml.h \
+ kz-downloader.h \
+ kz-downloader-group.h \
+ kz-download-box.h \
+ kz-feed-info.h \
+ kz-navi.h \
+ kz-notebook.h \
+ kz-proxy-menu.h \
+ kz-proxy-item.h \
+ kz-favicon.h \
+ kz-langinfo.h \
+ kz-thumbnails-view.h \
+ kz-autoscroller.h \
+ kz-popup-preview.h \
+ kz-popup-tablist.h \
+ kz-search.h \
+ kz-statusbar.h \
+ kz-migemo.h \
kz-ext.h
libkazehakase_la_SOURCES = \
Modified: kazehakase/trunk/src/kz-notebook.h
===================================================================
--- kazehakase/trunk/src/kz-notebook.h 2009-02-12 23:01:40 UTC (rev 3656)
+++ kazehakase/trunk/src/kz-notebook.h 2009-02-12 23:44:27 UTC (rev 3657)
@@ -3,8 +3,8 @@
#ifndef __KZ_NOTEBOOK_H__
#define __KZ_NOTEBOOK_H__
-#include "kz-window.h"
#include "kz-tab-label.h"
+#include "kz-embed.h"
G_BEGIN_DECLS
Added: kazehakase/trunk/src/kz-objects.h
===================================================================
--- kazehakase/trunk/src/kz-objects.h (rev 0)
+++ kazehakase/trunk/src/kz-objects.h 2009-02-12 23:44:27 UTC (rev 3657)
@@ -0,0 +1,6 @@
+#ifndef __KZ_OBJECTS_H__
+#define __KZ_OBJECTS_H__
+
+typedef struct _KzWindow KzWindow;
+
+#endif /* __KZ_OBJECTS_H__ */
Modified: kazehakase/trunk/src/kz-tab-label.h
===================================================================
--- kazehakase/trunk/src/kz-tab-label.h 2009-02-12 23:01:40 UTC (rev 3656)
+++ kazehakase/trunk/src/kz-tab-label.h 2009-02-12 23:44:27 UTC (rev 3657)
@@ -23,8 +23,8 @@
#include <gtk/gtk.h>
+#include "kz-objects.h"
#include "kz-embed.h"
-#include "kz-window.h"
#include "kz-bookmark-folder.h"
G_BEGIN_DECLS
@@ -47,7 +47,6 @@
KZ_TAB_LABEL_N_STATE
} KzTabLabelState;
-
struct _KzTabLabel
{
GtkHBox parent;
Modified: kazehakase/trunk/src/kz-window.h
===================================================================
--- kazehakase/trunk/src/kz-window.h 2009-02-12 23:01:40 UTC (rev 3656)
+++ kazehakase/trunk/src/kz-window.h 2009-02-12 23:44:27 UTC (rev 3657)
@@ -24,11 +24,13 @@
#include <gtk/gtk.h>
+#include "kz-objects.h"
#include "kz-gesture.h"
#include "kz-embed-event.h"
#include "kz-embed.h"
#include "kz-popup-preview.h"
#include "kz-bookmark-folder.h"
+#include "kz-notebook.h"
G_BEGIN_DECLS
@@ -39,7 +41,6 @@
#define KZ_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), KZ_TYPE_WINDOW))
#define KZ_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), KZ_TYPE_WINDOW, KzWindowClass))
-typedef struct _KzWindow KzWindow;
typedef struct _KzWindowClass KzWindowClass;
struct _KzWindow
@@ -143,9 +144,9 @@
KzBookmarkFolder *tab);
#define KZ_WINDOW_NTH_PAGE(kz, n) \
- (KZ_IS_WINDOW(kz) ? gtk_notebook_get_nth_page(GTK_NOTEBOOK(KZ_WINDOW(kz)->notebook),n) : NULL)
+ (KZ_IS_WINDOW(kz) ? kz_notebook_get_nth_page(KZ_NOTEBOOK(KZ_WINDOW(kz)->notebook),n) : NULL)
#define KZ_WINDOW_CURRENT_PAGE(kz) \
- (KZ_IS_WINDOW(kz) ? KZ_WINDOW_NTH_PAGE(kz, gtk_notebook_get_current_page(GTK_NOTEBOOK(kz->notebook))) : NULL)
+ (KZ_IS_WINDOW(kz) ? KZ_WINDOW_NTH_PAGE(kz, kz_notebook_get_current_page(KZ_NOTEBOOK(kz->notebook))) : NULL)
#define KZ_WINDOW_SET_SENSITIVE(kz, action_name, sensitive) \
{ \