diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
| commit | 769b537b5e1a99fc53aa7296fd2b21dc77a4071c (patch) | |
| tree | 7df94b386078575e6186523e1a165e4b0ba7ad9f /plugins/StatusPlugins | |
| parent | 2e15a3c2aae091fcbdd3234931a2777d050e43e1 (diff) | |
name conflicts solved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/StatusPlugins')
| -rw-r--r-- | plugins/StatusPlugins/KeepStatus/keepstatus.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp index 97d0b6f634..36e379aa59 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp +++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp @@ -98,8 +98,8 @@ TConnectionSettings::TConnectionSettings(PROTOACCOUNT *pa) tszAccName = pa->tszAccountName; szMsg = NULL; - int status = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0); - AssignStatus(this, status, status, NULL); + int iStatus = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0); + AssignStatus(this, iStatus, iStatus, NULL); } TConnectionSettings::~TConnectionSettings() |