Hiroyuki Ikezoe
ikezo****@users*****
Sun Jan 7 19:06:37 JST 2007
Index: kazehakase/src/kz-statusbar.c
diff -u kazehakase/src/kz-statusbar.c:1.7 kazehakase/src/kz-statusbar.c:1.8
--- kazehakase/src/kz-statusbar.c:1.7 Sun Dec 31 09:39:02 2006
+++ kazehakase/src/kz-statusbar.c Sun Jan 7 19:06:37 2007
@@ -35,6 +35,8 @@
typedef struct _KzStatusbarPrivate KzStatusbarPrivate;
struct _KzStatusbarPrivate
{
+ KzWindow *kz;
+
GtkWidget *find_area;
GtkWidget *find_direction;
GtkWidget *statusbar;
@@ -122,7 +124,7 @@
GtkTooltips *tips;
/* widgets */
- bar->kz = NULL;
+ priv->kz = NULL;
priv->did_find = FALSE;
@@ -211,6 +213,7 @@
GObjectConstructParam *props)
{
KzStatusbar *bar;
+ KzStatusbarPrivate *priv;
GObject *object;
GObjectClass *klass = G_OBJECT_CLASS(kz_statusbar_parent_class);
GtkWidget *widget;
@@ -218,9 +221,10 @@
object = klass->constructor(type, n_props, props);
bar = KZ_STATUSBAR(object);
+ priv = KZ_STATUSBAR_GET_PRIVATE(object);
/* download box */
- widget = kz_download_box_new(bar->kz);
+ widget = kz_download_box_new(priv->kz);
gtk_widget_set_size_request(widget, 200, -1);
gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(widget),
FALSE);
@@ -238,12 +242,12 @@
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- KzStatusbar *bar = KZ_STATUSBAR(object);
+ KzStatusbarPrivate *priv = KZ_STATUSBAR_GET_PRIVATE(object);
switch (prop_id)
{
case PROP_KZ_WINDOW:
- bar->kz = g_object_ref(g_value_get_object(value));
+ priv->kz = g_object_ref(g_value_get_object(value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -255,12 +259,12 @@
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
- KzStatusbar *bar = KZ_STATUSBAR(object);
+ KzStatusbarPrivate *priv = KZ_STATUSBAR_GET_PRIVATE(object);
switch (prop_id)
{
case PROP_KZ_WINDOW:
- g_value_set_object(value, bar->kz);
+ g_value_set_object(value, priv->kz);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -284,13 +288,12 @@
static void
dispose (GObject *object)
{
- KzStatusbar *bar = KZ_STATUSBAR(object);
- KzStatusbarPrivate *priv = KZ_STATUSBAR_GET_PRIVATE (bar);
+ KzStatusbarPrivate *priv = KZ_STATUSBAR_GET_PRIVATE(object);
- if (bar->kz)
+ if (priv->kz)
{
- g_object_unref(bar->kz);
- bar->kz = NULL;
+ g_object_unref(priv->kz);
+ priv->kz = NULL;
}
if (priv->find_tips[0])
@@ -420,8 +423,8 @@
static void
cb_find_keyword (GtkWidget *widget, KzStatusbar *bar)
{
- KzEmbed *embed = KZ_EMBED(KZ_WINDOW_CURRENT_PAGE(bar->kz));
KzStatusbarPrivate *priv = KZ_STATUSBAR_GET_PRIVATE (bar);
+ KzEmbed *embed = KZ_EMBED(KZ_WINDOW_CURRENT_PAGE(priv->kz));
GtkToggleButton *toggle = GTK_TOGGLE_BUTTON(priv->find_direction);
const gchar *text = gtk_entry_get_text(GTK_ENTRY(widget));
gboolean back = gtk_toggle_button_get_active(toggle);
@@ -470,10 +473,10 @@
KzStatusbarPrivate *priv;
gboolean back;
- embed = KZ_EMBED(KZ_WINDOW_CURRENT_PAGE(bar->kz));
+ priv = KZ_STATUSBAR_GET_PRIVATE(bar);
+ embed = KZ_EMBED(KZ_WINDOW_CURRENT_PAGE(priv->kz));
if (!embed) return;
- priv = KZ_STATUSBAR_GET_PRIVATE (bar);
toggle = GTK_TOGGLE_BUTTON(priv->find_direction);
text = gtk_entry_get_text(GTK_ENTRY(widget));
if (!text || !(*text))
Index: kazehakase/src/kz-statusbar.h
diff -u kazehakase/src/kz-statusbar.h:1.2 kazehakase/src/kz-statusbar.h:1.3
--- kazehakase/src/kz-statusbar.h:1.2 Thu Jun 8 22:39:18 2006
+++ kazehakase/src/kz-statusbar.h Sun Jan 7 19:06:37 2007
@@ -20,9 +20,6 @@
struct _KzStatusbar
{
GtkHBox parent;
-
- /* Kazehakase */
- KzWindow *kz;
};
struct _KzStatusbarClass
Index: kazehakase/src/kz-window.h
diff -u kazehakase/src/kz-window.h:1.80 kazehakase/src/kz-window.h:1.81
--- kazehakase/src/kz-window.h:1.80 Fri Jan 5 19:51:46 2007
+++ kazehakase/src/kz-window.h Sun Jan 7 19:06:37 2007
@@ -141,7 +141,8 @@
const KzEmbedEventMouse *
kz_window_get_mouse_event_info (KzWindow *kz);
-void kz_window_append_closed_tab (KzWindow *kz, KzBookmark *bookmark);
+void kz_window_append_closed_tab (KzWindow *kz,
+ KzBookmark *bookmark);
#define KZ_WINDOW_NTH_PAGE(kz, n) \
(KZ_IS_WINDOW(kz) ? gtk_notebook_get_nth_page(GTK_NOTEBOOK(KZ_WINDOW(kz)->notebook),n) : NULL)