svnno****@sourc*****
svnno****@sourc*****
Tue Apr 3 12:07:38 JST 2007
Revision: 3123
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3123
Author: ikezoe
Date: 2007-04-03 12:07:38 +0900 (Tue, 03 Apr 2007)
Log Message:
-----------
* module/embed/gtk-webcore/Makefile.am: Set G_LOG_DOMAIN.
* module/embed/gtk-webcore/kz-gtk-webcore.cpp: Show realm on
authentication dialog.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-04-02 09:12:12 UTC (rev 3122)
+++ kazehakase/trunk/ChangeLog 2007-04-03 03:07:38 UTC (rev 3123)
@@ -1,3 +1,9 @@
+2007-04-03 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * module/embed/gtk-webcore/Makefile.am: Set G_LOG_DOMAIN.
+ * module/embed/gtk-webcore/kz-gtk-webcore.cpp: Show realm on
+ authentication dialog.
+
2007-04-02 Takuro Ashie <ashie****@homa*****>
* module/embed/ie/Makefile.am, module/embed/ie/kz-ie-module.cpp,
Modified: kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-04-02 09:12:12 UTC (rev 3122)
+++ kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-04-03 03:07:38 UTC (rev 3123)
@@ -17,6 +17,7 @@
-DGTK_DISABLE_DEPRECATED=1 \
-DGDK_DISABLE_DEPRECATED=1 \
-DG_DISABLE_DEPRECATED=1 \
+ -DG_LOG_DOMAIN=\"Kazehakase-GtkWebCore\" \
-DGTK_WEBCORE_VERSION=\"$(NRCIT_VERSION)\"
gtk_webcore_la_LDFLAGS = \
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-04-02 09:12:12 UTC (rev 3122)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-04-03 03:07:38 UTC (rev 3123)
@@ -760,12 +760,17 @@
kz_gtk_webcore_req_auth_prompt (Webi *webi, WebiAuthArgs* args)
{
KzPromptDialog *prompt;
+ gchar *message;
g_return_if_fail(KZ_IS_GTK_WEBCORE(webi));
prompt= KZ_PROMPT_DIALOG(kz_prompt_dialog_new(TYPE_PROMPT_USER_PASS));
kz_prompt_dialog_set_title(prompt, _("Authentication"));
+ message = g_strdup_printf (_("Enter username and password for %s"),
+ args->realm);
+ kz_prompt_dialog_set_message_text(prompt, message);
+ g_free(message);
kz_prompt_dialog_run(prompt);
args->out_ok_pressed = kz_prompt_dialog_get_confirm_value(prompt);
@@ -801,10 +806,14 @@
GdkModifierType state = (GdkModifierType)0;
gint x, y;
KzEmbedEventMouse *ret;
+ KzEmbedEvent *info;;
gdk_window_get_pointer(NULL, &x, &y, &state);
ret = (KzEmbedEventMouse *) kz_embed_event_new(KZ_EMBED_EVENT_MOUSE);
+ info = (KzEmbedEvent *) ret;
+ info->context = KZ_CONTEXT_NONE;
+
ret->x = x;
ret->y = y;
if (state & GDK_SHIFT_MASK)
@@ -846,7 +855,7 @@
else
{
KzEmbedEvent *info = (KzEmbedEvent *) kzevent;
- info->context = KZ_CONTEXT_LINK;
+ info->context |= KZ_CONTEXT_LINK;
info->link = g_strdup(link_url);
info->linktext = g_strdup(link_label);
@@ -880,11 +889,11 @@
get_mouse_event_info(&kzevent);
kzevent->button = button - 1;
+ ((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_DOCUMENT;
if (link_url)
{
- KzEmbedEvent *info = (KzEmbedEvent *) kzevent;
- info->context = KZ_CONTEXT_LINK;
- info->link = g_strdup(link_url);
+ ((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_LINK;
+ ((KzEmbedEvent *)kzevent)->link = g_strdup(link_url);
}
g_signal_emit_by_name(webi, "kz-dom-mouse-down",
@@ -909,6 +918,8 @@
get_mouse_event_info(&kzevent);
kzevent->button = button - 1;
+ ((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_DOCUMENT;
+
g_signal_emit_by_name(webi, "kz-dom-mouse-up",
kzevent, &ret);
@@ -916,7 +927,7 @@
{
if (link_url)
{
- ((KzEmbedEvent *)kzevent)->context = KZ_CONTEXT_LINK;
+ ((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_LINK;
((KzEmbedEvent *)kzevent)->link = g_strdup(link_url);
}