summaryrefslogtreecommitdiff
path: root/protocols/AimOscar/src/conv.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-04-26 22:42:33 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-04-26 22:42:33 +0000
commit2c9a9bfed50529645b5b0d5602b2a94b0b5ef900 (patch)
treec37308fe848836674bab8ba25a00a7b87079fee0 /protocols/AimOscar/src/conv.cpp
parenta7ecea148c70da66f744a0036f985bc97804d8b4 (diff)
unified project for AIM
git-svn-id: http://svn.miranda-ng.org/main/trunk@13182 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/AimOscar/src/conv.cpp')
-rw-r--r--protocols/AimOscar/src/conv.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/AimOscar/src/conv.cpp b/protocols/AimOscar/src/conv.cpp
index 96aff9e2e5..faa4bdc01c 100644
--- a/protocols/AimOscar/src/conv.cpp
+++ b/protocols/AimOscar/src/conv.cpp
@@ -16,7 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "aim.h"
+#include "stdafx.h"
#pragma warning( disable: 4706 )
@@ -610,8 +610,8 @@ char* rtf_to_html(HWND hwndDlg,int DlgItem)
BOOL Italic=false;
BOOL Underline=false;
char Face[32]="";
- COLORREF Color;
- COLORREF BackColor;
+ COLORREF Color=0;
+ COLORREF BackColor=0;
int Size=0;
GETTEXTLENGTHEX tl;
tl.flags=GTL_DEFAULT;
@@ -703,7 +703,7 @@ char* rtf_to_html(HWND hwndDlg,int DlgItem)
}
}
}
- if ( Size != isSize || Color != isColor || BackColor != isBackColor || mir_strcmp( Face, cfOld.szFaceName ))
+ if (Size != isSize || Color != isColor || BackColor != isBackColor || mir_strcmp(Face, cfOld.szFaceName))
{
Size=isSize;
Color=isColor;