aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-03-10 22:23:20 +00:00
commit cb45c41b97
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.c
View File

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

4
src/ui/notifier.c
View File

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