Hiroyuki Ikezoe
ikezo****@users*****
Fri Jan 5 09:18:54 JST 2007
Index: kazehakase/src/kz-app.c
diff -u kazehakase/src/kz-app.c:1.17 kazehakase/src/kz-app.c:1.18
--- kazehakase/src/kz-app.c:1.17 Thu Jan 4 11:47:51 2007
+++ kazehakase/src/kz-app.c Fri Jan 5 09:18:54 2007
@@ -429,31 +429,12 @@
for (tabnode = tabs; tabnode; tabnode = g_list_next(tabnode))
{
GtkWidget *widget;
- KzBookmark *child = KZ_BOOKMARK(tabnode->data);
KzTabLabel *kztab;
+ KzBookmark *child = KZ_BOOKMARK(tabnode->data);
widget = kz_window_open_new_tab_at_tail(window, NULL);
- kz_embed_set_history(KZ_EMBED(widget), child);
kztab = KZ_TAB_LABEL(gtk_notebook_get_tab_label(GTK_NOTEBOOK(window->notebook),
widget));
-
- if (kz_bookmark_get_lock(child))
- {
- kz_tab_label_set_lock(kztab, TRUE);
- }
- if (kz_bookmark_get_auto_refresh(child))
- {
- kz_tab_label_set_auto_refresh(kztab, TRUE);
- }
- if (kz_bookmark_get_javascript(child))
- {
- kz_embed_set_allow_javascript(KZ_EMBED(kztab->kzembed), TRUE);
- kz_tab_label_set_javascript(kztab, TRUE);
- }
- else
- {
- kz_embed_set_allow_javascript(KZ_EMBED(kztab->kzembed), FALSE);
- kz_tab_label_set_javascript(kztab, FALSE);
- }
+ kz_tab_label_set_history(kztab, child);
}
g_list_free(tabs);
pos = kz_bookmark_get_current(window_bookmark);
Index: kazehakase/src/kz-tab-label.c
diff -u kazehakase/src/kz-tab-label.c:1.89 kazehakase/src/kz-tab-label.c:1.90
--- kazehakase/src/kz-tab-label.c:1.89 Thu Jan 4 22:45:54 2007
+++ kazehakase/src/kz-tab-label.c Fri Jan 5 09:18:54 2007
@@ -1291,11 +1291,29 @@
kz_bookmark_append(kztab->history, new);
g_object_unref(new);
}
+ g_list_free(children);
+
+ if (kz_bookmark_get_lock(history))
+ {
+ kz_tab_label_set_lock(kztab, TRUE);
+ }
+ if (kz_bookmark_get_auto_refresh(history))
+ {
+ kz_tab_label_set_auto_refresh(kztab, TRUE);
+ }
+ if (kz_bookmark_get_javascript(history))
+ {
+ kz_embed_set_allow_javascript(KZ_EMBED(kztab->kzembed), TRUE);
+ kz_tab_label_set_javascript(kztab, TRUE);
+ }
+ else
+ {
+ kz_embed_set_allow_javascript(KZ_EMBED(kztab->kzembed), FALSE);
+ kz_tab_label_set_javascript(kztab, FALSE);
+ }
kz_bookmark_set_current(kztab->history,
kz_bookmark_get_current(history));
- g_list_free(children);
-
kz_embed_set_history(kztab->kzembed,
kztab->history);
}