svnno****@sourc*****
svnno****@sourc*****
Tue Mar 27 16:41:55 JST 2007
Revision: 3055
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3055
Author: kous
Date: 2007-03-27 16:41:54 +0900 (Tue, 27 Mar 2007)
Log Message:
-----------
* src/kz-app.c: used priv->user_dir and priv->system_conf_dir.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/kz-app.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-27 07:38:50 UTC (rev 3054)
+++ kazehakase/trunk/ChangeLog 2007-03-27 07:41:54 UTC (rev 3055)
@@ -1,5 +1,7 @@
2007-03-27 Kouhei Sutou <kou****@cozmi*****>
+ * src/kz-app.c: used priv->user_dir and priv->system_conf_dir.
+
* src/bookmarks/kz-bookmark.c: clean.
* src/bookmarks/kz-session.c: added type checks.
Modified: kazehakase/trunk/src/kz-app.c
===================================================================
--- kazehakase/trunk/src/kz-app.c 2007-03-27 07:38:50 UTC (rev 3054)
+++ kazehakase/trunk/src/kz-app.c 2007-03-27 07:41:54 UTC (rev 3055)
@@ -344,43 +344,38 @@
priv->favicon = kz_favicon_get_instance();
/* load prefs */
- sysconf_file = g_strdup(KZ_SYSCONFDIR G_DIR_SEPARATOR_S"kzrc");
- conf_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
- "kzrc", NULL);
+ sysconf_file = g_build_filename(priv->system_config_dir, "kzrc", NULL);
+ conf_file = g_build_filename(priv->user_dir, "kzrc", NULL);
priv->profile = kz_profile_open(conf_file, sysconf_file);
/* load bookmarks */
- bookmark_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
+ bookmark_file = g_build_filename(priv->user_dir,
"bookmarks.xml",
NULL);
- sys_bookmark_file = g_build_filename(KZ_SYSCONFDIR,
+ sys_bookmark_file = g_build_filename(priv->system_config_dir,
"bookmarks.xml",
NULL);
- bookmark_bar_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
+ bookmark_bar_file = g_build_filename(priv->user_dir,
"bookmarkbar.xml",
NULL);
- sys_bookmark_bar_file = g_build_filename(KZ_SYSCONFDIR,
+ sys_bookmark_bar_file = g_build_filename(priv->system_config_dir,
"bookmarkbar.xml",
NULL);
- clip_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
+
+ clip_file = g_build_filename(priv->user_dir,
"clip.xml",
NULL);
- smartbookmark_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
+
+ smartbookmark_file = g_build_filename(priv->user_dir,
"smartbookmarks.xml",
NULL);
- sys_smartbookmark_file= g_build_filename(KZ_SYSCONFDIR,
+ sys_smartbookmark_file= g_build_filename(priv->system_config_dir,
"smartbookmarks.xml",
NULL);
-
- current_session_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
+
+ current_session_file = g_build_filename(priv->user_dir,
"current_session.xml",
NULL);
@@ -399,16 +394,12 @@
priv->profile);
/* Load other prefs... */
- accel_prefs_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
- "keyaccelrc",
- NULL);
+ accel_prefs_file = g_build_filename(priv->user_dir, "keyaccelrc", NULL);
gtk_accel_map_load(accel_prefs_file);
- sysproxy_file = g_build_filename(KZ_SYSCONFDIR, "proxyrc", NULL);
- proxy_file = g_build_filename(g_get_home_dir(),
- "."PACKAGE,
- "proxyrc", NULL);
+ sysproxy_file = g_build_filename(priv->system_config_dir,
+ "proxyrc", NULL);
+ proxy_file = g_build_filename(priv->user_dir, "proxyrc", NULL);
priv->proxy = kz_profile_open(proxy_file, sysproxy_file);
kz_icons_init();
@@ -498,7 +489,7 @@
kz_migemo_free(priv->migemo);
priv->migemo = NULL;
}
-#endif
+#endif
#ifdef HAVE_LIBSM
if (priv->smc_conn)