Hiroyuki Ikezoe
ikezo****@users*****
Tue Jan 2 09:17:34 JST 2007
Index: kazehakase/src/bookmarks/kz-root-bookmark.c diff -u kazehakase/src/bookmarks/kz-root-bookmark.c:1.17 kazehakase/src/bookmarks/kz-root-bookmark.c:1.18 --- kazehakase/src/bookmarks/kz-root-bookmark.c:1.17 Mon Jan 1 19:35:14 2007 +++ kazehakase/src/bookmarks/kz-root-bookmark.c Tue Jan 2 09:17:34 2007 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: kz-root-bookmark.c,v 1.17 2007/01/01 10:35:14 ikezoe Exp $ + * $Id: kz-root-bookmark.c,v 1.18 2007/01/02 00:17:34 ikezoe Exp $ */ #include "kz-root-bookmark.h" @@ -48,14 +48,12 @@ root->clip = KZ_BOOKMARK(kz_bookmark_file_new(NULL, NULL, NULL)); root->bookmark_bars = kz_bookmark_pure_folder_new(); root->history = kz_history_new(NULL); - root->current_session = KZ_BOOKMARK(kz_bookmark_file_new(NULL, NULL, NULL)); /* dummy */ root->tab_groups = kz_bookmark_pure_folder_new(); root->smarts = NULL; kz_bookmark_set_title(root->menu, "Bookmark Menu"); kz_bookmark_set_title(root->bookmark_bars, "Bookmark Bars"); kz_bookmark_set_title(KZ_BOOKMARK(root->history), "History"); - kz_bookmark_set_title(root->current_session, "Current Session"); kz_bookmark_set_title(root->tab_groups, "Tab Groups"); } Index: kazehakase/src/bookmarks/kz-session.c diff -u kazehakase/src/bookmarks/kz-session.c:1.5 kazehakase/src/bookmarks/kz-session.c:1.6 --- kazehakase/src/bookmarks/kz-session.c:1.5 Mon Jan 1 22:22:00 2007 +++ kazehakase/src/bookmarks/kz-session.c Tue Jan 2 09:17:34 2007 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: kz-session.c,v 1.5 2007/01/01 13:22:00 ikezoe Exp $ + * $Id: kz-session.c,v 1.6 2007/01/02 00:17:34 ikezoe Exp $ */ #include "kz-session.h" @@ -137,7 +137,10 @@ "file-type", "XBEL", NULL); - kz_bookmark_file_initialize(KZ_BOOKMARK_FILE(session)); + if (g_file_test(location, G_FILE_TEST_EXISTS)) + kz_bookmark_file_load(KZ_BOOKMARK_FILE(session)); + else + kz_bookmark_file_initialize(KZ_BOOKMARK_FILE(session)); return session; }
