Merge lp:~compiz-team/compiz/compiz.fix_1067964 into lp:compiz/0.9.9

[Sam Spilsbury]

Don't link in static libraries that define their own objects twice, pull
them in through the shared library. Doing so will result in duplicate
static symbols for the type name and that always ends badly (LP: #1067964)

  Don't link in static libraries that define their own objects twice, pull
  them in through the shared library. Doing so will result in duplicate
  static symbols for the type name and that always ends badly (LP: #1067964)

[Sam Spilsbury (smspillaz)]

This may also fix bug 1067585

[lp:~compiz-team/compiz/compiz.fix_1067964]

3442. By Sam Spilsbury on 2012-10-26

Added an error message about that

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3442
http://jenkins.qa.ubuntu.com/job/compiz-ci/224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/224/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

You don't need to use backslash to join lines. Strings in C and C++ always get joined:
    printf("Hello"
           " world");

[Daniel van Vugt (vanvugt)]

This will crash:
  + ccsError ("Unable to find interface type %i on %p\n"\

No parameters provided for the %i or %p.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Ah, thanks for the find, I was in a bit of a rush. Will fix.

[lp:~compiz-team/compiz/compiz.fix_1067964]

3443. By Sam Spilsbury on 2012-10-26

Test the die behaviour and ensure no segfault

3444. By Sam Spilsbury on 2012-10-26

Memleak

[Sam Spilsbury (smspillaz)]

Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3444
http://jenkins.qa.ubuntu.com/job/compiz-ci/226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/226/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'compizconfig/gsettings/CMakeLists.txt'
--- compizconfig/gsettings/CMakeLists.txt	2012-10-08 13:50:56 +0000
+++ compizconfig/gsettings/CMakeLists.txt	2012-10-26 11:56:21 +0000
@@ -25,12 +25,6 @@
                      ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include)
 
 set (COMPIZCONFIG_GSETTINGS_BACKEND_LIBRARIES
-     compizconfig_gsettings_wrapper
-     compizconfig_gnome_integration
-     compizconfig_gnome_integration_gsettings_setting_factory
-     compizconfig_gnome_integration_gsettings_wrapper_factory
-     compizconfig_gsettings_wrapper_factory_interface
-     compizconfig_gsettings_wrapper_factory
      compizconfig_gsettings_backend)
 
 compizconfig_backend (gsettings PKGDEPS ${_deps} LIBRARIES ${COMPIZCONFIG_GSETTINGS_BACKEND_LIBRARIES})

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-10-08 13:50:56 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-10-26 11:56:21 +0000
@@ -58,7 +58,9 @@
 	 compizconfig_gsettings_util
 	 compizconfig_gsettings_wrapper
 	 compizconfig_gnome_integration
+	 compizconfig_gnome_integration_gsettings_integrated_setting
 	 compizconfig_gnome_integration_gsettings_setting_factory
+	 compizconfig_gnome_integration_gsettings_wrapper_factory
 	 compizconfig_gsettings_wrapper_factory_interface
 	 compizconfig_gsettings_wrapper_factory
 	 compizconfig)
@@ -77,12 +79,4 @@
     install (TARGETS compizconfig_gsettings_backend
 	     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 
-    #
-    # Tell CMake that targets using compizconfig_gsettings_backend should NOT re-import the
-    # libraries that compizconfig_gsettings_backend depends on (contains).
-    #
-    set_target_properties (compizconfig_gsettings_backend PROPERTIES
-	LINK_INTERFACE_LIBRARIES ""
-    )
-
 endif (GSETTINGS_UTIL_FOUND)

=== modified file 'compizconfig/libcompizconfig/src/main.c'
--- compizconfig/libcompizconfig/src/main.c	2012-09-25 08:42:49 +0000
+++ compizconfig/libcompizconfig/src/main.c	2012-10-26 11:56:21 +0000
@@ -33,6 +33,7 @@
 #include <dirent.h>
 #include <math.h>
 #include <errno.h>
+#include <assert.h>
 
 #include <ccs.h>
 
@@ -182,6 +183,12 @@
 	    return object->interfaces[i];
     }
 
+    ccsError ("Unable to find interface type %i on %p\n"
+	      "This is either a programmer error or more than one static library \n"
+	      "defining this interface has been linked in\n"
+	      "Unable to continue, please file a bug about this\n", interface_type, object);
+    assert (0);
+
     return NULL;
 }
 

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp	2012-08-09 18:28:38 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp	2012-10-26 11:56:21 +0000
@@ -98,6 +98,36 @@
     free (to);
 }
 
+TEST(CCSObjectTest, GetInterface)
+{
+    TestingObjectWrapper *to = reinterpret_cast <TestingObjectWrapper *> (calloc (1, sizeof (TestingObjectWrapper)));
+
+    ccsObjectInit (to, &ccsDefaultObjectAllocator);
+    ccsObjectAddInterface (to, reinterpret_cast <const CCSInterface *> (&SomeDummyInterface), CCS_INTERFACE_TYPE_DUMMY);
+    DummyInterface *interface = GET_INTERFACE (DummyInterface, to);
+
+    EXPECT_EQ (interface, &SomeDummyInterface);
+
+    ccsObjectRemoveInterface (to, CCS_INTERFACE_TYPE_DUMMY);
+
+    free (to);
+}
+
+TEST(CCSObjectDeathTest, GetInterface)
+{
+    TestingObjectWrapper *to = reinterpret_cast <TestingObjectWrapper *> (calloc (1, sizeof (TestingObjectWrapper)));
+
+    ccsObjectInit (to, &ccsDefaultObjectAllocator);
+    ccsObjectAddInterface (to, reinterpret_cast <const CCSInterface *> (&SomeDummyInterface), CCS_INTERFACE_TYPE_DUMMY);
+    ASSERT_DEATH ({
+		      GET_INTERFACE (Dummy2Interface, to);
+		  },
+		  "Unable to find interface type*");
+
+    ccsObjectRemoveInterface (to, CCS_INTERFACE_TYPE_DUMMY);
+    free (to);
+}
+
 TEST(CCSObjectTest, InterfaceRemove)
 {
     TestingObjectWrapper *to = (TestingObjectWrapper *) calloc (1, sizeof (TestingObjectWrapper));