Merge lp:~thomas-voss/compiz-core/fix-bad-get-and-missing-symbols into lp:compiz-core/0.9.5

[Thomas Voß]

Fixes a problem with missing symbols in plugins by building and installing a shared library libcompiz_core.
Fixes a problem with uncaught exceptions (boost::bad_get).

[Alan Griffiths (alan-griffiths)]

I've a nagging feeling this isn't the best place to handle the exceptions. But it is better than not handling them.

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-18 17:05:12 +0000
+++ src/CMakeLists.txt	2012-01-20 13:04:24 +0000
@@ -59,7 +59,7 @@
     ${CORE_MOD_LIBRARY_DIRS}
 )
 
-add_library (compiz_core
+add_library (compiz_core SHARED
 	${CMAKE_CURRENT_SOURCE_DIR}/global.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/region.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/atoms.cpp
@@ -98,7 +98,7 @@
 	      PROPERTY CORE_MOD_LIBRARIES)
 
 target_link_libraries (
-    compiz_core 
+    compiz_core
     
     ${COMPIZ_LIBRARIES} 
     
@@ -115,6 +115,7 @@
 target_link_libraries (
     compiz 
     compiz_core
+    
     ${COMPIZ_LIBRARIES} 
     
     m 
@@ -128,6 +129,13 @@
 )
 
 install (
+    TARGETS compiz_core
+    RUNTIME DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
+  	LIBRARY DESTINATION ${COMPIZ_DESTDIR}${libdir}
+  	ARCHIVE DESTINATION ${COMPIZ_DESTDIR}${libdir}
+)
+
+install (
     TARGETS compiz
     DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
 )

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-19 18:12:31 +0000
+++ src/screen.cpp	2012-01-20 13:04:24 +0000
@@ -791,15 +791,27 @@
 	    pListCount++;
     }
 
+	CompString lpName;
+	
     foreach (CompOption::Value &lp, list)
     {
 	bool skip = false;
-	if (lp.s () == "core")
+	
+	try 
+	{
+		lpName = lp.s();
+	} catch(const boost::bad_get&)
+	{
+		lpName.clear();		
+	}
+	
+	
+	if (lpName == "core")
 	    continue;
 
 	foreach (CompString &p, initialPlugins)
 	{
-	    if (p == lp.s ())
+	    if (p == lpName)
 	    {
 		skip = true;
 		break;
@@ -839,20 +851,39 @@
     {
 	std::list <CompString>::iterator it = initialPlugins.begin ();
 	bool				 skip = false;
-	if (opt.s () == "core")
-	    continue;
+	
+	try 
+	{
+		if (opt.s () == "core")
+	 	   continue;
+	} catch(const boost::bad_get&)
+	{
+	}
 
 	for (; it != initialPlugins.end (); it++)
 	{
-	    if ((*it) == opt.s ())
-	    {
-		skip = true;
-		break;
-	    }
+	        try
+		{
+			if ((*it) == opt.s())
+			{
+			    skip = true;
+			    break;
+			}
+		 } catch (...)
+		 {
+		 }
 	}
 
 	if (!skip)
-	    pList.at (j++).set (opt.s ());
+	{
+		try
+		{
+		    pList.at (j++).set (opt.s ());
+		} catch(const boost::bad_get&)
+		{
+		    j++;
+		}
+	}
     }
 
     assert (j == pList.size ());
@@ -902,7 +933,13 @@
 
 	if (p == 0 && !failedPush)
 	{
-	    p = CompPlugin::load (pList[i].s ().c_str ());
+	    try
+	    {
+		p = CompPlugin::load (pList[i].s ().c_str ());
+	    } catch (...)
+	    {
+	    }
+	    
 	    if (p)
 	    {
 		if (!CompPlugin::push (p))