Hiroyuki Ikezoe
ikezo****@users*****
Sat Jan 6 11:29:43 JST 2007
Index: kazehakase/src/kz-app.c diff -u kazehakase/src/kz-app.c:1.20 kazehakase/src/kz-app.c:1.21 --- kazehakase/src/kz-app.c:1.20 Sat Jan 6 09:25:32 2007 +++ kazehakase/src/kz-app.c Sat Jan 6 11:29:43 2007 @@ -384,8 +384,10 @@ priv = KZ_APP_GET_PRIVATE(app); /* close all tabs before loading session file */ + kz_session_freeze(KZ_SESSION(priv->bookmarks->current_session)); for (node = priv->window_list; node; node = g_list_next(node)) kz_window_close_all_tab(KZ_WINDOW(node->data)); + kz_session_thaw(KZ_SESSION(priv->bookmarks->current_session)); session = priv->bookmarks->current_session; location = kz_bookmark_file_get_location(KZ_BOOKMARK_FILE(session)); @@ -425,10 +427,7 @@ /* if there is no window, create a window */ if (!priv->window_list) - { - GtkWidget *window = kz_app_create_new_window(app, NULL); - gtk_widget_show(window); - } + kz_app_create_new_window(app, NULL); return GTK_WIDGET(priv->window_list->data); } Index: kazehakase/src/kz-window.c diff -u kazehakase/src/kz-window.c:1.306 kazehakase/src/kz-window.c:1.307 --- kazehakase/src/kz-window.c:1.306 Sat Jan 6 09:25:32 2007 +++ kazehakase/src/kz-window.c Sat Jan 6 11:29:43 2007 @@ -938,9 +938,7 @@ { g_return_if_fail(KZ_IS_WINDOW(kz)); - kz_session_freeze(KZ_SESSION(KZ_GET_CURRENT_SESSION)); kz_notebook_close_all_tab(KZ_NOTEBOOK(kz->notebook)); - kz_session_thaw(KZ_SESSION(KZ_GET_CURRENT_SESSION)); } @@ -1061,7 +1059,10 @@ kz = KZ_WINDOW(widget); kz_window_store_state(kz); - kz_window_close_all_tab(kz); + + kz_session_freeze(KZ_SESSION(KZ_GET_CURRENT_SESSION)); + kz_notebook_close_all_tab(KZ_NOTEBOOK(kz->notebook)); + kz_session_thaw(KZ_SESSION(KZ_GET_CURRENT_SESSION)); return FALSE; }