[evolution-patches] Gnome Pilot Conduit Path Fixes



This patch fixes the searching of pilot conduit paths to work with
SuSE properly, as well as use the GNOME2_PATH env var instead of the
GNOME_PATH one from gnome 1.4.

-- dobey

Index: libgpilotdCM/gnome-pilot-conduit-management.gob
===================================================================
RCS file: /cvs/gnome/gnome-pilot/libgpilotdCM/gnome-pilot-conduit-management.gob,v
retrieving revision 1.27
diff -u -r1.27 gnome-pilot-conduit-management.gob
--- libgpilotdCM/gnome-pilot-conduit-management.gob	20 Mar 2003 16:35:44 -0000	1.27
+++ libgpilotdCM/gnome-pilot-conduit-management.gob	9 Jun 2003 22:43:59 -0000
@@ -275,16 +275,25 @@
 		gchar **paths;
 		int idx;
 		
-		/* Get the path crap */
-		gnome_path = getenv ("GNOME_PATH");
+		/* SuSE does weird stuff with the env vars */
+		gnome_path = getenv ("GNOMEPATH");
 		if (gnome_path) {
 			if (strchr (gnome_path, '=')) {
 				gnome_path = strchr (gnome_path, '=');
 				gnome_path++;
 			}
 		} else {
-			/* Use the compiled in CONDUITDIR */
-			gnome_path = CONDUITDIR;
+			/* Use GNOME2_PATH */
+			gnome_path = getenv ("GNOME2_PATH");
+			if (gnome_path) {
+				if (strchr (gnome_path, '=')) {
+					gnome_path = strchr (gnome_path, '=');
+					gnome_path++;
+				}
+			} else {
+				/* Use the compiled-in conduit path */
+				gnome_path = CONDUITDIR;
+			}
 		}
 		if (gnome_path == NULL) {
 			g_warning ("Cannot locate the %s files", ext);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]