Hiroyuki Ikezoe
ikezo****@users*****
Mon Jan 1 22:22:00 JST 2007
Index: kazehakase/src/kz-tab-label.c diff -u kazehakase/src/kz-tab-label.c:1.83 kazehakase/src/kz-tab-label.c:1.84 --- kazehakase/src/kz-tab-label.c:1.83 Mon Jan 1 21:40:32 2007 +++ kazehakase/src/kz-tab-label.c Mon Jan 1 22:22:00 2007 @@ -377,17 +377,11 @@ if (kztab->history) { - gboolean save_session = FALSE; - kz_window_append_closed_tab(kztab->kz, kztab->history); kz_bookmark_remove(kztab->kz->tabs, kztab->history); g_object_unref(kztab->history); kztab->history = NULL; - - KZ_CONF_GET("Session", "save", save_session, BOOL); - if (save_session && !kztab->kz->is_closing_all) - kz_bookmark_file_save(KZ_BOOKMARK_FILE(KZ_GET_CURRENT_SESSION)); } if (kztab->kz) Index: kazehakase/src/kz-window.c diff -u kazehakase/src/kz-window.c:1.281 kazehakase/src/kz-window.c:1.282 --- kazehakase/src/kz-window.c:1.281 Mon Jan 1 10:08:44 2007 +++ kazehakase/src/kz-window.c Mon Jan 1 22:22:00 2007 @@ -55,6 +55,7 @@ #include "kz-popup-tablist.h" #include "kz-ext.h" #include "kz-statusbar.h" +#include "kz-session.h" extern GtkWidget *kz_moz_embed_new (const gchar *url); #ifdef ENABLE_GTK_WEBCORE @@ -1141,6 +1142,7 @@ g_return_if_fail(KZ_IS_WINDOW(kz)); + kz_session_freeze(KZ_SESSION(KZ_GET_CURRENT_SESSION)); kz->is_closing_all = TRUE; n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(kz->notebook)); for (i = n_pages - 1; i >= 0; i--) @@ -1155,6 +1157,7 @@ gtk_widget_destroy(widget); } kz->is_closing_all = FALSE; + kz_session_thaw(KZ_SESSION(KZ_GET_CURRENT_SESSION)); } @@ -1198,8 +1201,6 @@ sib_bookmark); g_object_unref(kztab->history); - kz_window_store_session(kz); - g_signal_emit(kz, kz_window_signals[REORDER_TAB_SIGNAL], 0, widget, pos); } @@ -2643,7 +2644,6 @@ } -#warning FIXME static gint cb_embed_dom_mouse_click (KzEmbed *embed, KzEmbedEventMouse *event, KzWindow *kz)