[Kazehakase-cvs] CVS update: kazehakase/src

Zurück zum Archiv-Index

Hiroyuki Ikezoe ikezo****@users*****
Tue Jan 2 09:30:42 JST 2007


Index: kazehakase/src/kz-window.c
diff -u kazehakase/src/kz-window.c:1.282 kazehakase/src/kz-window.c:1.283
--- kazehakase/src/kz-window.c:1.282	Mon Jan  1 22:22:00 2007
+++ kazehakase/src/kz-window.c	Tue Jan  2 09:30:42 2007
@@ -160,8 +160,6 @@
 static void     kz_window_unset_embed_callbacks    (KzWindow   *kz,
 						    KzEmbed    *kzembed);
 
-static void     kz_window_store_session       (KzWindow  *kz);
-
 /* callbacks */
 static void     cb_profile_global_changed     (KzProfile       *profile,
 					       const gchar     *section,
@@ -466,8 +464,6 @@
 	kz->closed_tabs     = kz_bookmark_pure_folder_new();
 	kz->history_search  = kz_bookmark_pure_folder_new();
 	
-	kz->is_closing_all  = FALSE;
-
 	kz_ext_setup(kz);
 
 	kz_window_setup_action_groups(kz);
@@ -1143,7 +1139,6 @@
 	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--)
 	{
@@ -1156,7 +1151,6 @@
 
 		gtk_widget_destroy(widget);
 	}
-	kz->is_closing_all = FALSE;
 	kz_session_thaw(KZ_SESSION(KZ_GET_CURRENT_SESSION));
 }
 
@@ -1484,9 +1478,6 @@
 		kz_bookmark_remove(KZ_GET_CURRENT_SESSION, kz->tabs);
 		g_object_unref(kz->tabs);
 		kz->tabs = NULL;
-		
-		if (g_list_length((GList*)KZ_GET_WINDOW_LIST) > 0)
-			kz_window_store_session(kz);
 	}
 	if (kz->closed_tabs)
 		g_object_unref(kz->closed_tabs);
@@ -1572,19 +1563,6 @@
 }
 
 
-static void
-kz_window_store_session (KzWindow *kz)
-{
-	gboolean save_session = FALSE;
-
-	g_return_if_fail(KZ_IS_WINDOW(kz));
-
-	KZ_CONF_GET("Session", "save", save_session, BOOL);
-	if (save_session)
-		kz_bookmark_file_save(KZ_BOOKMARK_FILE(KZ_GET_CURRENT_SESSION));
-}
-
-
 void
 kz_window_store_state (KzWindow *kz)
 {
@@ -2359,11 +2337,7 @@
 	priv->view_hist = g_list_prepend(priv->view_hist, kzembed);
 
 	/* set current_position in history */
-	if (!kz->is_closing_all)
-	{
-		kz_bookmark_set_current(kz->tabs, page_num);
-		kz_window_store_session(kz);
-	}
+	kz_bookmark_set_current(kz->tabs, page_num);
 }
 
 static void
Index: kazehakase/src/kz-window.h
diff -u kazehakase/src/kz-window.h:1.72 kazehakase/src/kz-window.h:1.73
--- kazehakase/src/kz-window.h:1.72	Sun Dec 31 21:21:47 2006
+++ kazehakase/src/kz-window.h	Tue Jan  2 09:30:42 2007
@@ -78,8 +78,6 @@
 	/* handle for favicon */
 	KzPopupPreview *popup;
 	GtkWidget *popup_tablist;
-
-	gboolean   is_closing_all;
 };
 
 struct _KzWindowClass


More information about the Kazehakase-cvs mailing list
Zurück zum Archiv-Index