diff --git a/SConstruct b/SConstruct index 33824d2f4a2..8117338c964 100755 --- a/SConstruct +++ b/SConstruct @@ -812,7 +812,6 @@ env.Alias("wesnoth-bundle", Copy("${TARGET}/Contents/Resources/English.lproj", "projectfiles/Xcode/English.lproj"), Copy("${TARGET}/Contents/Resources/fonts", "fonts"), Copy("${TARGET}/Contents/Resources/fonts.conf", "projectfiles/Xcode/Resources/fonts.conf"), - Copy("${TARGET}/Contents/Resources/Growl Registration Ticket.growlRegDict", "projectfiles/Xcode/Resources/Growl Registration Ticket.growlRegDict"), Copy("${TARGET}/Contents/Resources/icon.icns", "projectfiles/Xcode/Resources/icon.icns"), Copy("${TARGET}/Contents/Resources/images", "images"), Copy("${TARGET}/Contents/Resources/SDLMain.nib", "projectfiles/Xcode/Resources/SDLMain.nib"), diff --git a/src/desktop/apple_notification.mm b/src/desktop/apple_notification.mm index c516116e586..a88aeff2a5f 100644 --- a/src/desktop/apple_notification.mm +++ b/src/desktop/apple_notification.mm @@ -25,10 +25,6 @@ bool available() { if(notificationClass) { return true; } - notificationClass = NSClassFromString(@"GrowlApplicationBridge"); - if(notificationClass) { - return true; - } return false; } diff --git a/src/desktop/notifications.cpp b/src/desktop/notifications.cpp index b9ab2b71fcc..baf3ef49914 100644 --- a/src/desktop/notifications.cpp +++ b/src/desktop/notifications.cpp @@ -92,7 +92,7 @@ void send(const std::string& owner, const std::string& message, type t) windows_tray_notification::show(notification_title, notification_message); #endif } -#endif //end #else (defined(HAVE_LIBDBUS) || defined(HAVE_GROWL) || defined(_WIN32)) +#endif //end #else (defined(HAVE_LIBDBUS) || defined(_WIN32)) } //end namespace notifications diff --git a/src/desktop/notifications.hpp b/src/desktop/notifications.hpp index 9b9e175ca75..2e5cc19f491 100644 --- a/src/desktop/notifications.hpp +++ b/src/desktop/notifications.hpp @@ -31,9 +31,9 @@ namespace notifications * be issued. If there is no support for notifications, this fcn is a no-op. * * @note Currently we have support for dbus (linux), windows tray notifications, - * and growl (Apple). To enable one of these, the corresponding compilation unit - * dbus_notification.cpp, growl_notification.cpp, windows_tray_notification.cpp, - * must be compiled, and the corresponding C++ symbol HAVE_LIBDBUS, HAVE_GROWL, + * and NSUserNotification (Apple). To enable one of these, the corresponding compilation unit + * dbus_notification.cpp, apple_notification.cpp, windows_tray_notification.cpp, + * must be compiled, and the corresponding C++ symbol HAVE_LIBDBUS, * _WIN32 must be defined for that compilation unit _and for this one_. */ void send(const std::string& owner, const std::string& message, type t);