On Wed, 26 Sep 2012 15:06:08 -0600 Kevin Fenzi wrote: > Yeah, fixed in git: > http://git.xfce.org/apps/midori/commit/?id=c99d48c65e6271846590c925419487b173bcff18 > I don't think this commit fixes it... Git bisect pointed me to different place: http://git.xfce.org/apps/midori/commit/?id=7c26d4ca116f856be92cda371482d5179b25f1be
Of course, since parts of the code that this touches changed between the commit and 0.4.7 it does not apply on the 0.4.7 release at all. However I was able to figure out a fix based on these changes that appears to work (I haven't done excessive testing, but the couple of sites I use with either -a or -p seem to work without problems, as well as "normal" midori mode). The fix is attached. Cheers, Martin
diff -up midori-0.4.7/katze/midori-paths.vala.private midori-0.4.7/katze/midori-paths.vala
--- midori-0.4.7/katze/midori-paths.vala.private 2012-10-18 11:19:47.000000000 +0200
+++ midori-0.4.7/katze/midori-paths.vala 2012-10-18 12:25:48.833756721 +0200
@@ -79,6 +79,9 @@ namespace Midori {
config_dir = cache_dir = user_data_dir = "/";
readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,
Environment.get_user_config_dir (), PACKAGE_NAME);
+ cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ Environment.get_user_cache_dir (), PACKAGE_NAME);
+ user_data_dir = Environment.get_user_data_dir ();
tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ());
}
@@ -97,15 +100,15 @@ namespace Midori {
}
}
- public static unowned string get_config_dir () {
- assert (config_dir != null);
- return config_dir;
+ public static string get_config_dir () {
+ assert (mode != RuntimeMode.UNDEFINED);
+ return readonly_dir ?? config_dir;
}
public static string get_config_filename (string filename) {
assert (mode != RuntimeMode.UNDEFINED);
- assert (config_dir != null);
- return Path.build_path (Path.DIR_SEPARATOR_S, config_dir, filename);
+ return Path.build_path (Path.DIR_SEPARATOR_S,
+ readonly_dir ?? config_dir, filename);
}
public static unowned string get_cache_dir () {
@@ -226,7 +229,7 @@ namespace Midori {
}
public static string get_preset_filename (string? folder, string filename) {
- assert (config_dir != null);
+ assert (exec_path != null);
#if HAVE_WIN32
return Path.build_filename (exec_path, "etc", "xdg", PACKAGE_NAME, folder ?? "", filename);
signature.asc
Description: PGP signature
_______________________________________________ xfce mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/xfce
