[evolution] [win32] Converting the Windows SENS from C++ to plain C



commit 56daae923f75506d49ff9677c7d629028925d9ef
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Fri Mar 26 16:58:26 2010 +0100

    [win32] Converting the Windows SENS from C++ to plain C

 modules/windows-sens/Makefile.am                   |    2 +-
 ...n-windows-sens.cxx => evolution-windows-sens.c} |   19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/modules/windows-sens/Makefile.am b/modules/windows-sens/Makefile.am
index 29b027f..d49bad4 100644
--- a/modules/windows-sens/Makefile.am
+++ b/modules/windows-sens/Makefile.am
@@ -6,7 +6,7 @@ libevolution_module_windows_sens_la_CPPFLAGS =		\
 	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_windows_sens_la_SOURCES =		\
-	evolution-windows-sens.cxx
+	evolution-windows-sens.c
 
 libevolution_module_windows_sens_la_LIBADD =			\
 	$(top_builddir)/shell/libeshell.la			\
diff --git a/modules/windows-sens/evolution-windows-sens.cxx b/modules/windows-sens/evolution-windows-sens.c
similarity index 96%
rename from modules/windows-sens/evolution-windows-sens.cxx
rename to modules/windows-sens/evolution-windows-sens.c
index 6433516..19fecc2 100644
--- a/modules/windows-sens/evolution-windows-sens.cxx
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -25,7 +25,6 @@ extern "C" {
 #include <eventsys.h>
 #include <sensevts.h>
 #include <rpc.h>
-#include <stdio.h>
 
 #include <shell/e-shell.h>
 #include <e-util/e-extension.h>
@@ -42,16 +41,16 @@ _mb2wchar (const char* a)
 
 static const char* add_curly_braces_to_uuid (const char* string_uuid)
 {
-	static char curly_braced_uuid_string[64];
-	unsigned i;
-	if (!string_uuid)
+	static char curlyBracedUuidString[64];
+	int i;
+	if (!stringUUID)
 		return NULL;
-	curly_braced_uuid_string[0]='{';
-	for (i=0; i<strlen(string_uuid) && i<60; i++)
-		curly_braced_uuid_string[i+1] = string_uuid[i];
-	curly_braced_uuid_string[i+1] = '}';
-	curly_braced_uuid_string[i+2] = '\0';
-	return curly_braced_uuid_string;
+	lstrcpy(curlyBracedUuidString,"{");
+	i = strlen(curlyBracedUuidString);
+	lstrcat(curlyBracedUuidString+i,stringUUID);
+	i = strlen(curlyBracedUuidString);
+	lstrcat(curlyBracedUuidString+i,"}");
+	return curlyBracedUuidString;
 }	
 	
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]