summaryrefslogtreecommitdiff
path: root/message_notify/popups.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'message_notify/popups.cpp')
-rw-r--r--message_notify/popups.cpp26
1 files changed, 4 insertions, 22 deletions
diff --git a/message_notify/popups.cpp b/message_notify/popups.cpp
index 1a40583..83a40b9 100644
--- a/message_notify/popups.cpp
+++ b/message_notify/popups.cpp
@@ -146,17 +146,8 @@ void ShowPopup( HANDLE hContact, const char* line1, const char* line2, int flags
ppd->lchIcon = hPopupIcon;
- if(line1 && line2) {
- strncpy( ppd->lpzContactName, line1, MAX_CONTACTNAME );
- strncpy( ppd->lpzText, line2, MAX_SECONDLINE );
- } else {
- if(line1) {
- strncpy( ppd->lpzText, line1, MAX_SECONDLINE );
- } else {
- if(line2)
- strncpy( ppd->lpzText, line2, MAX_SECONDLINE );
- }
- }
+ if(line1) strncpy( ppd->lpzContactName, line1, MAX_CONTACTNAME );
+ if(line2) strncpy( ppd->lpzText, line2, MAX_SECONDLINE );
if(options.set_colours) {
ppd->colorBack = options.bkCol;
@@ -205,17 +196,8 @@ void ShowPopupW( HANDLE hContact, const wchar_t* line1, const wchar_t* line2, in
ppd->lchIcon = hPopupIcon;
- if(line1 && line2) {
- _tcsncpy( ppd->lpwzContactName, line1, MAX_CONTACTNAME );
- _tcsncpy( ppd->lpwzText, line2, MAX_SECONDLINE );
- } else {
- if(line1) {
- _tcsncpy( ppd->lpwzText, line1, MAX_SECONDLINE );
- } else {
- if(line2)
- _tcsncpy( ppd->lpwzText, line2, MAX_SECONDLINE );
- }
- }
+ if(line1) _tcsncpy( ppd->lpwzContactName, line1, MAX_CONTACTNAME );
+ if(line2) _tcsncpy( ppd->lpwzText, line2, MAX_SECONDLINE );
if(options.set_colours) {
ppd->colorBack = options.bkCol;