summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-07-12 11:31:36 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-07-12 11:31:36 +0000
commit0b26ecf091dcde8e2e153c331b0015697966a4cc (patch)
treef1f2f3ac672e61fdb1e8a1f719b1c1fa31d5075c
parent9778744e014c310fad29b1d0536ef6985e909470 (diff)
repetitions removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@918 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/BasicHistory/src/BasicHistory.cpp3
-rw-r--r--plugins/Clist_nicer/SRC/CLCButton.cpp2
-rw-r--r--plugins/FavContacts/src/main.cpp2
-rw-r--r--plugins/RecentContacts/RecentContacts.cpp2
-rw-r--r--plugins/SimpleStatusMsg/main.cpp2
-rw-r--r--plugins/StatusPlugins/StartupStatus/toolbars.cpp2
-rw-r--r--protocols/YAMN/services.cpp2
7 files changed, 7 insertions, 8 deletions
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index a3bef75f36..bfdf0b274d 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -109,9 +109,8 @@ int ToolbarModuleLoaded(WPARAM wParam,LPARAM lParam)
tbb.name = LPGEN("Open History");
tbb.pszService = MS_HISTORY_SHOWCONTACTHISTORY;
tbb.pszTooltipUp = LPGEN("Open History");
- tbb.pszTooltipDn = LPGEN("Open History");
tbb.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE;
- tbb.hIconHandleUp = tbb.hIconHandleDn = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY);
+ tbb.hIconHandleUp = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY);
hToolbarButton = TopToolbar_AddButton(&tbb);
}
return 0;
diff --git a/plugins/Clist_nicer/SRC/CLCButton.cpp b/plugins/Clist_nicer/SRC/CLCButton.cpp
index 2b836bac52..f57fea034f 100644
--- a/plugins/Clist_nicer/SRC/CLCButton.cpp
+++ b/plugins/Clist_nicer/SRC/CLCButton.cpp
@@ -58,7 +58,7 @@ static int InitDefaultButtons(WPARAM, LPARAM)
g_index = i;
tbb.dwFlags = TTBBF_ICONBYHANDLE;
if (BTNS[i].pszButtonID) {
- tbb.pszTooltipUp = tbb.pszTooltipDn = tbb.name = BTNS[i].pszButtonName;
+ tbb.pszTooltipUp = tbb.name = BTNS[i].pszButtonName;
tbb.pszService = BTNS[i].pszButtonID;
tbb.hIconHandleUp = Skin_GetIconHandle(BTNS[i].pszButtonID);
if (BTNS[i].pszButtonDn)
diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 0360671a84..7c97602857 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -129,7 +129,7 @@ int ProcessTBLoaded(WPARAM wParam, LPARAM lParam)
button.name = LPGEN("Favourite Contacts");
button.pszService = MS_FAVCONTACTS_SHOWMENU;
button.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE | TTBBF_ICONBYHANDLE;
- button.hIconHandleDn = button.hIconHandleUp = (HANDLE)g_icoFavourite;
+ button.hIconHandleUp = (HANDLE)g_icoFavourite;
TopToolbar_AddButton(&button);
return 0;
}
diff --git a/plugins/RecentContacts/RecentContacts.cpp b/plugins/RecentContacts/RecentContacts.cpp
index fb893f87e0..3cb20ec310 100644
--- a/plugins/RecentContacts/RecentContacts.cpp
+++ b/plugins/RecentContacts/RecentContacts.cpp
@@ -456,7 +456,7 @@ int Create_TopToolbarShowList(WPARAM wParam, LPARAM lParam)
{
TTBButton ttbb = { 0 };
ttbb.cbSize = sizeof(ttbb);
- ttbb.hIconHandleDn = ttbb.hIconHandleDn = hIcon;
+ ttbb.hIconHandleDn = hIcon;
ttbb.pszService = msLastUC_ShowList;
ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP;
ttbb.name = msLastUC_ShowListName;
diff --git a/plugins/SimpleStatusMsg/main.cpp b/plugins/SimpleStatusMsg/main.cpp
index 4cda8ebc3a..de266b6d93 100644
--- a/plugins/SimpleStatusMsg/main.cpp
+++ b/plugins/SimpleStatusMsg/main.cpp
@@ -1600,7 +1600,7 @@ static int AddTopToolbarButton(WPARAM wParam, LPARAM lParam)
{
TTBButton ttbb = {0};
ttbb.cbSize = sizeof(ttbb);
- ttbb.hIconHandleDn = ttbb.hIconHandleUp = GetIconHandle(IDI_CSMSG);
+ ttbb.hIconHandleUp = GetIconHandle(IDI_CSMSG);
ttbb.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT;
ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE;
ttbb.name = LPGEN("Change Status Message");
diff --git a/plugins/StatusPlugins/StartupStatus/toolbars.cpp b/plugins/StatusPlugins/StartupStatus/toolbars.cpp
index a135ee1a23..e1b94d8f44 100644
--- a/plugins/StatusPlugins/StartupStatus/toolbars.cpp
+++ b/plugins/StatusPlugins/StartupStatus/toolbars.cpp
@@ -77,7 +77,7 @@ int CreateTopToolbarButtons(WPARAM wParam, LPARAM lParam)
ttb.hIconHandleDn = hTtbDown;
ttb.hIconHandleUp = hTtbUp;
ttb.wParamDown = ttb.wParamUp = i;
- ttb.pszTooltipDn = ttb.pszTooltipUp = profileName;
+ ttb.pszTooltipUp = profileName;
HANDLE ttbAddResult = TopToolbar_AddButton(&ttb);
if (ttbAddResult) {
ttbButtons[ttbButtonCount] = ttbAddResult;
diff --git a/protocols/YAMN/services.cpp b/protocols/YAMN/services.cpp
index 616b6ce9a9..abe890fdf7 100644
--- a/protocols/YAMN/services.cpp
+++ b/protocols/YAMN/services.cpp
@@ -316,7 +316,7 @@ int AddTopToolbarIcon(WPARAM,LPARAM)
btn.name = "Check mail";
btn.hIconHandleUp = g_GetIconHandle(5);
btn.hIconHandleDn = g_GetIconHandle(6);
- btn.pszTooltipDn = btn.pszTooltipUp = "Check mail";
+ btn.pszTooltipUp = LPGEN("Check mail");
hTTButton = TopToolbar_AddButton(&btn);
}
}