1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-10-13 20:13:38 -04:00

Merge branch 'master' into plugins-python

This commit is contained in:
James Booth 2016-03-10 22:23:56 +00:00
commit 11356fec01
2 changed files with 3 additions and 3 deletions

View File

@ -663,7 +663,7 @@ is_notify_enabled(void)
#ifdef PROF_HAVE_LIBNOTIFY
notify_enabled = TRUE;
#endif
#ifdef PLATFORM_CYGWIN
#ifdef PROF_PLATFORM_CYGWIN
notify_enabled = TRUE;
#endif

View File

@ -41,7 +41,7 @@
#ifdef PROF_HAVE_LIBNOTIFY
#include <libnotify/notify.h>
#endif
#ifdef PLATFORM_CYGWIN
#ifdef PROF_PLATFORM_CYGWIN
#include <windows.h>
#endif
@ -227,7 +227,7 @@ notify(const char *const message, int timeout, const char *const category)
log_error("Libnotify not initialised.");
}
#endif
#ifdef PLATFORM_CYGWIN
#ifdef PROF_PLATFORM_CYGWIN
NOTIFYICONDATA nid;
nid.cbSize = sizeof(NOTIFYICONDATA);
//nid.hWnd = hWnd;