svnno****@sourc*****
svnno****@sourc*****
Tue Sep 1 19:16:58 JST 2009
Revision: 3806
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3806
Author: ikezoe
Date: 2009-09-01 19:16:58 +0900 (Tue, 01 Sep 2009)
Log Message:
-----------
* src/kz-window.c: Unify cb_embed_dom_key_up and cb_embed_dom_key_down.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/kz-window.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-09-01 10:15:52 UTC (rev 3805)
+++ kazehakase/trunk/ChangeLog 2009-09-01 10:16:58 UTC (rev 3806)
@@ -2,6 +2,7 @@
* src/kz-tab-label.c: Use kz_actions_set_tab_sensitive instead of
kz_actions_set_sensitive.
+ * src/kz-window.c: Unify cb_embed_dom_key_up and cb_embed_dom_key_down.
2009-08-31 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/kz-window.c
===================================================================
--- kazehakase/trunk/src/kz-window.c 2009-09-01 10:15:52 UTC (rev 3805)
+++ kazehakase/trunk/src/kz-window.c 2009-09-01 10:16:58 UTC (rev 3806)
@@ -247,12 +247,9 @@
KzWindow *kz);
static void cb_embed_close_tab (GtkObject *obj,
KzWindow *kz);
-static gboolean cb_embed_dom_key_down (KzEmbed *embed,
+static gboolean cb_embed_dom_key_event (KzEmbed *embed,
KzEmbedEventKey *event,
KzWindow *kz);
-static gboolean cb_embed_dom_key_up (KzEmbed *embed,
- KzEmbedEventKey *event,
- KzWindow *kz);
static gboolean cb_embed_dom_mouse_click (KzEmbed *embed,
KzEmbedEventMouse *event,
KzWindow *kz);
@@ -1481,10 +1478,7 @@
*/
g_signal_connect(kzembed,
"kz-dom-key-down",
- G_CALLBACK(cb_embed_dom_key_down), kz);
- g_signal_connect(kzembed,
- "kz-dom-key-up",
- G_CALLBACK(cb_embed_dom_key_up), kz);
+ G_CALLBACK(cb_embed_dom_key_event), kz);
/*
* mouse event signal
@@ -1524,10 +1518,7 @@
*/
g_signal_handlers_disconnect_by_func
(kzembed,
- G_CALLBACK(cb_embed_dom_key_down), kz);
- g_signal_handlers_disconnect_by_func
- (kzembed,
- G_CALLBACK(cb_embed_dom_key_up), kz);
+ G_CALLBACK(cb_embed_dom_key_event), kz);
/*
* mouse event signal
@@ -1992,7 +1983,7 @@
g_return_if_fail(tab);
kz_actions_set_sensitive(kz, kzembed);
- //kz_actions_set_tab_sensitive(kz, kzembed);
+ /* kz_actions_set_tab_sensitive(kz, kzembed); */
/* set current_position in history */
/* FIXME: KzSession should block automatically */
@@ -2143,7 +2134,7 @@
static gboolean
-cb_embed_dom_key_down (KzEmbed *embed, KzEmbedEventKey *event, KzWindow *kz)
+cb_embed_dom_key_event (KzEmbed *embed, KzEmbedEventKey *event, KzWindow *kz)
{
g_return_val_if_fail(KZ_IS_WINDOW(kz), FALSE);
@@ -2155,17 +2146,6 @@
static gboolean
-cb_embed_dom_key_up (KzEmbed *embed, KzEmbedEventKey *event, KzWindow *kz)
-{
- g_return_val_if_fail(KZ_IS_WINDOW(kz), FALSE);
-
- kz_actions_set_sensitive(kz, embed);
-
- return FALSE;
-}
-
-
-static gboolean
cb_embed_dom_mouse_click (KzEmbed *embed, KzEmbedEventMouse *event,
KzWindow *kz)
{