Merge lp:~3v1n0/libappindicator/snap-prefix-ignore-well-known-dirs into lp:libappindicator/16.10

[Marco Trevisan (Treviño)]

app-indicator: don't append the snap prefix if the icon is saved in a well known readable path

[Andrea Azzarone (azzar1)]

+1

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2017-02-13 17:12:29 +0000
+++ src/app-indicator.c	2017-02-15 14:12:39 +0000
@@ -2066,6 +2066,7 @@
 static gchar *
 append_snap_prefix (const gchar *path)
 {
+	gint i;
 	gchar real_path[PATH_MAX];
 	const gchar *snap = get_snap_prefix ();
 
@@ -2079,10 +2080,21 @@
 			return NULL;
 		}
 
-		if (g_str_has_prefix (path, snap)) {
+		if (g_str_has_prefix (path, snap) ||
+			g_str_has_prefix (path, g_get_home_dir ()) ||
+			g_str_has_prefix (path, g_get_user_cache_dir ()) ||
+			g_str_has_prefix (path, g_get_user_config_dir ()) ||
+			g_str_has_prefix (path, g_get_user_data_dir ()) ||
+			g_str_has_prefix (path, g_get_user_runtime_dir ())) {
 			return g_strdup (path);
 		}
 
+		for (i = 0; i < G_USER_N_DIRECTORIES; ++ i) {
+			if (g_str_has_prefix (path, g_get_user_special_dir (i))) {
+				return g_strdup (path);
+			}
+		}
+
 		return g_build_path (G_DIR_SEPARATOR_S, snap, path, NULL);
 	}