Merge pull request #12 from dmeltzer/master

Fix build on os x 10.7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c765699..6a99783 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,10 @@ option(STATIC        "Enable static building (might not be portable)" OFF)
 
 if(APPLE)
   option(DEPLOY        "Mac OS X only! Adds required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF)
-  option(WITH_NOTIFICATION_CENTER "Enable OS X Notification Center support" ON)
+  # Notification Center is only available in > 10.8, which is Darwin v12
+  if(CMAKE_SYSTEM_VERSION VERSION_GREATER "11.9.9")
+    option(WITH_NOTIFICATION_CENTER "Enable OS X Notification Center support" ON)
+  endif(CMAKE_SYSTEM_VERSION VERSION_GREATER "11.9.9")
 endif(APPLE)
 
 # Default to embedding data in the static case

diff --git a/interfaces/org.freedesktop.Notifications.xml b/interfaces/org.freedesktop.Notifications.xml
index 0827cba..f368515 100644 (file)
--- a/interfaces/org.freedesktop.Notifications.xml
+++ b/interfaces/org.freedesktop.Notifications.xml
@@ -26,7 +26,7 @@
       <arg name="body" type="s" direction="in"/>
       <arg name="actions" type="as" direction="in"/>
       <arg name="hints" type="a{sv}" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
       <arg name="expire_timeout" type="i" direction="in"/>
     </method>
     <method name="CloseNotification">

diff --git a/interfaces/org.kde.StatusNotifierItem.xml b/interfaces/org.kde.StatusNotifierItem.xml
index 7c3acd5..fba9b6f 100644 (file)
--- a/interfaces/org.kde.StatusNotifierItem.xml
+++ b/interfaces/org.kde.StatusNotifierItem.xml
@@ -15,13 +15,13 @@
 
     <!--struct containing width, height and image data-->
     <property name="IconPixmap" type="(iiay)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageVector"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageVector"/>
     </property>
 
     <property name="OverlayIconName" type="s" access="read"/>
 
     <property name="OverlayIconPixmap" type="(iiay)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageVector"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageVector"/>
     </property>
 
 
@@ -30,7 +30,7 @@
 
     <!--same definition as image-->
     <property name="AttentionIconPixmap" type="(iiay)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageVector"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageVector"/>
     </property>
 
     <property name="AttentionMovieName" type="s" access="read"/>
@@ -41,7 +41,7 @@
 
     <!--(iiay) is an image-->
     <property name="ToolTip" type="(s(iiay)ss)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusToolTipStruct"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusToolTipStruct"/>
     </property>
 
 

diff --git a/interfaces/org.kde.StatusNotifierWatcher.xml b/interfaces/org.kde.StatusNotifierWatcher.xml
index dd45dc9..2eb1a7a 100644 (file)
--- a/interfaces/org.kde.StatusNotifierWatcher.xml
+++ b/interfaces/org.kde.StatusNotifierWatcher.xml
@@ -15,7 +15,7 @@
     <!-- properties -->
 
     <property name="RegisteredStatusNotifierItems" type="as" access="read">
-       <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringList"/>
+       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/>
     </property>
 
     <property name="IsStatusNotifierHostRegistered" type="b" access="read"/>