Hiroyuki Ikezoe
ikezo****@users*****
Tue Jan 2 09:17:34 JST 2007
Index: kazehakase/src/kz-app.c
diff -u kazehakase/src/kz-app.c:1.10 kazehakase/src/kz-app.c:1.11
--- kazehakase/src/kz-app.c:1.10 Mon Jan 1 21:17:52 2007
+++ kazehakase/src/kz-app.c Tue Jan 2 09:17:34 2007
@@ -128,7 +128,7 @@
{
gchar *sysconf_file, *conf_file;
gchar *bookmark_file, *sys_bookmark_file;
- gchar *clip_file, *current_session_file;
+ gchar *clip_file;
gchar *bookmark_bar_file, *sys_bookmark_bar_file;
gchar *smartbookmark_file, *sys_smartbookmark_file;
gchar *accel_prefs_file;
@@ -190,10 +190,6 @@
sys_smartbookmark_file= g_build_filename(KZ_SYSCONFDIR,
"smartbookmarks.xml",
NULL);
- current_session_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
- "current_session.xml",
- NULL);
priv->bookmarks = kz_root_bookmark_new(bookmark_file, sys_bookmark_file,
clip_file, NULL);
@@ -204,9 +200,6 @@
kz_root_bookmark_add_bookmark_bar_file(priv->bookmarks,
bookmark_bar_file,
sys_bookmark_bar_file);
- kz_root_bookmark_add_current_session_file(priv->bookmarks,
- current_session_file);
- kz_session_set_profile(KZ_SESSION(priv->bookmarks->current_session), priv->profile);
/* Load other prefs... */
accel_prefs_file = g_build_filename(g_get_home_dir(),
@@ -243,7 +236,6 @@
g_free(bookmark_file);
g_free(sys_bookmark_file);
g_free(clip_file);
- g_free(current_session_file);
g_free(bookmark_bar_file);
g_free(sys_bookmark_bar_file);
g_free(smartbookmark_file);
@@ -357,6 +349,16 @@
restore_session (KzApp *app, KzWindow *kz)
{
GtkAction *action;
+ gchar *current_session_file;
+ KzAppPrivate *priv = KZ_APP_GET_PRIVATE(app);
+
+ current_session_file = g_build_filename(g_get_home_dir(),
+ "."PACKAGE,
+ "current_session.xml",
+ NULL);
+ kz_root_bookmark_add_current_session_file(priv->bookmarks,
+ current_session_file);
+ kz_session_set_profile(KZ_SESSION(priv->bookmarks->current_session), priv->profile);
action = gtk_action_group_get_action(kz->actions,
"RestoreSession");
@@ -364,6 +366,8 @@
gtk_action_activate(action);
else
g_signal_connect(kz, "map", G_CALLBACK(cb_window_map), action);
+
+ g_free(current_session_file);
}
GtkWidget *