summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-17 20:33:13 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-17 20:33:13 +0000
commit1be97f17884f9046e6ab45d45ea327ef00a3d095 (patch)
treea5d507adbdb5c60d15602916e3a2e87d8d6b5ae6
parent3710c84df897f6f816692a706189cb0da6b724dc (diff)
code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@468 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/Nudge/main.cpp6
-rw-r--r--plugins/UserInfoEx/svc_reminder.cpp1
-rw-r--r--src/modules/clist/clistevents.cpp2
-rw-r--r--src/modules/netlib/netlib.cpp2
4 files changed, 2 insertions, 9 deletions
diff --git a/plugins/Nudge/main.cpp b/plugins/Nudge/main.cpp
index ca8e18857e..b2f1ab36ac 100644
--- a/plugins/Nudge/main.cpp
+++ b/plugins/Nudge/main.cpp
@@ -240,12 +240,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
return &pluginInfo;
}
-static const MUUID interfaces[] = {MUUID_NUDGE_SEND, MIID_LAST};
-extern "C" __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void)
-{
- return interfaces;
-}
-
static INT_PTR CALLBACK DlgProcOptsTrigger(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
switch (msg) {
diff --git a/plugins/UserInfoEx/svc_reminder.cpp b/plugins/UserInfoEx/svc_reminder.cpp
index 41940ac9f4..9ec0953b36 100644
--- a/plugins/UserInfoEx/svc_reminder.cpp
+++ b/plugins/UserInfoEx/svc_reminder.cpp
@@ -911,7 +911,6 @@ VOID SvcReminderOnTopToolBarLoaded()
ttb.pszServiceDown = MS_USERINFO_REMINDER_CHECK;
ttb.name = "Check anniversaries";
ttb.hIconHandleDn = ttb.hIconHandleUp = Skin_GetIconHandle(ICO_COMMON_BIRTHDAY);
- ttb.tooltipUp = ttb.tooltipDn = "Check anniversaries";
hTTButton = CallService(MS_TTB_ADDBUTTON, (WPARAM) &ttb, 0);
if (hTTButton)
diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp
index 4a82c21ea8..46045daa04 100644
--- a/src/modules/clist/clistevents.cpp
+++ b/src/modules/clist/clistevents.cpp
@@ -91,7 +91,7 @@ static void ShowEventsInTray()
char nTrayProtoCnt;
int nTrayCnt=cli.trayIconCount;
if (!cli.events.count || !nTrayCnt) return;
- if (cli.events.count == 1 || nTrayCnt == 1)
+ if (cli.events.count == 1 || nTrayCnt == 1)
{
ShowOneEventInTray(0); //for only one icon in tray show topmost event
return;
diff --git a/src/modules/netlib/netlib.cpp b/src/modules/netlib/netlib.cpp
index d1c0579c37..7e637b4b47 100644
--- a/src/modules/netlib/netlib.cpp
+++ b/src/modules/netlib/netlib.cpp
@@ -157,7 +157,7 @@ static INT_PTR NetlibRegisterUser(WPARAM, LPARAM lParam)
thisUser->user.ptszDescriptiveName = (thisUser->user.flags&NUF_UNICODE ? mir_u2t((WCHAR*)nlu->ptszDescriptiveName) : mir_a2t(nlu->szDescriptiveName));
}
if ((thisUser->user.szSettingsModule=mir_strdup(nlu->szSettingsModule)) == NULL
- || (nlu->szDescriptiveName && thisUser->user.ptszDescriptiveName == NULL)
+ || (nlu->szDescriptiveName && thisUser->user.ptszDescriptiveName == NULL)
|| (nlu->szHttpGatewayUserAgent && (thisUser->user.szHttpGatewayUserAgent=mir_strdup(nlu->szHttpGatewayUserAgent)) == NULL))
{
mir_free(thisUser);