File clementine-1.2.2-dont-use-hacks-but-proper-sint... of Package clementine

Overview Repositories Revisions Requests Users Attributes Meta

File clementine-1.2.2-dont-use-hacks-but-proper-sintax-for-non-wrapping-in-namespace.patch of Package clementine (Revision 8989d9f745da87671272ac238ece6785)

Currently displaying revision 8989d9f745da87671272ac238ece6785 , Show latest

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed57302..8da4368 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -887,11 +887,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
 if(HAVE_DBUS)
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
 
-  # Hack to get it to generate interfaces without namespaces - required
-  # because otherwise org::freedesktop::UDisks and
-  # org::freedesktop::UDisks::Device conflict.
-  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
-
   # MPRIS DBUS interfaces
   qt4_add_dbus_adaptor(SOURCES
       dbus/org.freedesktop.MediaPlayer.player.xml
@@ -959,9 +954,11 @@ if(HAVE_DBUS)
 
   # DeviceKit DBUS interfaces
   if(HAVE_DEVICEKIT)
+    set_source_files_properties(dbus/org.freedesktop.UDisks.xml PROPERTIES NO_NAMESPACE dbus/udisks)
     qt4_add_dbus_interface(SOURCES
         dbus/org.freedesktop.UDisks.xml
         dbus/udisks)
+    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml PROPERTIES NO_NAMESPACE dbus/udisksdevice)
     qt4_add_dbus_interface(SOURCES
         dbus/org.freedesktop.UDisks.Device.xml
         dbus/udisksdevice)

Places

File clementine-1.2.2-dont-use-hacks-but-proper-sintax-for-non-wrapping-in-namespace.patch of Package clementine (Revision 8989d9f745da87671272ac238ece6785)

Places