summaryrefslogtreecommitdiffstats
path: root/x11-wm/metacity-setup/files/patch-src_callbacks.c
blob: 544e63e4611fecfa68d32ac226c72bca1925fa3e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
--- src/callbacks.c.orig	Tue Aug 27 15:30:54 2002
+++ src/callbacks.c	Tue Aug 27 15:30:36 2002
@@ -228,14 +228,25 @@
 
 			while ((filename =
 				g_dir_read_name (themeDirectory)) != NULL)
-				if (g_file_test
+				if ((g_file_test
 				    (g_build_filename
 				     (possibleThemeDirs[i], filename, NULL),
 						G_FILE_TEST_IS_DIR) &&
 					(g_file_test
 						(g_build_filename
 							(possibleThemeDirs[i], filename, "metacity-theme-1.xml", NULL),
-						G_FILE_TEST_IS_REGULAR)))
+						G_FILE_TEST_IS_REGULAR))) ||
+				   ((g_file_test
+				         (g_build_filename
+					  (possibleThemeDirs[i], filename, NULL),
+					  	G_FILE_TEST_IS_DIR) &&
+					    (g_file_test
+					            (g_build_filename
+						            (possibleThemeDirs[i], filename, "metacity-1", NULL), G_FILE_TEST_IS_DIR) &&
+							    (g_file_test
+							      (g_build_filename
+							        (possibleThemeDirs[i], filename, "metacity-1", "metacity-theme-1.xml", NULL), G_FILE_TEST_IS_REGULAR))))))
+
 					{
 						g_ptr_array_add (themeNameHolder,
 							 g_strdup (filename));
OpenPOWER on IntegriCloud