r3278 - trunk/minisip/minisip/gui/gtkgui

[cesc at minisip.org]

Author: cesc
Date: 2007-05-12 16:17:00 +0200 (Sat, 12 May 2007)
New Revision: 3278

Modified:
   trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx
Log:
When looking for datadir in Linux, once all failed, try also /usr/share and /usr/local/share ...




Modified: trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx	2007-05-09 20:36:21 UTC (rev 3277)
+++ trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx	2007-05-12 14:17:00 UTC (rev 3278)
@@ -1002,7 +1002,27 @@
 		return ensureAbsolutePath( dataDirName );
 	}
 #endif
+#ifdef LINUX
+	// Check typical linux folders ... 
+	prefixDir = "/usr/";
+	dataDir = Glib::build_filename( prefixDir, "share" );
+	pkgDataDir = Glib::build_filename( dataDir, PACKAGE );
+	progDirName = Glib::build_filename( pkgDataDir, baseName );
+	if( Glib::file_test( progDirName, Glib::FILE_TEST_EXISTS ) ){
+		lastDataDir = pkgDataDir;
+		return ensureAbsolutePath( progDirName );
+	}
 
+	prefixDir = "/usr/local";
+	dataDir = Glib::build_filename( prefixDir, "share" );
+	pkgDataDir = Glib::build_filename( dataDir, PACKAGE );
+	progDirName = Glib::build_filename( pkgDataDir, baseName );
+	if( Glib::file_test( progDirName, Glib::FILE_TEST_EXISTS ) ){
+		lastDataDir = pkgDataDir;
+		return ensureAbsolutePath( progDirName );
+	}
+#endif
+
 	merr << "Can't find data file: " << baseName << end;
 	return "";
 }