From 2201b08878bbf3f72c6e48ef82e4b80374f58c29 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Apr 2016 19:16:01 +0000 Subject: useless function cli_ChangeContactIcon removed git-svn-id: http://svn.miranda-ng.org/main/trunk@16716 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/init.cpp | 1 - plugins/Clist_modern/src/modern_clist.h | 1 - plugins/Clist_modern/src/modern_clistsettings.cpp | 8 ++++---- plugins/Clist_modern/src/modern_commonprototypes.h | 3 +-- plugins/Clist_modern/src/modern_contact.cpp | 5 ----- 5 files changed, 5 insertions(+), 13 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 1cf1580f90..a0765400ec 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -187,7 +187,6 @@ static HRESULT SubclassClistInterface() pcli->pfnDeleteItemFromTree = cli_DeleteItemFromTree; pcli->pfnFreeContact = cli_FreeContact; pcli->pfnFreeGroup = cli_FreeGroup; - pcli->pfnChangeContactIcon = cli_ChangeContactIcon; pcli->pfnSetContactCheckboxes = cli_SetContactCheckboxes; pcli->pfnTrayIconProcessMessage = cli_TrayIconProcessMessage; pcli->pfnSaveStateAndRebuildList = cli_SaveStateAndRebuildList; diff --git a/plugins/Clist_modern/src/modern_clist.h b/plugins/Clist_modern/src/modern_clist.h index 5fc23f6720..3d321906d0 100644 --- a/plugins/Clist_modern/src/modern_clist.h +++ b/plugins/Clist_modern/src/modern_clist.h @@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void LoadContactTree(void); HTREEITEM GetTreeItemByHContact(MCONTACT hContact); -void cli_ChangeContactIcon(MCONTACT hContact, int iIcon, int add); int GetContactInfosForSort(MCONTACT hContact, char **Proto, TCHAR **Name, int *Status); /////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index 765aa4df11..83f3ac0478 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -277,7 +277,7 @@ int GetContactCachedStatus(MCONTACT hContact) int ContactAdded(WPARAM hContact, LPARAM) { if (!MirandaExiting()) - cli_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode((char*)GetContactCachedProtocol(hContact), ID_STATUS_OFFLINE, hContact), 1); ///by FYR + pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode((char*)GetContactCachedProtocol(hContact), ID_STATUS_OFFLINE, hContact), 1); ///by FYR return 0; } @@ -320,7 +320,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) amRequestAwayMsg(hContact); pcli->pfnClcBroadcast(INTM_STATUSCHANGED, hContact, 0); - cli_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(cws->szModule, cws->value.wVal, hContact), 0); //by FYR + pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(cws->szModule, cws->value.wVal, hContact), 0); //by FYR } else if (!strcmp(cws->szModule, META_PROTO) && !memcmp(cws->szSetting, "Status", 6)) { // Status0..N for metacontacts if (pcli->hwndContactTree && g_flag_bOnModulesLoadedCalled) @@ -354,7 +354,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) pdnce->bIsHidden = cws->value.bVal; if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) { char *szProto = GetContactProto(hContact); - cli_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(szProto, + pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact), 1); //by FYR } pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); @@ -368,7 +368,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) if (!strcmp(cws->szSetting, "p")) { pdnce->m_pszProto = GetContactProto(hContact); char *szProto = (cws->value.type == DBVT_DELETED) ? NULL : cws->value.pszVal; - cli_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(szProto, + pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact), 0); } } diff --git a/plugins/Clist_modern/src/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h index 98e125145c..afc8d6040e 100644 --- a/plugins/Clist_modern/src/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/modern_commonprototypes.h @@ -265,8 +265,7 @@ void cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int upd void cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem); void cli_FreeContact(ClcContact*); void cli_FreeGroup(ClcGroup*); -TCHAR* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact); -void cli_ChangeContactIcon(MCONTACT hContact, int iIcon, int add); +TCHAR* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact); void cli_SetContactCheckboxes(ClcContact*, int); LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam); CListEvent* cli_AddEvent(CLISTEVENT *cle); diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp index e4ef1ff3c9..3b17c800fb 100644 --- a/plugins/Clist_modern/src/modern_contact.cpp +++ b/plugins/Clist_modern/src/modern_contact.cpp @@ -52,11 +52,6 @@ static int GetContactStatus(MCONTACT hContact) return (GetContactCachedStatus(hContact)); } -void cli_ChangeContactIcon(MCONTACT hContact, int iIcon, int add) -{ - corecli.pfnChangeContactIcon(hContact, iIcon, add); -} - static int GetStatusModeOrdering(int statusMode) { for (int i = 0; i < _countof(statusModeOrder); i++) -- cgit v1.2.3