svnno****@sourc*****
svnno****@sourc*****
Fri Sep 4 09:02:15 JST 2009
Revision: 3819
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3819
Author: ikezoe
Date: 2009-09-04 09:02:15 +0900 (Fri, 04 Sep 2009)
Log Message:
-----------
* src/kz-embed.[ch]: Remove get_lock and set_lock interfaces. These are implemented
in kz-web.c.
* src/kz-web.c: Fix crash when kz-new-window signal is received.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/module/embed/ie/kz-ie.c
kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c
kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c
kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
kazehakase/trunk/src/kz-embed.c
kazehakase/trunk/src/kz-embed.h
kazehakase/trunk/src/kz-web.c
kazehakase/trunk/src/kz-window.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/ChangeLog 2009-09-04 00:02:15 UTC (rev 3819)
@@ -5,6 +5,9 @@
kz_embed_load_uri, kz_embed_set_zoom -> kz_embed_zoom,
kz_embed_get_zoom -> kz_embed_get_zoom_ratio. A lot of files affcted
these changes.
+ * src/kz-embed.[ch]: Remove get_lock and set_lock interfaces. These are implemented
+ in kz-web.c.
+ * src/kz-web.c: Fix crash when kz-new-window signal is received.
2009-09-02 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-09-04 00:02:15 UTC (rev 3819)
@@ -133,8 +133,6 @@
gboolean is_loading;
const gchar *load_status_message;
- gboolean lock;
-
/* for navigation link */
GList *nav_links[KZ_EMBED_LINK_GUARD];
@@ -275,9 +273,6 @@
KzEmbedNavLink link);
static void go_history_index (KzEmbed *kzembed,
gint index);
-static gboolean get_lock (KzEmbed *kzembed);
-static void set_lock (KzEmbed *kzembed,
- gboolean lock);
static gchar *get_body_text (KzEmbed *kzembed);
static void set_encoding (KzEmbed *kzembed,
const char *encoding);
@@ -453,8 +448,6 @@
iface->get_nth_nav_link = get_nth_nav_link;
iface->get_nav_links = get_nav_links;
iface->go_history_index = go_history_index;
- iface->get_lock = get_lock;
- iface->set_lock = set_lock;
iface->get_body_text = get_body_text;
iface->set_encoding = set_encoding;
iface->get_encoding = get_encoding;
@@ -1105,6 +1098,7 @@
newWindow);
gtk_container_add(GTK_CONTAINER(newWindow),
GTK_WIDGET(*newEmbed));
+ gtk_widget_show(newWindow);
}
else
{
@@ -2480,24 +2474,6 @@
}
-static gboolean
-get_lock (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_GECKO_EMBED(kzembed), FALSE);
- KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
- return priv->lock;
-}
-
-
-static void
-set_lock (KzEmbed *kzembed, gboolean lock)
-{
- g_return_if_fail(KZ_IS_GECKO_EMBED(kzembed));
- KzGeckoEmbedPrivate *priv = KZ_GECKO_EMBED_GET_PRIVATE (kzembed);
- priv->lock = lock;
-}
-
-
static gchar *
get_body_text(KzEmbed *kzembed)
{
Modified: kazehakase/trunk/module/embed/ie/kz-ie.c
===================================================================
--- kazehakase/trunk/module/embed/ie/kz-ie.c 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/module/embed/ie/kz-ie.c 2009-09-04 00:02:15 UTC (rev 3819)
@@ -40,7 +40,6 @@
glong max_progress;
gchar *location;
gchar *title;
- gboolean lock;
};
#define KZ_IE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_IE, KzIEPrivate))
@@ -114,9 +113,6 @@
static gboolean kz_ie_find (KzEmbed *kzembed,
const gchar *keyword,
gboolean backward);
-static gboolean kz_ie_get_lock (KzEmbed *kzembed);
-static void kz_ie_set_lock (KzEmbed *kzembed,
- gboolean lock);
static void get_history (KzEmbed *kzembed,
KzBookmarkFolder *history);
static void set_history (KzEmbed *kzembed,
@@ -263,8 +259,6 @@
iface->get_nth_nav_link = NULL;
iface->get_nav_links = NULL;
iface->go_history_index = go_history_index;
- iface->get_lock = kz_ie_get_lock;
- iface->set_lock = kz_ie_set_lock;
iface->get_body_text = NULL;
iface->set_encoding = kz_ie_set_encoding;
iface->get_encoding = kz_ie_get_encoding;
@@ -313,8 +307,6 @@
priv->current_progress = 0;
priv->max_progress =0;
- priv->lock = FALSE;
-
gtk_ie_embed_set_use_context_menu (GTK_IE_EMBED (ie), FALSE);
}
@@ -778,24 +770,7 @@
return gtk_ie_embed_find_string(GTK_IE_EMBED(kzembed), keyword, !backward, FALSE);
}
-static gboolean
-kz_ie_get_lock (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_IE(kzembed), FALSE);
- KzIEPrivate *priv = KZ_IE_GET_PRIVATE (kzembed);
- return priv->lock;
-}
-
-
static void
-kz_ie_set_lock (KzEmbed *kzembed, gboolean lock)
-{
- g_return_if_fail(KZ_IS_IE(kzembed));
- KzIEPrivate *priv = KZ_IE_GET_PRIVATE (kzembed);
- priv->lock = lock;
-}
-
-static void
merge_to_bookmark_list (const gchar *uri, const gchar *title,
GList **bookmark_list_node, KzBookmarkFolder *folder)
{
Modified: kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c
===================================================================
--- kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/module/embed/moz-web-view/kz-moz-web-view.c 2009-09-04 00:02:15 UTC (rev 3819)
@@ -34,7 +34,6 @@
gchar *location;
gchar *title;
gchar *link_message;
- gboolean lock;
gboolean is_loading;
};
#define KZ_MOZ_WEB_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_MOZ_WEB_VIEW, KzMozWebViewPrivate))
@@ -89,9 +88,6 @@
int zoom,
gboolean reflow);
static int zoom_get (KzEmbed *kzembed);
-static gboolean get_lock (KzEmbed *kzembed);
-static void set_lock (KzEmbed *kzembed,
- gboolean lock);
static gboolean get_allow_javascript (KzEmbed *kzembed);
static void set_allow_javascript (KzEmbed *kzembed,
gboolean allow);
@@ -202,8 +198,6 @@
iface->get_nth_nav_link = get_nth_nav_link;
iface->get_nav_links = get_nav_links;
iface->go_history_index = NULL;
- iface->get_lock = get_lock;
- iface->set_lock = set_lock;
iface->get_body_text = NULL;
iface->set_encoding = NULL;
iface->get_encoding = NULL;
@@ -255,7 +249,6 @@
priv->progress = 0;
- priv->lock = FALSE;
priv->is_loading = FALSE;
}
@@ -449,19 +442,6 @@
}
static gboolean
-get_lock (KzEmbed *kzembed)
-{
- return KZ_MOZ_WEB_VIEW_GET_PRIVATE(kzembed)->lock;
-}
-
-
-static void
-set_lock (KzEmbed *kzembed, gboolean lock)
-{
- KZ_MOZ_WEB_VIEW_GET_PRIVATE(kzembed)->lock = lock;
-}
-
-static gboolean
get_allow_javascript (KzEmbed *kzembed)
{
return TRUE;
Modified: kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c
===================================================================
--- kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/module/embed/per-process/kz-dbus-embed-delegate.c 2009-09-04 00:02:15 UTC (rev 3819)
@@ -437,8 +437,6 @@
iface->get_nth_nav_link = NULL;
iface->get_nav_links = NULL;
iface->go_history_index = NULL;
- iface->get_lock = NULL;
- iface->set_lock = NULL;
iface->get_body_text = NULL;
iface->set_encoding = set_encoding;
iface->get_encoding = get_encoding;
Modified: kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
===================================================================
--- kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2009-09-04 00:02:15 UTC (rev 3819)
@@ -35,7 +35,6 @@
gchar *location;
gchar *title;
gchar *link_message;
- gboolean lock;
gboolean is_loading;
};
#define KZ_WEBKIT_GTK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkPrivate))
@@ -84,9 +83,6 @@
static void zoom (KzEmbed *kzembed,
gdouble zoom);
static gdouble get_zoom_ratio (KzEmbed *kzembed);
-static gboolean get_lock (KzEmbed *kzembed);
-static void set_lock (KzEmbed *kzembed,
- gboolean lock);
static gboolean get_allow_javascript (KzEmbed *kzembed);
static void set_allow_javascript (KzEmbed *kzembed,
gboolean allow);
@@ -251,8 +247,6 @@
iface->get_nth_nav_link = get_nth_nav_link;
iface->get_nav_links = get_nav_links;
iface->go_history_index = NULL;
- iface->get_lock = get_lock;
- iface->set_lock = set_lock;
iface->get_body_text = NULL;
iface->set_encoding = NULL;
iface->get_encoding = NULL;
@@ -336,7 +330,6 @@
priv->progress = 0;
- priv->lock = FALSE;
priv->is_loading = FALSE;
}
@@ -529,19 +522,6 @@
}
static gboolean
-get_lock (KzEmbed *kzembed)
-{
- return KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->lock;
-}
-
-
-static void
-set_lock (KzEmbed *kzembed, gboolean lock)
-{
- KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->lock = lock;
-}
-
-static gboolean
get_allow_javascript (KzEmbed *kzembed)
{
WebKitWebSettings *settings;
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/src/kz-embed.c 2009-09-04 00:02:15 UTC (rev 3819)
@@ -394,16 +394,9 @@
void
kz_embed_load_uri (KzEmbed *kzembed, const gchar *uri)
{
- KzEmbed *target_embed = kzembed;
g_return_if_fail(KZ_IS_EMBED(kzembed));
- if (kz_embed_get_lock(kzembed))
- {
- g_signal_emit_by_name(kzembed,
- "new-window",
- &target_embed, 0);
- }
- KZ_EMBED_GET_IFACE(kzembed)->load_uri(target_embed, uri);
+ KZ_EMBED_GET_IFACE(kzembed)->load_uri(kzembed, uri);
}
@@ -851,28 +844,6 @@
}
-gboolean
-kz_embed_get_lock (KzEmbed *kzembed)
-{
- g_return_val_if_fail(KZ_IS_EMBED(kzembed), FALSE);
- if (!KZ_EMBED_GET_IFACE(kzembed)->get_lock)
- return FALSE;
-
- return KZ_EMBED_GET_IFACE(kzembed)->get_lock(kzembed);
-}
-
-
-void
-kz_embed_set_lock (KzEmbed *kzembed, gboolean lock)
-{
- g_return_if_fail(KZ_IS_EMBED(kzembed));
- if (!KZ_EMBED_GET_IFACE(kzembed)->set_lock)
- return;
-
- KZ_EMBED_GET_IFACE(kzembed)->set_lock(kzembed, lock);
-}
-
-
gchar *
kz_embed_get_body_text (KzEmbed *kzembed)
{
Modified: kazehakase/trunk/src/kz-embed.h
===================================================================
--- kazehakase/trunk/src/kz-embed.h 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/src/kz-embed.h 2009-09-04 00:02:15 UTC (rev 3819)
@@ -165,10 +165,6 @@
void (*go_history_index) (KzEmbed *kzembed,
gint index);
- gboolean (*get_lock) (KzEmbed *kzembed);
- void (*set_lock) (KzEmbed *kzembed,
- gboolean lock);
-
gchar *(*get_body_text) (KzEmbed *kzembed);
void (*set_encoding) (KzEmbed *kzembed,
const gchar *encoding);
@@ -373,11 +369,6 @@
KzEmbedNavLink link);
void kz_embed_go_history_index (KzEmbed *kzembed,
gint index);
-
-gboolean kz_embed_get_lock (KzEmbed *kzembed);
-void kz_embed_set_lock (KzEmbed *kzembed,
- gboolean lock);
-
gchar *kz_embed_get_body_text (KzEmbed *kzembed);
void kz_embed_set_encoding (KzEmbed *kzembed,
Modified: kazehakase/trunk/src/kz-web.c
===================================================================
--- kazehakase/trunk/src/kz-web.c 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/src/kz-web.c 2009-09-04 00:02:15 UTC (rev 3819)
@@ -468,9 +468,12 @@
}
static void
-cb_kz_new_window (KzEmbed *embed, KzEmbed **newembed, KzWeb *web)
+cb_kz_new_window (KzEmbed *embed, KzEmbed **new_embed, KzWeb *web)
{
- g_signal_emit(web, signals[NEW_WINDOW], 0, newembed);
+ KzWeb *new_web = NULL;
+
+ g_signal_emit(web, signals[NEW_WINDOW], 0, &new_web);
+ *new_embed = KZ_EMBED(KZ_WEB_GET_PRIVATE(new_web)->embed);
}
static void
@@ -657,10 +660,20 @@
}
void
-kz_web_load_uri (KzWeb *bin, const gchar *uri)
+kz_web_load_uri (KzWeb *web, const gchar *uri)
{
- KzWebPrivate *priv = KZ_WEB_GET_PRIVATE(bin);
+ KzWebPrivate *priv = KZ_WEB_GET_PRIVATE(web);
+ KzWeb *target_web = NULL;
+ if (kz_web_get_lock(web)) {
+ g_signal_emit_by_name(web,
+ "new-window",
+ &target_web, 0);
+ } else {
+ target_web = web;
+ }
+
+ priv = KZ_WEB_GET_PRIVATE(target_web);
kz_embed_load_uri(KZ_EMBED(priv->embed), uri);
}
Modified: kazehakase/trunk/src/kz-window.c
===================================================================
--- kazehakase/trunk/src/kz-window.c 2009-09-03 23:30:51 UTC (rev 3818)
+++ kazehakase/trunk/src/kz-window.c 2009-09-04 00:02:15 UTC (rev 3819)
@@ -2104,13 +2104,12 @@
static void
-cb_web_new_window (KzWeb *web, KzWeb **newEmbed,
- KzWindow *kz)
+cb_web_new_window (KzWeb *web, KzWeb **newWeb, KzWindow *kz)
{
g_return_if_fail(KZ_IS_WINDOW(kz));
- *newEmbed = KZ_WEB(kz_window_open_new_tab(kz, NULL));
- gtk_widget_show(GTK_WIDGET(*newEmbed));
+ *newWeb = KZ_WEB(kz_window_open_new_tab(kz, NULL));
+ gtk_widget_show(GTK_WIDGET(*newWeb));
}