From f90be5cdeec5875d1022e1ef35f5b101bd76ac84 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 10 Oct 2012 07:46:53 +0000 Subject: service call replaced with the direct function call git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CountryFlags/src/extraimg.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/CountryFlags/src') diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index f019827e21..ccf26b517e 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -97,11 +97,11 @@ static void RemoveExtraImages(void) iec.ColumnType=idExtraColumn; iec.hImage=INVALID_HANDLE_VALUE; /* enum all contacts */ - hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); + hContact=db_find_first(); while(hContact!=NULL) { /* invalidate icon */ CallService(MS_CLIST_EXTRA_SET_ICON,(WPARAM)hContact,(LPARAM)&iec); - hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0); + hContact=db_find_next(hContact); } } @@ -119,10 +119,10 @@ static void EnsureExtraImages(void) if(idExtraColumnNew!=idExtraColumn) RemoveExtraImages(); idExtraColumn=idExtraColumnNew; /* enum all contacts */ - hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); + hContact=db_find_first(); while(hContact!=NULL) { CallFunctionBuffered(SetExtraImage,(LPARAM)hContact,TRUE,EXTRAIMAGE_REFRESHDELAY); - hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0); + hContact=db_find_next(hContact); } } @@ -250,7 +250,7 @@ static void CALLBACK UpdateStatusIcons(LPARAM lParam) msgwi.uFlags=MSG_WINDOW_UFLAG_MSG_BOTH; /* enum all opened message windows */ fShow=DBGetContactSettingByte(NULL,"Flags","ShowStatusIconFlag",SETTING_SHOWSTATUSICONFLAG_DEFAULT); - msgwi.hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); + msgwi.hContact=db_find_first(); while(msgwi.hContact!=NULL) { /* is a message window opened for this contact? */ if (!CallService(MS_MSG_GETWINDOWDATA,(WPARAM)&msgwi,(LPARAM)&msgw) && msgw.uState&MSG_WINDOW_STATE_EXISTS) { @@ -258,7 +258,7 @@ static void CALLBACK UpdateStatusIcons(LPARAM lParam) if(fShow) SetStatusIcon(msgwi.hContact,countryNumber); else UnsetStatusIcon(msgwi.hContact,countryNumber); } - msgwi.hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)msgw.hContact,0); + msgwi.hContact = db_find_next(msgw.hContact); } } -- cgit v1.2.3