From a27079fe5c4a210664515c47767c00112c435d65 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <Mataes2007@gmail.com>
Date: Wed, 6 Dec 2017 14:15:09 +0300
Subject: convert all files exept curl and new_gpg to utf-8 BOM (reverted from
commit 62202ed10617927d5429bc59898e12a366abe744)
---
protocols/Sametime/CMakeLists.txt | 2 +-
protocols/Sametime/docs/license.txt | 2 +-
protocols/Sametime/docs/readme.txt | 2 +-
protocols/Sametime/proto_sametime/CMakeLists.txt | 2 +-
protocols/Sametime/proto_sametime/src/resource.h | 2 +-
protocols/Sametime/src/StdAfx.cpp | 2 +-
protocols/Sametime/src/StdAfx.h | 2 +-
protocols/Sametime/src/conference.cpp | 2 +-
protocols/Sametime/src/files.cpp | 2 +-
protocols/Sametime/src/glib/CMakeLists.txt | 2 +-
protocols/Sametime/src/glib/config.h | 2 +-
protocols/Sametime/src/glib/dirent.c | 2 +-
protocols/Sametime/src/glib/dirent.h | 2 +-
protocols/Sametime/src/glib/galloca.h | 2 +-
protocols/Sametime/src/glib/garray.c | 2 +-
protocols/Sametime/src/glib/garray.h | 2 +-
protocols/Sametime/src/glib/gasyncqueue.c | 2 +-
protocols/Sametime/src/glib/gasyncqueue.h | 2 +-
protocols/Sametime/src/glib/gatomic-gcc.c | 2 +-
protocols/Sametime/src/glib/gatomic.c | 2 +-
protocols/Sametime/src/glib/gatomic.h | 2 +-
protocols/Sametime/src/glib/gbacktrace.c | 2 +-
protocols/Sametime/src/glib/gbacktrace.h | 2 +-
protocols/Sametime/src/glib/gbase64.c | 2 +-
protocols/Sametime/src/glib/gbase64.h | 2 +-
protocols/Sametime/src/glib/gbitlock.c | 2 +-
protocols/Sametime/src/glib/gbitlock.h | 2 +-
protocols/Sametime/src/glib/gbookmarkfile.c | 2 +-
protocols/Sametime/src/glib/gbookmarkfile.h | 2 +-
protocols/Sametime/src/glib/gbsearcharray.h | 2 +-
protocols/Sametime/src/glib/gbuffer.c | 2 +-
protocols/Sametime/src/glib/gbuffer.h | 2 +-
protocols/Sametime/src/glib/gcache.c | 2 +-
protocols/Sametime/src/glib/gcache.h | 2 +-
protocols/Sametime/src/glib/gchecksum.c | 2 +-
protocols/Sametime/src/glib/gchecksum.h | 2 +-
protocols/Sametime/src/glib/gcompletion.c | 2 +-
protocols/Sametime/src/glib/gcompletion.h | 2 +-
protocols/Sametime/src/glib/gconvert.c | 2 +-
protocols/Sametime/src/glib/gconvert.h | 2 +-
protocols/Sametime/src/glib/gdataset.c | 2 +-
protocols/Sametime/src/glib/gdataset.h | 2 +-
protocols/Sametime/src/glib/gdatasetprivate.h | 2 +-
protocols/Sametime/src/glib/gdate.c | 2 +-
protocols/Sametime/src/glib/gdate.h | 2 +-
protocols/Sametime/src/glib/gdatetime.c | 2 +-
protocols/Sametime/src/glib/gdatetime.h | 2 +-
protocols/Sametime/src/glib/gdebug.h | 2 +-
protocols/Sametime/src/glib/gdir.c | 2 +-
protocols/Sametime/src/glib/gdir.h | 2 +-
protocols/Sametime/src/glib/gerror.c | 2 +-
protocols/Sametime/src/glib/gerror.h | 2 +-
protocols/Sametime/src/glib/gfileutils.c | 2 +-
protocols/Sametime/src/glib/gfileutils.h | 2 +-
protocols/Sametime/src/glib/ghash.c | 2 +-
protocols/Sametime/src/glib/ghash.h | 2 +-
protocols/Sametime/src/glib/ghook.c | 2 +-
protocols/Sametime/src/glib/ghook.h | 2 +-
protocols/Sametime/src/glib/ghostutils.c | 2 +-
protocols/Sametime/src/glib/ghostutils.h | 2 +-
protocols/Sametime/src/glib/gi18n-lib.h | 2 +-
protocols/Sametime/src/glib/gi18n.h | 2 +-
protocols/Sametime/src/glib/giochannel.c | 2 +-
protocols/Sametime/src/glib/giochannel.h | 2 +-
protocols/Sametime/src/glib/giounix.c | 2 +-
protocols/Sametime/src/glib/giowin32.c | 2 +-
protocols/Sametime/src/glib/gkeyfile.c | 2 +-
protocols/Sametime/src/glib/gkeyfile.h | 2 +-
protocols/Sametime/src/glib/glib-object.h | 2 +-
protocols/Sametime/src/glib/glib.h | 2 +-
protocols/Sametime/src/glib/glib_trace.h | 2 +-
protocols/Sametime/src/glib/glibconfig.h | 2 +-
protocols/Sametime/src/glib/glibintl.h | 2 +-
protocols/Sametime/src/glib/glist.c | 2 +-
protocols/Sametime/src/glib/glist.h | 2 +-
protocols/Sametime/src/glib/gmacros.h | 2 +-
protocols/Sametime/src/glib/gmain.c | 2 +-
protocols/Sametime/src/glib/gmain.h | 2 +-
protocols/Sametime/src/glib/gmappedfile.c | 2 +-
protocols/Sametime/src/glib/gmappedfile.h | 2 +-
protocols/Sametime/src/glib/gmarkup.c | 2 +-
protocols/Sametime/src/glib/gmarkup.h | 2 +-
protocols/Sametime/src/glib/gmem.c | 2 +-
protocols/Sametime/src/glib/gmem.h | 2 +-
protocols/Sametime/src/glib/gmessages.c | 2 +-
protocols/Sametime/src/glib/gmessages.h | 2 +-
protocols/Sametime/src/glib/gmirroringtable.h | 2 +-
protocols/Sametime/src/glib/gnode.c | 2 +-
protocols/Sametime/src/glib/gnode.h | 2 +-
protocols/Sametime/src/glib/gnulib/asnprintf.c | 2 +-
protocols/Sametime/src/glib/gnulib/g-gnulib.h | 2 +-
protocols/Sametime/src/glib/gnulib/printf-args.c | 2 +-
protocols/Sametime/src/glib/gnulib/printf-args.h | 2 +-
protocols/Sametime/src/glib/gnulib/printf-parse.c | 2 +-
protocols/Sametime/src/glib/gnulib/printf-parse.h | 2 +-
protocols/Sametime/src/glib/gnulib/printf.c | 2 +-
protocols/Sametime/src/glib/gnulib/printf.h | 2 +-
protocols/Sametime/src/glib/gnulib/vasnprintf.c | 2 +-
protocols/Sametime/src/glib/gnulib/vasnprintf.h | 2 +-
protocols/Sametime/src/glib/goption.c | 2 +-
protocols/Sametime/src/glib/goption.h | 2 +-
protocols/Sametime/src/glib/gpattern.c | 2 +-
protocols/Sametime/src/glib/gpattern.h | 2 +-
protocols/Sametime/src/glib/gpoll.c | 2 +-
protocols/Sametime/src/glib/gpoll.h | 2 +-
protocols/Sametime/src/glib/gprimes.c | 2 +-
protocols/Sametime/src/glib/gprimes.h | 2 +-
protocols/Sametime/src/glib/gprintf.c | 2 +-
protocols/Sametime/src/glib/gprintf.h | 2 +-
protocols/Sametime/src/glib/gprintfint.h | 2 +-
protocols/Sametime/src/glib/gqsort.c | 2 +-
protocols/Sametime/src/glib/gqsort.h | 2 +-
protocols/Sametime/src/glib/gquark.h | 2 +-
protocols/Sametime/src/glib/gqueue.c | 2 +-
protocols/Sametime/src/glib/gqueue.h | 2 +-
protocols/Sametime/src/glib/grand.c | 2 +-
protocols/Sametime/src/glib/grand.h | 2 +-
protocols/Sametime/src/glib/gregex.c | 2 +-
protocols/Sametime/src/glib/gregex.h | 2 +-
protocols/Sametime/src/glib/grel.c | 2 +-
protocols/Sametime/src/glib/grel.h | 2 +-
protocols/Sametime/src/glib/gscanner.c | 2 +-
protocols/Sametime/src/glib/gscanner.h | 2 +-
protocols/Sametime/src/glib/gscripttable.h | 2 +-
protocols/Sametime/src/glib/gsequence.c | 2 +-
protocols/Sametime/src/glib/gsequence.h | 2 +-
protocols/Sametime/src/glib/gshell.c | 2 +-
protocols/Sametime/src/glib/gshell.h | 2 +-
protocols/Sametime/src/glib/gslice.c | 2 +-
protocols/Sametime/src/glib/gslice.h | 2 +-
protocols/Sametime/src/glib/gslist.c | 2 +-
protocols/Sametime/src/glib/gslist.h | 2 +-
protocols/Sametime/src/glib/gspawn-win32-helper-console.c | 2 +-
protocols/Sametime/src/glib/gspawn-win32-helper.c | 2 +-
protocols/Sametime/src/glib/gspawn-win32.c | 2 +-
protocols/Sametime/src/glib/gspawn-win64-helper-console.c | 2 +-
protocols/Sametime/src/glib/gspawn-win64-helper.c | 2 +-
protocols/Sametime/src/glib/gspawn.c | 2 +-
protocols/Sametime/src/glib/gspawn.h | 2 +-
protocols/Sametime/src/glib/gstdio.c | 2 +-
protocols/Sametime/src/glib/gstdio.h | 2 +-
protocols/Sametime/src/glib/gstrfuncs.c | 2 +-
protocols/Sametime/src/glib/gstrfuncs.h | 2 +-
protocols/Sametime/src/glib/gstring.c | 2 +-
protocols/Sametime/src/glib/gstring.h | 2 +-
protocols/Sametime/src/glib/gtester.c | 2 +-
protocols/Sametime/src/glib/gtestutils.c | 2 +-
protocols/Sametime/src/glib/gtestutils.h | 2 +-
protocols/Sametime/src/glib/gthread.c | 2 +-
protocols/Sametime/src/glib/gthread.h | 2 +-
protocols/Sametime/src/glib/gthreadpool.c | 2 +-
protocols/Sametime/src/glib/gthreadpool.h | 2 +-
protocols/Sametime/src/glib/gthreadprivate.h | 2 +-
protocols/Sametime/src/glib/gtimer.c | 2 +-
protocols/Sametime/src/glib/gtimer.h | 2 +-
protocols/Sametime/src/glib/gtimezone.c | 2 +-
protocols/Sametime/src/glib/gtimezone.h | 2 +-
protocols/Sametime/src/glib/gtimezoneprivate.h | 2 +-
protocols/Sametime/src/glib/gtree.c | 2 +-
protocols/Sametime/src/glib/gtree.h | 2 +-
protocols/Sametime/src/glib/gtypes.h | 2 +-
protocols/Sametime/src/glib/gunibreak.c | 2 +-
protocols/Sametime/src/glib/gunibreak.h | 2 +-
protocols/Sametime/src/glib/gunichartables.h | 2 +-
protocols/Sametime/src/glib/gunicode.h | 2 +-
protocols/Sametime/src/glib/gunicodeprivate.h | 2 +-
protocols/Sametime/src/glib/gunicollate.c | 2 +-
protocols/Sametime/src/glib/gunicomp.h | 2 +-
protocols/Sametime/src/glib/gunidecomp.c | 2 +-
protocols/Sametime/src/glib/gunidecomp.h | 2 +-
protocols/Sametime/src/glib/guniprop.c | 2 +-
protocols/Sametime/src/glib/gurifuncs.c | 2 +-
protocols/Sametime/src/glib/gurifuncs.h | 2 +-
protocols/Sametime/src/glib/gutf8.c | 2 +-
protocols/Sametime/src/glib/gutils.c | 2 +-
protocols/Sametime/src/glib/gutils.h | 2 +-
protocols/Sametime/src/glib/gvariant-core.c | 2 +-
protocols/Sametime/src/glib/gvariant-core.h | 2 +-
protocols/Sametime/src/glib/gvariant-internal.h | 2 +-
protocols/Sametime/src/glib/gvariant-parser.c | 2 +-
protocols/Sametime/src/glib/gvariant-serialiser.c | 2 +-
protocols/Sametime/src/glib/gvariant-serialiser.h | 2 +-
protocols/Sametime/src/glib/gvariant.c | 2 +-
protocols/Sametime/src/glib/gvariant.h | 2 +-
protocols/Sametime/src/glib/gvarianttype.c | 2 +-
protocols/Sametime/src/glib/gvarianttype.h | 2 +-
protocols/Sametime/src/glib/gvarianttypeinfo.c | 2 +-
protocols/Sametime/src/glib/gvarianttypeinfo.h | 2 +-
protocols/Sametime/src/glib/gwin32.c | 2 +-
protocols/Sametime/src/glib/gwin32.h | 2 +-
protocols/Sametime/src/glib/libcharset/libcharset.h | 2 +-
protocols/Sametime/src/glib/libcharset/localcharset.c | 2 +-
protocols/Sametime/src/glib/libcharset/localcharset.h | 2 +-
protocols/Sametime/src/glib/libintl.c | 2 +-
protocols/Sametime/src/glib/libintl.h | 2 +-
protocols/Sametime/src/glib/wdirent.c | 2 +-
protocols/Sametime/src/glib/win_iconv.c | 2 +-
protocols/Sametime/src/meanwhile/src/channel.c | 2 +-
protocols/Sametime/src/meanwhile/src/cipher.c | 2 +-
protocols/Sametime/src/meanwhile/src/common.c | 2 +-
protocols/Sametime/src/meanwhile/src/error.c | 2 +-
protocols/Sametime/src/meanwhile/src/message.c | 2 +-
protocols/Sametime/src/meanwhile/src/mpi/mpi-config.h | 2 +-
protocols/Sametime/src/meanwhile/src/mpi/mpi-types.h | 2 +-
protocols/Sametime/src/meanwhile/src/mpi/mpi.c | 2 +-
protocols/Sametime/src/meanwhile/src/mpi/mpi.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_channel.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_cipher.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_common.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_debug.c | 2 +-
protocols/Sametime/src/meanwhile/src/mw_debug.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_error.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_message.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_service.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_session.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_aware.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_conf.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_dir.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_ft.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_im.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_place.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_resolve.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_srvc_store.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_st_list.h | 2 +-
protocols/Sametime/src/meanwhile/src/mw_util.c | 2 +-
protocols/Sametime/src/meanwhile/src/mw_util.h | 2 +-
protocols/Sametime/src/meanwhile/src/service.c | 2 +-
protocols/Sametime/src/meanwhile/src/session.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_aware.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_conf.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_dir.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_ft.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_im.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_place.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_resolve.c | 2 +-
protocols/Sametime/src/meanwhile/src/srvc_store.c | 2 +-
protocols/Sametime/src/meanwhile/src/st_list.c | 2 +-
protocols/Sametime/src/messaging.cpp | 2 +-
protocols/Sametime/src/options.cpp | 2 +-
protocols/Sametime/src/places.cpp | 2 +-
protocols/Sametime/src/resource.h | 2 +-
protocols/Sametime/src/sametime.cpp | 2 +-
protocols/Sametime/src/sametime.h | 2 +-
protocols/Sametime/src/sametime_proto.cpp | 2 +-
protocols/Sametime/src/sametime_proto.h | 2 +-
protocols/Sametime/src/sametime_session.cpp | 2 +-
protocols/Sametime/src/session_announce_win.cpp | 2 +-
protocols/Sametime/src/userlist.cpp | 2 +-
protocols/Sametime/src/utils.cpp | 2 +-
protocols/Sametime/src/version.h | 2 +-
250 files changed, 250 insertions(+), 250 deletions(-)
(limited to 'protocols/Sametime')
diff --git a/protocols/Sametime/CMakeLists.txt b/protocols/Sametime/CMakeLists.txt
index c1964ea991..03fafd6760 100644
--- a/protocols/Sametime/CMakeLists.txt
+++ b/protocols/Sametime/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB SOURCES "src/*.h" "res/*.rc"
+file(GLOB SOURCES "src/*.h" "res/*.rc"
"src/conference.cpp"
"src/files.cpp"
"src/messaging.cpp"
diff --git a/protocols/Sametime/docs/license.txt b/protocols/Sametime/docs/license.txt
index 89c3eac732..818433ecc0 100644
--- a/protocols/Sametime/docs/license.txt
+++ b/protocols/Sametime/docs/license.txt
@@ -1,4 +1,4 @@
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
diff --git a/protocols/Sametime/docs/readme.txt b/protocols/Sametime/docs/readme.txt
index 9dec5fb628..7d087ad784 100644
--- a/protocols/Sametime/docs/readme.txt
+++ b/protocols/Sametime/docs/readme.txt
@@ -1,4 +1,4 @@
-
+
sametime.dll
Miranda NG Sametime protocol
diff --git a/protocols/Sametime/proto_sametime/CMakeLists.txt b/protocols/Sametime/proto_sametime/CMakeLists.txt
index 9080a18f33..b0b9cd2707 100644
--- a/protocols/Sametime/proto_sametime/CMakeLists.txt
+++ b/protocols/Sametime/proto_sametime/CMakeLists.txt
@@ -1,2 +1,2 @@
-set(TARGET Proto_Sametime)
+set(TARGET Proto_Sametime)
include(${CMAKE_SOURCE_DIR}/cmake/icons.cmake)
\ No newline at end of file
diff --git a/protocols/Sametime/proto_sametime/src/resource.h b/protocols/Sametime/proto_sametime/src/resource.h
index 64a651e369..e4fb5b5339 100644
--- a/protocols/Sametime/proto_sametime/src/resource.h
+++ b/protocols/Sametime/proto_sametime/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by Proto_Sametime.rc
//
diff --git a/protocols/Sametime/src/StdAfx.cpp b/protocols/Sametime/src/StdAfx.cpp
index ad64bb0652..287357e7a4 100644
--- a/protocols/Sametime/src/StdAfx.cpp
+++ b/protocols/Sametime/src/StdAfx.cpp
@@ -1,4 +1,4 @@
-// stdafx.cpp : source file that includes just the standard includes
+// stdafx.cpp : source file that includes just the standard includes
// sametime.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
diff --git a/protocols/Sametime/src/StdAfx.h b/protocols/Sametime/src/StdAfx.h
index 5a19f18e2b..3eae2826f9 100644
--- a/protocols/Sametime/src/StdAfx.h
+++ b/protocols/Sametime/src/StdAfx.h
@@ -1,4 +1,4 @@
-// stdafx.h : include file for standard system include files,
+// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
//
diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp
index 0b75094638..c79baf20cb 100644
--- a/protocols/Sametime/src/conference.cpp
+++ b/protocols/Sametime/src/conference.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
void CloseMyConference(CSametimeProto* proto)
diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp
index 26d0dbab5f..6d4813dbca 100644
--- a/protocols/Sametime/src/files.cpp
+++ b/protocols/Sametime/src/files.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
CSametimeProto* getProtoFromMwFileTransfer(mwFileTransfer* ft)
diff --git a/protocols/Sametime/src/glib/CMakeLists.txt b/protocols/Sametime/src/glib/CMakeLists.txt
index 0a2032bcac..3c18c15003 100644
--- a/protocols/Sametime/src/glib/CMakeLists.txt
+++ b/protocols/Sametime/src/glib/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET glib)
+set(TARGET glib)
add_library(${TARGET}
"garray.c"
"gasyncqueue.c"
diff --git a/protocols/Sametime/src/glib/config.h b/protocols/Sametime/src/glib/config.h
index c0b5781f27..1fb52d66d7 100644
--- a/protocols/Sametime/src/glib/config.h
+++ b/protocols/Sametime/src/glib/config.h
@@ -1,4 +1,4 @@
-/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */
+/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
diff --git a/protocols/Sametime/src/glib/dirent.c b/protocols/Sametime/src/glib/dirent.c
index 389bf83a0e..26b6cb1e54 100644
--- a/protocols/Sametime/src/glib/dirent.c
+++ b/protocols/Sametime/src/glib/dirent.c
@@ -1,4 +1,4 @@
-/*
+/*
* dirent.c
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
diff --git a/protocols/Sametime/src/glib/dirent.h b/protocols/Sametime/src/glib/dirent.h
index ea6e096d51..237665b4ed 100644
--- a/protocols/Sametime/src/glib/dirent.h
+++ b/protocols/Sametime/src/glib/dirent.h
@@ -1,4 +1,4 @@
-/*
+/*
* DIRENT.H (formerly DIRLIB.H)
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
diff --git a/protocols/Sametime/src/glib/galloca.h b/protocols/Sametime/src/glib/galloca.h
index 748846b59b..8876836a6f 100644
--- a/protocols/Sametime/src/glib/galloca.h
+++ b/protocols/Sametime/src/glib/galloca.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/garray.c b/protocols/Sametime/src/glib/garray.c
index c22e77ff09..ac9a354b77 100644
--- a/protocols/Sametime/src/glib/garray.c
+++ b/protocols/Sametime/src/glib/garray.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/garray.h b/protocols/Sametime/src/glib/garray.h
index f5305a1b97..6bc51f797e 100644
--- a/protocols/Sametime/src/glib/garray.h
+++ b/protocols/Sametime/src/glib/garray.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gasyncqueue.c b/protocols/Sametime/src/glib/gasyncqueue.c
index 74ddbc2569..97672e71f5 100644
--- a/protocols/Sametime/src/glib/gasyncqueue.c
+++ b/protocols/Sametime/src/glib/gasyncqueue.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* GAsyncQueue: asynchronous queue implementation, based on Gqueue.
diff --git a/protocols/Sametime/src/glib/gasyncqueue.h b/protocols/Sametime/src/glib/gasyncqueue.h
index 2e4ce85ce4..9da43e36da 100644
--- a/protocols/Sametime/src/glib/gasyncqueue.h
+++ b/protocols/Sametime/src/glib/gasyncqueue.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gatomic-gcc.c b/protocols/Sametime/src/glib/gatomic-gcc.c
index 3ed534e30e..9f28ceecaf 100644
--- a/protocols/Sametime/src/glib/gatomic-gcc.c
+++ b/protocols/Sametime/src/glib/gatomic-gcc.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* gatomic-gcc.c: atomic operations using GCC builtins.
* Copyright (C) 2009 Hiroyuki Ikezoe
*
diff --git a/protocols/Sametime/src/glib/gatomic.c b/protocols/Sametime/src/glib/gatomic.c
index 0275774133..845c866865 100644
--- a/protocols/Sametime/src/glib/gatomic.c
+++ b/protocols/Sametime/src/glib/gatomic.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* g_atomic_*: atomic operations.
diff --git a/protocols/Sametime/src/glib/gatomic.h b/protocols/Sametime/src/glib/gatomic.h
index 9c3b756c8c..ddd39b8a3a 100644
--- a/protocols/Sametime/src/glib/gatomic.h
+++ b/protocols/Sametime/src/glib/gatomic.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* g_atomic_*: atomic operations.
diff --git a/protocols/Sametime/src/glib/gbacktrace.c b/protocols/Sametime/src/glib/gbacktrace.c
index eb460e8ae5..ae16ef8699 100644
--- a/protocols/Sametime/src/glib/gbacktrace.c
+++ b/protocols/Sametime/src/glib/gbacktrace.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gbacktrace.h b/protocols/Sametime/src/glib/gbacktrace.h
index 737eebcf78..43a0c46a21 100644
--- a/protocols/Sametime/src/glib/gbacktrace.h
+++ b/protocols/Sametime/src/glib/gbacktrace.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gbase64.c b/protocols/Sametime/src/glib/gbase64.c
index b2e06f8c20..8a492de363 100644
--- a/protocols/Sametime/src/glib/gbase64.c
+++ b/protocols/Sametime/src/glib/gbase64.c
@@ -1,4 +1,4 @@
-/* gbase64.c - Base64 encoding/decoding
+/* gbase64.c - Base64 encoding/decoding
*
* Copyright (C) 2006 Alexander Larsson <alexl@redhat.com>
* Copyright (C) 2000-2003 Ximian Inc.
diff --git a/protocols/Sametime/src/glib/gbase64.h b/protocols/Sametime/src/glib/gbase64.h
index d8bf37a885..930389a674 100644
--- a/protocols/Sametime/src/glib/gbase64.h
+++ b/protocols/Sametime/src/glib/gbase64.h
@@ -1,4 +1,4 @@
-/* gbase64.h - Base64 coding functions
+/* gbase64.h - Base64 coding functions
*
* Copyright (C) 2005 Alexander Larsson <alexl@redhat.com>
*
diff --git a/protocols/Sametime/src/glib/gbitlock.c b/protocols/Sametime/src/glib/gbitlock.c
index 180a4c3d64..1b8c41733c 100644
--- a/protocols/Sametime/src/glib/gbitlock.c
+++ b/protocols/Sametime/src/glib/gbitlock.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gbitlock.h b/protocols/Sametime/src/glib/gbitlock.h
index aa600a7fd1..5f6a67fd84 100644
--- a/protocols/Sametime/src/glib/gbitlock.h
+++ b/protocols/Sametime/src/glib/gbitlock.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gbookmarkfile.c b/protocols/Sametime/src/glib/gbookmarkfile.c
index 6f73a84800..db2a8bcb1f 100644
--- a/protocols/Sametime/src/glib/gbookmarkfile.c
+++ b/protocols/Sametime/src/glib/gbookmarkfile.c
@@ -1,4 +1,4 @@
-/* gbookmarkfile.c: parsing and building desktop bookmarks
+/* gbookmarkfile.c: parsing and building desktop bookmarks
*
* Copyright (C) 2005-2006 Emmanuele Bassi
*
diff --git a/protocols/Sametime/src/glib/gbookmarkfile.h b/protocols/Sametime/src/glib/gbookmarkfile.h
index ae0e4e6358..f663ebf27f 100644
--- a/protocols/Sametime/src/glib/gbookmarkfile.h
+++ b/protocols/Sametime/src/glib/gbookmarkfile.h
@@ -1,4 +1,4 @@
-/* gbookmarkfile.h: parsing and building desktop bookmarks
+/* gbookmarkfile.h: parsing and building desktop bookmarks
*
* Copyright (C) 2005-2006 Emmanuele Bassi
*
diff --git a/protocols/Sametime/src/glib/gbsearcharray.h b/protocols/Sametime/src/glib/gbsearcharray.h
index 70b5e4b112..1ad893c4ac 100644
--- a/protocols/Sametime/src/glib/gbsearcharray.h
+++ b/protocols/Sametime/src/glib/gbsearcharray.h
@@ -1,4 +1,4 @@
-/* GBSearchArray - Binary Searchable Array implementation
+/* GBSearchArray - Binary Searchable Array implementation
* Copyright (C) 2000-2003 Tim Janik
*
* This software is provided "as is"; redistribution and modification
diff --git a/protocols/Sametime/src/glib/gbuffer.c b/protocols/Sametime/src/glib/gbuffer.c
index 9c52dd8a8b..f7e30441cf 100644
--- a/protocols/Sametime/src/glib/gbuffer.c
+++ b/protocols/Sametime/src/glib/gbuffer.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2009, 2010 Codethink Limited
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gbuffer.h b/protocols/Sametime/src/glib/gbuffer.h
index cd7fd85a02..6bb29b73c8 100644
--- a/protocols/Sametime/src/glib/gbuffer.h
+++ b/protocols/Sametime/src/glib/gbuffer.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2009, 2010 Codethink Limited
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gcache.c b/protocols/Sametime/src/glib/gcache.c
index 1b2533eb44..6a6163cd6d 100644
--- a/protocols/Sametime/src/glib/gcache.c
+++ b/protocols/Sametime/src/glib/gcache.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gcache.h b/protocols/Sametime/src/glib/gcache.h
index 782644bfd7..7d60d5888c 100644
--- a/protocols/Sametime/src/glib/gcache.h
+++ b/protocols/Sametime/src/glib/gcache.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gchecksum.c b/protocols/Sametime/src/glib/gchecksum.c
index 633127a363..b0d10c1ad2 100644
--- a/protocols/Sametime/src/glib/gchecksum.c
+++ b/protocols/Sametime/src/glib/gchecksum.c
@@ -1,4 +1,4 @@
-/* gchecksum.h - data hashing functions
+/* gchecksum.h - data hashing functions
*
* Copyright (C) 2007 Emmanuele Bassi <ebassi@gnome.org>
*
diff --git a/protocols/Sametime/src/glib/gchecksum.h b/protocols/Sametime/src/glib/gchecksum.h
index 72fa52a926..57aea103f7 100644
--- a/protocols/Sametime/src/glib/gchecksum.h
+++ b/protocols/Sametime/src/glib/gchecksum.h
@@ -1,4 +1,4 @@
-/* gchecksum.h - data hashing functions
+/* gchecksum.h - data hashing functions
*
* Copyright (C) 2007 Emmanuele Bassi <ebassi@gnome.org>
*
diff --git a/protocols/Sametime/src/glib/gcompletion.c b/protocols/Sametime/src/glib/gcompletion.c
index 26caed1b9e..710e6c0662 100644
--- a/protocols/Sametime/src/glib/gcompletion.c
+++ b/protocols/Sametime/src/glib/gcompletion.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gcompletion.h b/protocols/Sametime/src/glib/gcompletion.h
index 03056d2595..04c024fc5a 100644
--- a/protocols/Sametime/src/glib/gcompletion.h
+++ b/protocols/Sametime/src/glib/gcompletion.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gconvert.c b/protocols/Sametime/src/glib/gconvert.c
index 9e493d424d..52a3dd8617 100644
--- a/protocols/Sametime/src/glib/gconvert.c
+++ b/protocols/Sametime/src/glib/gconvert.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
*
* gconvert.c: Convert between character sets using iconv
* Copyright Red Hat Inc., 2000
diff --git a/protocols/Sametime/src/glib/gconvert.h b/protocols/Sametime/src/glib/gconvert.h
index 342305126e..e4c20d77d5 100644
--- a/protocols/Sametime/src/glib/gconvert.h
+++ b/protocols/Sametime/src/glib/gconvert.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gdataset.c b/protocols/Sametime/src/glib/gdataset.c
index 59d0709f27..cd3a51eac6 100644
--- a/protocols/Sametime/src/glib/gdataset.c
+++ b/protocols/Sametime/src/glib/gdataset.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* gdataset.c: Generic dataset mechanism, similar to GtkObject data.
diff --git a/protocols/Sametime/src/glib/gdataset.h b/protocols/Sametime/src/glib/gdataset.h
index b5c168378d..2733ffb033 100644
--- a/protocols/Sametime/src/glib/gdataset.h
+++ b/protocols/Sametime/src/glib/gdataset.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gdatasetprivate.h b/protocols/Sametime/src/glib/gdatasetprivate.h
index 5ae561bfd9..80d0ccf8f0 100644
--- a/protocols/Sametime/src/glib/gdatasetprivate.h
+++ b/protocols/Sametime/src/glib/gdatasetprivate.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* gdataset-private.h: Internal macros for accessing dataset values
* Copyright (C) 2005 Red Hat
*
diff --git a/protocols/Sametime/src/glib/gdate.c b/protocols/Sametime/src/glib/gdate.c
index d600bbf6c8..2fab2f27f3 100644
--- a/protocols/Sametime/src/glib/gdate.c
+++ b/protocols/Sametime/src/glib/gdate.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gdate.h b/protocols/Sametime/src/glib/gdate.h
index d6c2cf964c..cb1f566155 100644
--- a/protocols/Sametime/src/glib/gdate.h
+++ b/protocols/Sametime/src/glib/gdate.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gdatetime.c b/protocols/Sametime/src/glib/gdatetime.c
index 16cff592b1..7df91180c2 100644
--- a/protocols/Sametime/src/glib/gdatetime.c
+++ b/protocols/Sametime/src/glib/gdatetime.c
@@ -1,4 +1,4 @@
-/* gdatetime.c
+/* gdatetime.c
*
* Copyright (C) 2009-2010 Christian Hergert <chris@dronelabs.com>
* Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
diff --git a/protocols/Sametime/src/glib/gdatetime.h b/protocols/Sametime/src/glib/gdatetime.h
index e69fb0d91b..b76df89c7e 100644
--- a/protocols/Sametime/src/glib/gdatetime.h
+++ b/protocols/Sametime/src/glib/gdatetime.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2009-2010 Christian Hergert <chris@dronelabs.com>
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gdebug.h b/protocols/Sametime/src/glib/gdebug.h
index ab368b6a0c..dea3dde7da 100644
--- a/protocols/Sametime/src/glib/gdebug.h
+++ b/protocols/Sametime/src/glib/gdebug.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gdir.c b/protocols/Sametime/src/glib/gdir.c
index 99c4132119..6aab68b77b 100644
--- a/protocols/Sametime/src/glib/gdir.c
+++ b/protocols/Sametime/src/glib/gdir.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* gdir.c: Simplified wrapper around the DIRENT functions.
diff --git a/protocols/Sametime/src/glib/gdir.h b/protocols/Sametime/src/glib/gdir.h
index 3654b042b2..85e989695a 100644
--- a/protocols/Sametime/src/glib/gdir.h
+++ b/protocols/Sametime/src/glib/gdir.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* gdir.c: Simplified wrapper around the DIRENT functions.
diff --git a/protocols/Sametime/src/glib/gerror.c b/protocols/Sametime/src/glib/gerror.c
index b0e0546108..1f39739100 100644
--- a/protocols/Sametime/src/glib/gerror.c
+++ b/protocols/Sametime/src/glib/gerror.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gerror.h b/protocols/Sametime/src/glib/gerror.h
index a773344c47..b303487782 100644
--- a/protocols/Sametime/src/glib/gerror.h
+++ b/protocols/Sametime/src/glib/gerror.h
@@ -1,4 +1,4 @@
-/* gerror.h - Error reporting system
+/* gerror.h - Error reporting system
*
* Copyright 2000 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gfileutils.c b/protocols/Sametime/src/glib/gfileutils.c
index 616acdf21e..6965cbf020 100644
--- a/protocols/Sametime/src/glib/gfileutils.c
+++ b/protocols/Sametime/src/glib/gfileutils.c
@@ -1,4 +1,4 @@
-/* gfileutils.c - File utility functions
+/* gfileutils.c - File utility functions
*
* Copyright 2000 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gfileutils.h b/protocols/Sametime/src/glib/gfileutils.h
index fa1dec6a9f..d8f9d3bea1 100644
--- a/protocols/Sametime/src/glib/gfileutils.h
+++ b/protocols/Sametime/src/glib/gfileutils.h
@@ -1,4 +1,4 @@
-/* gfileutils.h - File utility functions
+/* gfileutils.h - File utility functions
*
* Copyright 2000 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/ghash.c b/protocols/Sametime/src/glib/ghash.c
index ea74e3c666..5f2df05bde 100644
--- a/protocols/Sametime/src/glib/ghash.c
+++ b/protocols/Sametime/src/glib/ghash.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/ghash.h b/protocols/Sametime/src/glib/ghash.h
index 522017e36e..9128721bcf 100644
--- a/protocols/Sametime/src/glib/ghash.h
+++ b/protocols/Sametime/src/glib/ghash.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/ghook.c b/protocols/Sametime/src/glib/ghook.c
index b8b1804901..1406b58039 100644
--- a/protocols/Sametime/src/glib/ghook.c
+++ b/protocols/Sametime/src/glib/ghook.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* GHook: Callback maintenance functions
diff --git a/protocols/Sametime/src/glib/ghook.h b/protocols/Sametime/src/glib/ghook.h
index c2fbe5370d..5577fc3e21 100644
--- a/protocols/Sametime/src/glib/ghook.h
+++ b/protocols/Sametime/src/glib/ghook.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/ghostutils.c b/protocols/Sametime/src/glib/ghostutils.c
index d51a5ee3f6..c0361958f4 100644
--- a/protocols/Sametime/src/glib/ghostutils.c
+++ b/protocols/Sametime/src/glib/ghostutils.c
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* GLIB - Library of useful routines for C programming
* Copyright (C) 2008 Red Hat, Inc.
diff --git a/protocols/Sametime/src/glib/ghostutils.h b/protocols/Sametime/src/glib/ghostutils.h
index 7da9fb2757..0349da364b 100644
--- a/protocols/Sametime/src/glib/ghostutils.h
+++ b/protocols/Sametime/src/glib/ghostutils.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 2008 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gi18n-lib.h b/protocols/Sametime/src/glib/gi18n-lib.h
index 0468bcf62c..ca002a7221 100644
--- a/protocols/Sametime/src/glib/gi18n-lib.h
+++ b/protocols/Sametime/src/glib/gi18n-lib.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997, 2002 Peter Mattis, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gi18n.h b/protocols/Sametime/src/glib/gi18n.h
index 34ba4971ef..c710046ee7 100644
--- a/protocols/Sametime/src/glib/gi18n.h
+++ b/protocols/Sametime/src/glib/gi18n.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997, 2002 Peter Mattis, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/giochannel.c b/protocols/Sametime/src/glib/giochannel.c
index 485cd230c1..e70e40a5ed 100644
--- a/protocols/Sametime/src/glib/giochannel.c
+++ b/protocols/Sametime/src/glib/giochannel.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* giochannel.c: IO Channel abstraction
diff --git a/protocols/Sametime/src/glib/giochannel.h b/protocols/Sametime/src/glib/giochannel.h
index c1f46ba20a..2a40aa29ae 100644
--- a/protocols/Sametime/src/glib/giochannel.h
+++ b/protocols/Sametime/src/glib/giochannel.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/giounix.c b/protocols/Sametime/src/glib/giounix.c
index 366636b07c..72a3ed4df6 100644
--- a/protocols/Sametime/src/glib/giounix.c
+++ b/protocols/Sametime/src/glib/giounix.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* giounix.c: IO Channels using unix file descriptors
diff --git a/protocols/Sametime/src/glib/giowin32.c b/protocols/Sametime/src/glib/giowin32.c
index 5c36cd52f0..3a0b92655e 100644
--- a/protocols/Sametime/src/glib/giowin32.c
+++ b/protocols/Sametime/src/glib/giowin32.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* giowin32.c: IO Channels for Win32.
diff --git a/protocols/Sametime/src/glib/gkeyfile.c b/protocols/Sametime/src/glib/gkeyfile.c
index eb9ef80f1c..fa20c5a8b4 100644
--- a/protocols/Sametime/src/glib/gkeyfile.c
+++ b/protocols/Sametime/src/glib/gkeyfile.c
@@ -1,4 +1,4 @@
-/* gkeyfile.c - key file parser
+/* gkeyfile.c - key file parser
*
* Copyright 2004 Red Hat, Inc.
* Copyright 2009-2010 Collabora Ltd.
diff --git a/protocols/Sametime/src/glib/gkeyfile.h b/protocols/Sametime/src/glib/gkeyfile.h
index a247b788b9..e16dc61272 100644
--- a/protocols/Sametime/src/glib/gkeyfile.h
+++ b/protocols/Sametime/src/glib/gkeyfile.h
@@ -1,4 +1,4 @@
-/* gkeyfile.h - desktop entry file parser
+/* gkeyfile.h - desktop entry file parser
*
* Copyright 2004 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/glib-object.h b/protocols/Sametime/src/glib/glib-object.h
index 44a1339e5e..10cff1b0ea 100644
--- a/protocols/Sametime/src/glib/glib-object.h
+++ b/protocols/Sametime/src/glib/glib-object.h
@@ -1,4 +1,4 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
+/* GObject - GLib Type, Object, Parameter and Signal Library
* Copyright (C) 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/glib.h b/protocols/Sametime/src/glib/glib.h
index 4928c73458..06d0190b24 100644
--- a/protocols/Sametime/src/glib/glib.h
+++ b/protocols/Sametime/src/glib/glib.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/glib_trace.h b/protocols/Sametime/src/glib/glib_trace.h
index 4754189b0a..789e88d694 100644
--- a/protocols/Sametime/src/glib/glib_trace.h
+++ b/protocols/Sametime/src/glib/glib_trace.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
*
* Copyright (C) 2009,2010 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/glibconfig.h b/protocols/Sametime/src/glib/glibconfig.h
index 035080b426..2fa4af628f 100644
--- a/protocols/Sametime/src/glib/glibconfig.h
+++ b/protocols/Sametime/src/glib/glibconfig.h
@@ -1,4 +1,4 @@
-/* glibconfig.h.win32.in. Originally merged from two versions of
+/* glibconfig.h.win32.in. Originally merged from two versions of
* glibconfig.h, generated by the GLib configure script, for gcc and
* MSVC.
*/
diff --git a/protocols/Sametime/src/glib/glibintl.h b/protocols/Sametime/src/glib/glibintl.h
index eef1461eb9..6d79a268e7 100644
--- a/protocols/Sametime/src/glib/glibintl.h
+++ b/protocols/Sametime/src/glib/glibintl.h
@@ -1,4 +1,4 @@
-#ifndef __GLIBINTL_H__
+#ifndef __GLIBINTL_H__
#define __GLIBINTL_H__
#ifndef SIZEOF_CHAR
diff --git a/protocols/Sametime/src/glib/glist.c b/protocols/Sametime/src/glib/glist.c
index e8be8ce2e4..c8f7434637 100644
--- a/protocols/Sametime/src/glib/glist.c
+++ b/protocols/Sametime/src/glib/glist.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/glist.h b/protocols/Sametime/src/glib/glist.h
index 6ce659b997..e74ed96f15 100644
--- a/protocols/Sametime/src/glib/glist.h
+++ b/protocols/Sametime/src/glib/glist.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gmacros.h b/protocols/Sametime/src/glib/gmacros.h
index 06f9f2976f..9f9c25dcb1 100644
--- a/protocols/Sametime/src/glib/gmacros.h
+++ b/protocols/Sametime/src/glib/gmacros.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gmain.c b/protocols/Sametime/src/glib/gmain.c
index 9dd24e19fc..5bba96d60d 100644
--- a/protocols/Sametime/src/glib/gmain.c
+++ b/protocols/Sametime/src/glib/gmain.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* gmain.c: Main loop abstraction, timeouts, and idle functions
diff --git a/protocols/Sametime/src/glib/gmain.h b/protocols/Sametime/src/glib/gmain.h
index 50e47fefe0..24c6171fe6 100644
--- a/protocols/Sametime/src/glib/gmain.h
+++ b/protocols/Sametime/src/glib/gmain.h
@@ -1,4 +1,4 @@
-/* gmain.h - the GLib Main loop
+/* gmain.h - the GLib Main loop
* Copyright (C) 1998-2000 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gmappedfile.c b/protocols/Sametime/src/glib/gmappedfile.c
index 766f2e68b7..540ae5d91f 100644
--- a/protocols/Sametime/src/glib/gmappedfile.c
+++ b/protocols/Sametime/src/glib/gmappedfile.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* gmappedfile.c: Simplified wrapper around the mmap() function.
*
* Copyright 2005 Matthias Clasen
diff --git a/protocols/Sametime/src/glib/gmappedfile.h b/protocols/Sametime/src/glib/gmappedfile.h
index 6fbbd9ff83..dbb3f89e6a 100644
--- a/protocols/Sametime/src/glib/gmappedfile.h
+++ b/protocols/Sametime/src/glib/gmappedfile.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* gmappedfile.h: Simplified wrapper around the mmap function
*
* Copyright 2005 Matthias Clasen
diff --git a/protocols/Sametime/src/glib/gmarkup.c b/protocols/Sametime/src/glib/gmarkup.c
index c1f03b60c7..1ad1ba8b2f 100644
--- a/protocols/Sametime/src/glib/gmarkup.c
+++ b/protocols/Sametime/src/glib/gmarkup.c
@@ -1,4 +1,4 @@
-/* gmarkup.c - Simple XML-like parser
+/* gmarkup.c - Simple XML-like parser
*
* Copyright 2000, 2003 Red Hat, Inc.
* Copyright 2007, 2008 Ryan Lortie <desrt@desrt.ca>
diff --git a/protocols/Sametime/src/glib/gmarkup.h b/protocols/Sametime/src/glib/gmarkup.h
index a96c68dcd7..7bfc08641c 100644
--- a/protocols/Sametime/src/glib/gmarkup.h
+++ b/protocols/Sametime/src/glib/gmarkup.h
@@ -1,4 +1,4 @@
-/* gmarkup.h - Simple XML-like string parser/writer
+/* gmarkup.h - Simple XML-like string parser/writer
*
* Copyright 2000 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gmem.c b/protocols/Sametime/src/glib/gmem.c
index b4728d7aa5..7212ae49db 100644
--- a/protocols/Sametime/src/glib/gmem.c
+++ b/protocols/Sametime/src/glib/gmem.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gmem.h b/protocols/Sametime/src/glib/gmem.h
index 22d6833bdd..01d953e6c5 100644
--- a/protocols/Sametime/src/glib/gmem.h
+++ b/protocols/Sametime/src/glib/gmem.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gmessages.c b/protocols/Sametime/src/glib/gmessages.c
index 6e633121b9..f9592ba1a1 100644
--- a/protocols/Sametime/src/glib/gmessages.c
+++ b/protocols/Sametime/src/glib/gmessages.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gmessages.h b/protocols/Sametime/src/glib/gmessages.h
index 33dcbbd4f2..9acaec6375 100644
--- a/protocols/Sametime/src/glib/gmessages.h
+++ b/protocols/Sametime/src/glib/gmessages.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gmirroringtable.h b/protocols/Sametime/src/glib/gmirroringtable.h
index b3f32b019c..dd8f18a7ce 100644
--- a/protocols/Sametime/src/glib/gmirroringtable.h
+++ b/protocols/Sametime/src/glib/gmirroringtable.h
@@ -1,4 +1,4 @@
-/* gmirroringtable.h
+/* gmirroringtable.h
* generated by gen-mirroring-tab
* from the file BidiMirroring.txt of */
diff --git a/protocols/Sametime/src/glib/gnode.c b/protocols/Sametime/src/glib/gnode.c
index f592544d76..22d19379c7 100644
--- a/protocols/Sametime/src/glib/gnode.c
+++ b/protocols/Sametime/src/glib/gnode.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* GNode: N-way tree implementation.
diff --git a/protocols/Sametime/src/glib/gnode.h b/protocols/Sametime/src/glib/gnode.h
index 993d154230..205d47c763 100644
--- a/protocols/Sametime/src/glib/gnode.h
+++ b/protocols/Sametime/src/glib/gnode.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gnulib/asnprintf.c b/protocols/Sametime/src/glib/gnulib/asnprintf.c
index eec651b84b..765d98ce57 100644
--- a/protocols/Sametime/src/glib/gnulib/asnprintf.c
+++ b/protocols/Sametime/src/glib/gnulib/asnprintf.c
@@ -1,4 +1,4 @@
-/* Formatted output to strings.
+/* Formatted output to strings.
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/protocols/Sametime/src/glib/gnulib/g-gnulib.h b/protocols/Sametime/src/glib/gnulib/g-gnulib.h
index cb3dce02ea..88f3e0eb11 100644
--- a/protocols/Sametime/src/glib/gnulib/g-gnulib.h
+++ b/protocols/Sametime/src/glib/gnulib/g-gnulib.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 2003 Matthias Clasen
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gnulib/printf-args.c b/protocols/Sametime/src/glib/gnulib/printf-args.c
index 47cacc4402..75a2a5497f 100644
--- a/protocols/Sametime/src/glib/gnulib/printf-args.c
+++ b/protocols/Sametime/src/glib/gnulib/printf-args.c
@@ -1,4 +1,4 @@
-/* Decomposed printf argument list.
+/* Decomposed printf argument list.
Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/protocols/Sametime/src/glib/gnulib/printf-args.h b/protocols/Sametime/src/glib/gnulib/printf-args.h
index 7b6a0acbe7..082567568a 100644
--- a/protocols/Sametime/src/glib/gnulib/printf-args.h
+++ b/protocols/Sametime/src/glib/gnulib/printf-args.h
@@ -1,4 +1,4 @@
-/* Decomposed printf argument list.
+/* Decomposed printf argument list.
Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/protocols/Sametime/src/glib/gnulib/printf-parse.c b/protocols/Sametime/src/glib/gnulib/printf-parse.c
index 153e81cab5..961b0816d5 100644
--- a/protocols/Sametime/src/glib/gnulib/printf-parse.c
+++ b/protocols/Sametime/src/glib/gnulib/printf-parse.c
@@ -1,4 +1,4 @@
-/* Formatted output to strings.
+/* Formatted output to strings.
Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/protocols/Sametime/src/glib/gnulib/printf-parse.h b/protocols/Sametime/src/glib/gnulib/printf-parse.h
index 6e3fc3ae1d..ab414782dc 100644
--- a/protocols/Sametime/src/glib/gnulib/printf-parse.h
+++ b/protocols/Sametime/src/glib/gnulib/printf-parse.h
@@ -1,4 +1,4 @@
-/* Parse printf format string.
+/* Parse printf format string.
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/protocols/Sametime/src/glib/gnulib/printf.c b/protocols/Sametime/src/glib/gnulib/printf.c
index f273d0a9cc..b3392999f7 100644
--- a/protocols/Sametime/src/glib/gnulib/printf.c
+++ b/protocols/Sametime/src/glib/gnulib/printf.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 2003 Matthias Clasen
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gnulib/printf.h b/protocols/Sametime/src/glib/gnulib/printf.h
index e67599aa21..a7be56f488 100644
--- a/protocols/Sametime/src/glib/gnulib/printf.h
+++ b/protocols/Sametime/src/glib/gnulib/printf.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 2003 Matthias Clasen
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gnulib/vasnprintf.c b/protocols/Sametime/src/glib/gnulib/vasnprintf.c
index 07b279d629..d37027a670 100644
--- a/protocols/Sametime/src/glib/gnulib/vasnprintf.c
+++ b/protocols/Sametime/src/glib/gnulib/vasnprintf.c
@@ -1,4 +1,4 @@
-/* vsprintf with automatic memory allocation.
+/* vsprintf with automatic memory allocation.
Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/protocols/Sametime/src/glib/gnulib/vasnprintf.h b/protocols/Sametime/src/glib/gnulib/vasnprintf.h
index f2f4209770..65f1bc13dd 100644
--- a/protocols/Sametime/src/glib/gnulib/vasnprintf.h
+++ b/protocols/Sametime/src/glib/gnulib/vasnprintf.h
@@ -1,4 +1,4 @@
-/* vsprintf with automatic memory allocation.
+/* vsprintf with automatic memory allocation.
Copyright (C) 2002-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
diff --git a/protocols/Sametime/src/glib/goption.c b/protocols/Sametime/src/glib/goption.c
index 48d94584f9..f09c7e1570 100644
--- a/protocols/Sametime/src/glib/goption.c
+++ b/protocols/Sametime/src/glib/goption.c
@@ -1,4 +1,4 @@
-/* goption.c - Option parser
+/* goption.c - Option parser
*
* Copyright (C) 1999, 2003 Red Hat Software
* Copyright (C) 2004 Anders Carlsson <andersca@gnome.org>
diff --git a/protocols/Sametime/src/glib/goption.h b/protocols/Sametime/src/glib/goption.h
index 3d4714b585..557d8f7130 100644
--- a/protocols/Sametime/src/glib/goption.h
+++ b/protocols/Sametime/src/glib/goption.h
@@ -1,4 +1,4 @@
-/* goption.h - Option parser
+/* goption.h - Option parser
*
* Copyright (C) 2004 Anders Carlsson <andersca@gnome.org>
*
diff --git a/protocols/Sametime/src/glib/gpattern.c b/protocols/Sametime/src/glib/gpattern.c
index e1aac6bb8c..1c37e98e6f 100644
--- a/protocols/Sametime/src/glib/gpattern.c
+++ b/protocols/Sametime/src/glib/gpattern.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997, 1999 Peter Mattis, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gpattern.h b/protocols/Sametime/src/glib/gpattern.h
index d348892930..b653d713f0 100644
--- a/protocols/Sametime/src/glib/gpattern.h
+++ b/protocols/Sametime/src/glib/gpattern.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997, 1999 Peter Mattis, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gpoll.c b/protocols/Sametime/src/glib/gpoll.c
index 6e7eeb339a..e9410c7ded 100644
--- a/protocols/Sametime/src/glib/gpoll.c
+++ b/protocols/Sametime/src/glib/gpoll.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* gpoll.c: poll(2) abstraction
diff --git a/protocols/Sametime/src/glib/gpoll.h b/protocols/Sametime/src/glib/gpoll.h
index 399674d128..cc79381a69 100644
--- a/protocols/Sametime/src/glib/gpoll.h
+++ b/protocols/Sametime/src/glib/gpoll.h
@@ -1,4 +1,4 @@
-/* gpoll.h - poll(2) support
+/* gpoll.h - poll(2) support
* Copyright (C) 2008 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gprimes.c b/protocols/Sametime/src/glib/gprimes.c
index 4e8e62cc07..6698c5606a 100644
--- a/protocols/Sametime/src/glib/gprimes.c
+++ b/protocols/Sametime/src/glib/gprimes.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gprimes.h b/protocols/Sametime/src/glib/gprimes.h
index c78b3484dd..af5728602b 100644
--- a/protocols/Sametime/src/glib/gprimes.h
+++ b/protocols/Sametime/src/glib/gprimes.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gprintf.c b/protocols/Sametime/src/glib/gprintf.c
index 175b7a25d4..7ef15d3d8d 100644
--- a/protocols/Sametime/src/glib/gprintf.c
+++ b/protocols/Sametime/src/glib/gprintf.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997, 2002 Peter Mattis, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gprintf.h b/protocols/Sametime/src/glib/gprintf.h
index fcb977883e..d96870fb44 100644
--- a/protocols/Sametime/src/glib/gprintf.h
+++ b/protocols/Sametime/src/glib/gprintf.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997, 2002 Peter Mattis, Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gprintfint.h b/protocols/Sametime/src/glib/gprintfint.h
index cabb0f0aa3..0c975a1eed 100644
--- a/protocols/Sametime/src/glib/gprintfint.h
+++ b/protocols/Sametime/src/glib/gprintfint.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gqsort.c b/protocols/Sametime/src/glib/gqsort.c
index d6549c7c85..25508167f9 100644
--- a/protocols/Sametime/src/glib/gqsort.c
+++ b/protocols/Sametime/src/glib/gqsort.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1991, 1992, 1996, 1997,1999,2004 Free Software Foundation, Inc.
* Copyright (C) 2000 Eazel, Inc.
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
diff --git a/protocols/Sametime/src/glib/gqsort.h b/protocols/Sametime/src/glib/gqsort.h
index 626d2619c1..3a47a584ee 100644
--- a/protocols/Sametime/src/glib/gqsort.h
+++ b/protocols/Sametime/src/glib/gqsort.h
@@ -1,4 +1,4 @@
- /* GLIB - Library of useful routines for C programming
+ /* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gquark.h b/protocols/Sametime/src/glib/gquark.h
index f40fced7bc..a0cbe2fd72 100644
--- a/protocols/Sametime/src/glib/gquark.h
+++ b/protocols/Sametime/src/glib/gquark.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gqueue.c b/protocols/Sametime/src/glib/gqueue.c
index ac08f75fae..5e5535e902 100644
--- a/protocols/Sametime/src/glib/gqueue.c
+++ b/protocols/Sametime/src/glib/gqueue.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* GQueue: Double ended queue implementation, piggy backed on GList.
diff --git a/protocols/Sametime/src/glib/gqueue.h b/protocols/Sametime/src/glib/gqueue.h
index b3ac702584..e78488fb65 100644
--- a/protocols/Sametime/src/glib/gqueue.h
+++ b/protocols/Sametime/src/glib/gqueue.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/grand.c b/protocols/Sametime/src/glib/grand.c
index 68acc24cf8..c00d70868d 100644
--- a/protocols/Sametime/src/glib/grand.c
+++ b/protocols/Sametime/src/glib/grand.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/grand.h b/protocols/Sametime/src/glib/grand.h
index 156558337b..07907dfc17 100644
--- a/protocols/Sametime/src/glib/grand.h
+++ b/protocols/Sametime/src/glib/grand.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gregex.c b/protocols/Sametime/src/glib/gregex.c
index 1dc738d6fc..45f24fec97 100644
--- a/protocols/Sametime/src/glib/gregex.c
+++ b/protocols/Sametime/src/glib/gregex.c
@@ -1,4 +1,4 @@
-/* GRegex -- regular expression API wrapper around PCRE.
+/* GRegex -- regular expression API wrapper around PCRE.
*
* Copyright (C) 1999, 2000 Scott Wimer
* Copyright (C) 2004, Matthias Clasen <mclasen@redhat.com>
diff --git a/protocols/Sametime/src/glib/gregex.h b/protocols/Sametime/src/glib/gregex.h
index 3f5fb9b82a..ce1b44a972 100644
--- a/protocols/Sametime/src/glib/gregex.h
+++ b/protocols/Sametime/src/glib/gregex.h
@@ -1,4 +1,4 @@
-/* GRegex -- regular expression API wrapper around PCRE.
+/* GRegex -- regular expression API wrapper around PCRE.
*
* Copyright (C) 1999, 2000 Scott Wimer
* Copyright (C) 2004, Matthias Clasen <mclasen@redhat.com>
diff --git a/protocols/Sametime/src/glib/grel.c b/protocols/Sametime/src/glib/grel.c
index 3b9ee0a28c..59d5bbbfc4 100644
--- a/protocols/Sametime/src/glib/grel.c
+++ b/protocols/Sametime/src/glib/grel.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/grel.h b/protocols/Sametime/src/glib/grel.h
index 82ce91afb3..5cb8d09d4b 100644
--- a/protocols/Sametime/src/glib/grel.h
+++ b/protocols/Sametime/src/glib/grel.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gscanner.c b/protocols/Sametime/src/glib/gscanner.c
index 301254e496..1234a60b26 100644
--- a/protocols/Sametime/src/glib/gscanner.c
+++ b/protocols/Sametime/src/glib/gscanner.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* GScanner: Flexible lexical scanner for general purpose.
diff --git a/protocols/Sametime/src/glib/gscanner.h b/protocols/Sametime/src/glib/gscanner.h
index 037d5e8ba7..3b7ad6fab0 100644
--- a/protocols/Sametime/src/glib/gscanner.h
+++ b/protocols/Sametime/src/glib/gscanner.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gscripttable.h b/protocols/Sametime/src/glib/gscripttable.h
index 27c51f2e0c..b63e2da550 100644
--- a/protocols/Sametime/src/glib/gscripttable.h
+++ b/protocols/Sametime/src/glib/gscripttable.h
@@ -1,4 +1,4 @@
-/* gscripttable.h: Generated by gen-script-table.pl
+/* gscripttable.h: Generated by gen-script-table.pl
*
* Date: Mon Apr 7 23:17:02 2008
* Source: Scripts-5.1.0.txt
diff --git a/protocols/Sametime/src/glib/gsequence.c b/protocols/Sametime/src/glib/gsequence.c
index 2d31e1973b..8b28ce79a7 100644
--- a/protocols/Sametime/src/glib/gsequence.c
+++ b/protocols/Sametime/src/glib/gsequence.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
* Soeren Sandmann (sandmann@daimi.au.dk)
*
diff --git a/protocols/Sametime/src/glib/gsequence.h b/protocols/Sametime/src/glib/gsequence.h
index f5f6c76bb8..fa79066e06 100644
--- a/protocols/Sametime/src/glib/gsequence.h
+++ b/protocols/Sametime/src/glib/gsequence.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
* Soeren Sandmann (sandmann@daimi.au.dk)
*
diff --git a/protocols/Sametime/src/glib/gshell.c b/protocols/Sametime/src/glib/gshell.c
index d2ba312019..1461f29ba2 100644
--- a/protocols/Sametime/src/glib/gshell.c
+++ b/protocols/Sametime/src/glib/gshell.c
@@ -1,4 +1,4 @@
-/* gshell.c - Shell-related utilities
+/* gshell.c - Shell-related utilities
*
* Copyright 2000 Red Hat, Inc.
* g_execvpe implementation based on GNU libc execvp:
diff --git a/protocols/Sametime/src/glib/gshell.h b/protocols/Sametime/src/glib/gshell.h
index 9a7dbb2532..130f1008c8 100644
--- a/protocols/Sametime/src/glib/gshell.h
+++ b/protocols/Sametime/src/glib/gshell.h
@@ -1,4 +1,4 @@
-/* gshell.h - Shell-related utilities
+/* gshell.h - Shell-related utilities
*
* Copyright 2000 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gslice.c b/protocols/Sametime/src/glib/gslice.c
index 2a55086086..05de6b3681 100644
--- a/protocols/Sametime/src/glib/gslice.c
+++ b/protocols/Sametime/src/glib/gslice.c
@@ -1,4 +1,4 @@
-/* GLIB sliced memory - fast concurrent memory chunk allocator
+/* GLIB sliced memory - fast concurrent memory chunk allocator
* Copyright (C) 2005 Tim Janik
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gslice.h b/protocols/Sametime/src/glib/gslice.h
index 43dbb5d7ac..962199e099 100644
--- a/protocols/Sametime/src/glib/gslice.h
+++ b/protocols/Sametime/src/glib/gslice.h
@@ -1,4 +1,4 @@
-/* GLIB sliced memory - fast threaded memory chunk allocator
+/* GLIB sliced memory - fast threaded memory chunk allocator
* Copyright (C) 2005 Tim Janik
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gslist.c b/protocols/Sametime/src/glib/gslist.c
index 51bc7059aa..dfbd354403 100644
--- a/protocols/Sametime/src/glib/gslist.c
+++ b/protocols/Sametime/src/glib/gslist.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gslist.h b/protocols/Sametime/src/glib/gslist.h
index 280730dfe7..8b01faf5cd 100644
--- a/protocols/Sametime/src/glib/gslist.h
+++ b/protocols/Sametime/src/glib/gslist.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gspawn-win32-helper-console.c b/protocols/Sametime/src/glib/gspawn-win32-helper-console.c
index 4b21548e70..dca4499fb6 100644
--- a/protocols/Sametime/src/glib/gspawn-win32-helper-console.c
+++ b/protocols/Sametime/src/glib/gspawn-win32-helper-console.c
@@ -1,2 +1,2 @@
-#define HELPER_CONSOLE
+#define HELPER_CONSOLE
#include "gspawn-win32-helper.c"
diff --git a/protocols/Sametime/src/glib/gspawn-win32-helper.c b/protocols/Sametime/src/glib/gspawn-win32-helper.c
index c27819c6a0..87d4423e6d 100644
--- a/protocols/Sametime/src/glib/gspawn-win32-helper.c
+++ b/protocols/Sametime/src/glib/gspawn-win32-helper.c
@@ -1,4 +1,4 @@
-/* gspawn-win32-helper.c - Helper program for process launching on Win32.
+/* gspawn-win32-helper.c - Helper program for process launching on Win32.
*
* Copyright 2000 Red Hat, Inc.
* Copyright 2000 Tor Lillqvist
diff --git a/protocols/Sametime/src/glib/gspawn-win32.c b/protocols/Sametime/src/glib/gspawn-win32.c
index 8fa8570e71..d13d9906f1 100644
--- a/protocols/Sametime/src/glib/gspawn-win32.c
+++ b/protocols/Sametime/src/glib/gspawn-win32.c
@@ -1,4 +1,4 @@
-/* gspawn-win32.c - Process launching on Win32
+/* gspawn-win32.c - Process launching on Win32
*
* Copyright 2000 Red Hat, Inc.
* Copyright 2003 Tor Lillqvist
diff --git a/protocols/Sametime/src/glib/gspawn-win64-helper-console.c b/protocols/Sametime/src/glib/gspawn-win64-helper-console.c
index 4b21548e70..dca4499fb6 100644
--- a/protocols/Sametime/src/glib/gspawn-win64-helper-console.c
+++ b/protocols/Sametime/src/glib/gspawn-win64-helper-console.c
@@ -1,2 +1,2 @@
-#define HELPER_CONSOLE
+#define HELPER_CONSOLE
#include "gspawn-win32-helper.c"
diff --git a/protocols/Sametime/src/glib/gspawn-win64-helper.c b/protocols/Sametime/src/glib/gspawn-win64-helper.c
index 32ad66626c..d8641ffd0f 100644
--- a/protocols/Sametime/src/glib/gspawn-win64-helper.c
+++ b/protocols/Sametime/src/glib/gspawn-win64-helper.c
@@ -1 +1 @@
-#include "gspawn-win32-helper.c"
+#include "gspawn-win32-helper.c"
diff --git a/protocols/Sametime/src/glib/gspawn.c b/protocols/Sametime/src/glib/gspawn.c
index 2f7f37744b..4c48862527 100644
--- a/protocols/Sametime/src/glib/gspawn.c
+++ b/protocols/Sametime/src/glib/gspawn.c
@@ -1,4 +1,4 @@
-/* gspawn.c - Process launching
+/* gspawn.c - Process launching
*
* Copyright 2000 Red Hat, Inc.
* g_execvpe implementation based on GNU libc execvp:
diff --git a/protocols/Sametime/src/glib/gspawn.h b/protocols/Sametime/src/glib/gspawn.h
index 02ac35e00c..9836b34242 100644
--- a/protocols/Sametime/src/glib/gspawn.h
+++ b/protocols/Sametime/src/glib/gspawn.h
@@ -1,4 +1,4 @@
-/* gspawn.h - Process launching
+/* gspawn.h - Process launching
*
* Copyright 2000 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gstdio.c b/protocols/Sametime/src/glib/gstdio.c
index d1e94cea77..fb5a9fb593 100644
--- a/protocols/Sametime/src/glib/gstdio.c
+++ b/protocols/Sametime/src/glib/gstdio.c
@@ -1,4 +1,4 @@
-/* gstdio.c - wrappers for C library functions
+/* gstdio.c - wrappers for C library functions
*
* Copyright 2004 Tor Lillqvist
*
diff --git a/protocols/Sametime/src/glib/gstdio.h b/protocols/Sametime/src/glib/gstdio.h
index df27823f5f..b92eb6c490 100644
--- a/protocols/Sametime/src/glib/gstdio.h
+++ b/protocols/Sametime/src/glib/gstdio.h
@@ -1,4 +1,4 @@
-/* gstdio.h - GFilename wrappers for C library functions
+/* gstdio.h - GFilename wrappers for C library functions
*
* Copyright 2004 Tor Lillqvist
*
diff --git a/protocols/Sametime/src/glib/gstrfuncs.c b/protocols/Sametime/src/glib/gstrfuncs.c
index a481236672..04f686b401 100644
--- a/protocols/Sametime/src/glib/gstrfuncs.c
+++ b/protocols/Sametime/src/glib/gstrfuncs.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gstrfuncs.h b/protocols/Sametime/src/glib/gstrfuncs.h
index c5e572f3ff..5c7332a3c4 100644
--- a/protocols/Sametime/src/glib/gstrfuncs.h
+++ b/protocols/Sametime/src/glib/gstrfuncs.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gstring.c b/protocols/Sametime/src/glib/gstring.c
index 2cddfa8571..9b25fb614b 100644
--- a/protocols/Sametime/src/glib/gstring.c
+++ b/protocols/Sametime/src/glib/gstring.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gstring.h b/protocols/Sametime/src/glib/gstring.h
index d30761230d..2b1dd6ece2 100644
--- a/protocols/Sametime/src/glib/gstring.h
+++ b/protocols/Sametime/src/glib/gstring.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gtester.c b/protocols/Sametime/src/glib/gtester.c
index e7dfb3c371..12e576c61a 100644
--- a/protocols/Sametime/src/glib/gtester.c
+++ b/protocols/Sametime/src/glib/gtester.c
@@ -1,4 +1,4 @@
-/* GLib testing framework runner
+/* GLib testing framework runner
* Copyright (C) 2007 Sven Herzberg
* Copyright (C) 2007 Tim Janik
*
diff --git a/protocols/Sametime/src/glib/gtestutils.c b/protocols/Sametime/src/glib/gtestutils.c
index 52e29e96af..c5754ec0c0 100644
--- a/protocols/Sametime/src/glib/gtestutils.c
+++ b/protocols/Sametime/src/glib/gtestutils.c
@@ -1,4 +1,4 @@
-/* GLib testing utilities
+/* GLib testing utilities
* Copyright (C) 2007 Imendio AB
* Authors: Tim Janik, Sven Herzberg
*
diff --git a/protocols/Sametime/src/glib/gtestutils.h b/protocols/Sametime/src/glib/gtestutils.h
index 67dd02156b..b441fe08bc 100644
--- a/protocols/Sametime/src/glib/gtestutils.h
+++ b/protocols/Sametime/src/glib/gtestutils.h
@@ -1,4 +1,4 @@
-/* GLib testing utilities
+/* GLib testing utilities
* Copyright (C) 2007 Imendio AB
* Authors: Tim Janik
*
diff --git a/protocols/Sametime/src/glib/gthread.c b/protocols/Sametime/src/glib/gthread.c
index 6d181b32fa..2a00c60a9b 100644
--- a/protocols/Sametime/src/glib/gthread.c
+++ b/protocols/Sametime/src/glib/gthread.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* gthread.c: MT safety related functions
diff --git a/protocols/Sametime/src/glib/gthread.h b/protocols/Sametime/src/glib/gthread.h
index 8a82d47c7c..82d40c0b85 100644
--- a/protocols/Sametime/src/glib/gthread.h
+++ b/protocols/Sametime/src/glib/gthread.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gthreadpool.c b/protocols/Sametime/src/glib/gthreadpool.c
index 54103607c6..3bab274192 100644
--- a/protocols/Sametime/src/glib/gthreadpool.c
+++ b/protocols/Sametime/src/glib/gthreadpool.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* GAsyncQueue: thread pool implementation.
diff --git a/protocols/Sametime/src/glib/gthreadpool.h b/protocols/Sametime/src/glib/gthreadpool.h
index 4659929e82..d5864241e6 100644
--- a/protocols/Sametime/src/glib/gthreadpool.h
+++ b/protocols/Sametime/src/glib/gthreadpool.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gthreadprivate.h b/protocols/Sametime/src/glib/gthreadprivate.h
index 2a883bd0a8..c75924c257 100644
--- a/protocols/Sametime/src/glib/gthreadprivate.h
+++ b/protocols/Sametime/src/glib/gthreadprivate.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
*
* gthreadprivate.h - GLib internal thread system related declarations.
*
diff --git a/protocols/Sametime/src/glib/gtimer.c b/protocols/Sametime/src/glib/gtimer.c
index 86ad1293fb..843b983144 100644
--- a/protocols/Sametime/src/glib/gtimer.c
+++ b/protocols/Sametime/src/glib/gtimer.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gtimer.h b/protocols/Sametime/src/glib/gtimer.h
index 577fef1a28..743eed1f90 100644
--- a/protocols/Sametime/src/glib/gtimer.h
+++ b/protocols/Sametime/src/glib/gtimer.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gtimezone.c b/protocols/Sametime/src/glib/gtimezone.c
index ab49450a7e..a909fc5f45 100644
--- a/protocols/Sametime/src/glib/gtimezone.c
+++ b/protocols/Sametime/src/glib/gtimezone.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2010 Codethink Limited
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gtimezone.h b/protocols/Sametime/src/glib/gtimezone.h
index 35b3aabdbb..1032a3c09c 100644
--- a/protocols/Sametime/src/glib/gtimezone.h
+++ b/protocols/Sametime/src/glib/gtimezone.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2010 Codethink Limited
*
* This library is free software; you can redistribute it and/or modify
diff --git a/protocols/Sametime/src/glib/gtimezoneprivate.h b/protocols/Sametime/src/glib/gtimezoneprivate.h
index df30ea46d6..767d310c88 100644
--- a/protocols/Sametime/src/glib/gtimezoneprivate.h
+++ b/protocols/Sametime/src/glib/gtimezoneprivate.h
@@ -1,4 +1,4 @@
-#ifndef __G_TIME_ZONE_PRIVATE_H__
+#ifndef __G_TIME_ZONE_PRIVATE_H__
#define __G_TIME_ZONE_PRIVATE_H__
#include "gtimezone.h"
diff --git a/protocols/Sametime/src/glib/gtree.c b/protocols/Sametime/src/glib/gtree.c
index 7f93282d4a..8a4387f79b 100644
--- a/protocols/Sametime/src/glib/gtree.c
+++ b/protocols/Sametime/src/glib/gtree.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gtree.h b/protocols/Sametime/src/glib/gtree.h
index 344bcebee3..db06ba3b82 100644
--- a/protocols/Sametime/src/glib/gtree.h
+++ b/protocols/Sametime/src/glib/gtree.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gtypes.h b/protocols/Sametime/src/glib/gtypes.h
index 21d4447680..e616f9988c 100644
--- a/protocols/Sametime/src/glib/gtypes.h
+++ b/protocols/Sametime/src/glib/gtypes.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gunibreak.c b/protocols/Sametime/src/glib/gunibreak.c
index f390155ec4..4b4f0e2faf 100644
--- a/protocols/Sametime/src/glib/gunibreak.c
+++ b/protocols/Sametime/src/glib/gunibreak.c
@@ -1,4 +1,4 @@
-/* gunibreak.c - line break properties
+/* gunibreak.c - line break properties
*
* Copyright 2000 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gunibreak.h b/protocols/Sametime/src/glib/gunibreak.h
index faae717f60..37be2af8cf 100644
--- a/protocols/Sametime/src/glib/gunibreak.h
+++ b/protocols/Sametime/src/glib/gunibreak.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated. DO NOT EDIT!
+/* This file is automatically generated. DO NOT EDIT!
Instead, edit gen-unicode-tables.pl and re-run. */
#ifndef BREAKTABLES_H
diff --git a/protocols/Sametime/src/glib/gunichartables.h b/protocols/Sametime/src/glib/gunichartables.h
index 6773c62849..044a44ff45 100644
--- a/protocols/Sametime/src/glib/gunichartables.h
+++ b/protocols/Sametime/src/glib/gunichartables.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated. DO NOT EDIT!
+/* This file is automatically generated. DO NOT EDIT!
Instead, edit gen-unicode-tables.pl and re-run. */
#ifndef CHARTABLES_H
diff --git a/protocols/Sametime/src/glib/gunicode.h b/protocols/Sametime/src/glib/gunicode.h
index a702c1eac8..4ca7bd3017 100644
--- a/protocols/Sametime/src/glib/gunicode.h
+++ b/protocols/Sametime/src/glib/gunicode.h
@@ -1,4 +1,4 @@
-/* gunicode.h - Unicode manipulation functions
+/* gunicode.h - Unicode manipulation functions
*
* Copyright (C) 1999, 2000 Tom Tromey
* Copyright 2000, 2005 Red Hat, Inc.
diff --git a/protocols/Sametime/src/glib/gunicodeprivate.h b/protocols/Sametime/src/glib/gunicodeprivate.h
index 541d57cdce..c6cca842c2 100644
--- a/protocols/Sametime/src/glib/gunicodeprivate.h
+++ b/protocols/Sametime/src/glib/gunicodeprivate.h
@@ -1,4 +1,4 @@
-/* gunicodeprivate.h
+/* gunicodeprivate.h
*
* Copyright (C) 2003 Noah Levitt
*
diff --git a/protocols/Sametime/src/glib/gunicollate.c b/protocols/Sametime/src/glib/gunicollate.c
index 38fa5f9533..165ecbc250 100644
--- a/protocols/Sametime/src/glib/gunicollate.c
+++ b/protocols/Sametime/src/glib/gunicollate.c
@@ -1,4 +1,4 @@
-/* gunicollate.c - Collation
+/* gunicollate.c - Collation
*
* Copyright 2001,2005 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gunicomp.h b/protocols/Sametime/src/glib/gunicomp.h
index 9ce37dc7fe..23a9087b7f 100644
--- a/protocols/Sametime/src/glib/gunicomp.h
+++ b/protocols/Sametime/src/glib/gunicomp.h
@@ -1,4 +1,4 @@
-#define COMPOSE_FIRST_START 1
+#define COMPOSE_FIRST_START 1
#define COMPOSE_FIRST_SINGLE_START 147
#define COMPOSE_SECOND_START 368
#define COMPOSE_SECOND_SINGLE_START 399
diff --git a/protocols/Sametime/src/glib/gunidecomp.c b/protocols/Sametime/src/glib/gunidecomp.c
index 7d29540605..0bd7ced2c8 100644
--- a/protocols/Sametime/src/glib/gunidecomp.c
+++ b/protocols/Sametime/src/glib/gunidecomp.c
@@ -1,4 +1,4 @@
-/* decomp.c - Character decomposition.
+/* decomp.c - Character decomposition.
*
* Copyright (C) 1999, 2000 Tom Tromey
* Copyright 2000 Red Hat, Inc.
diff --git a/protocols/Sametime/src/glib/gunidecomp.h b/protocols/Sametime/src/glib/gunidecomp.h
index 24210c04b4..135d10742e 100644
--- a/protocols/Sametime/src/glib/gunidecomp.h
+++ b/protocols/Sametime/src/glib/gunidecomp.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated. DO NOT EDIT! */
+/* This file is automatically generated. DO NOT EDIT! */
#ifndef DECOMP_H
#define DECOMP_H
diff --git a/protocols/Sametime/src/glib/guniprop.c b/protocols/Sametime/src/glib/guniprop.c
index 27c32f2c1c..639057434d 100644
--- a/protocols/Sametime/src/glib/guniprop.c
+++ b/protocols/Sametime/src/glib/guniprop.c
@@ -1,4 +1,4 @@
-/* guniprop.c - Unicode character properties.
+/* guniprop.c - Unicode character properties.
*
* Copyright (C) 1999 Tom Tromey
* Copyright (C) 2000 Red Hat, Inc.
diff --git a/protocols/Sametime/src/glib/gurifuncs.c b/protocols/Sametime/src/glib/gurifuncs.c
index 786736163a..6a77244c6d 100644
--- a/protocols/Sametime/src/glib/gurifuncs.c
+++ b/protocols/Sametime/src/glib/gurifuncs.c
@@ -1,4 +1,4 @@
-/* GIO - GLib Input, Output and Streaming Library
+/* GIO - GLib Input, Output and Streaming Library
*
* Copyright (C) 2006-2007 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gurifuncs.h b/protocols/Sametime/src/glib/gurifuncs.h
index 2f61daa079..bbc8f8800a 100644
--- a/protocols/Sametime/src/glib/gurifuncs.h
+++ b/protocols/Sametime/src/glib/gurifuncs.h
@@ -1,4 +1,4 @@
-/* GIO - GLib Input, Output and Streaming Library
+/* GIO - GLib Input, Output and Streaming Library
*
* Copyright (C) 2006-2007 Red Hat, Inc.
*
diff --git a/protocols/Sametime/src/glib/gutf8.c b/protocols/Sametime/src/glib/gutf8.c
index 4930d3cc87..98f4707161 100644
--- a/protocols/Sametime/src/glib/gutf8.c
+++ b/protocols/Sametime/src/glib/gutf8.c
@@ -1,4 +1,4 @@
-/* gutf8.c - Operations on UTF-8 strings.
+/* gutf8.c - Operations on UTF-8 strings.
*
* Copyright (C) 1999 Tom Tromey
* Copyright (C) 2000 Red Hat, Inc.
diff --git a/protocols/Sametime/src/glib/gutils.c b/protocols/Sametime/src/glib/gutils.c
index 3a815592b7..49bbadbee0 100644
--- a/protocols/Sametime/src/glib/gutils.c
+++ b/protocols/Sametime/src/glib/gutils.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gutils.h b/protocols/Sametime/src/glib/gutils.h
index d9f579d08d..90281579c6 100644
--- a/protocols/Sametime/src/glib/gutils.h
+++ b/protocols/Sametime/src/glib/gutils.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gvariant-core.c b/protocols/Sametime/src/glib/gvariant-core.c
index 5e0b786b7c..6f019307a4 100644
--- a/protocols/Sametime/src/glib/gvariant-core.c
+++ b/protocols/Sametime/src/glib/gvariant-core.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvariant-core.h b/protocols/Sametime/src/glib/gvariant-core.h
index 7461601d12..33c0ef313a 100644
--- a/protocols/Sametime/src/glib/gvariant-core.h
+++ b/protocols/Sametime/src/glib/gvariant-core.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvariant-internal.h b/protocols/Sametime/src/glib/gvariant-internal.h
index ac7d672480..66a080af48 100644
--- a/protocols/Sametime/src/glib/gvariant-internal.h
+++ b/protocols/Sametime/src/glib/gvariant-internal.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2009, 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvariant-parser.c b/protocols/Sametime/src/glib/gvariant-parser.c
index b9a81a4d7d..c38732d685 100644
--- a/protocols/Sametime/src/glib/gvariant-parser.c
+++ b/protocols/Sametime/src/glib/gvariant-parser.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2009, 2010 Codethink Limited
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/gvariant-serialiser.c b/protocols/Sametime/src/glib/gvariant-serialiser.c
index d54c7eeb36..68128e2da1 100644
--- a/protocols/Sametime/src/glib/gvariant-serialiser.c
+++ b/protocols/Sametime/src/glib/gvariant-serialiser.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvariant-serialiser.h b/protocols/Sametime/src/glib/gvariant-serialiser.h
index 8ea573360e..f26b118d5c 100644
--- a/protocols/Sametime/src/glib/gvariant-serialiser.h
+++ b/protocols/Sametime/src/glib/gvariant-serialiser.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvariant.c b/protocols/Sametime/src/glib/gvariant.c
index 076f04d28d..e333597069 100644
--- a/protocols/Sametime/src/glib/gvariant.c
+++ b/protocols/Sametime/src/glib/gvariant.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvariant.h b/protocols/Sametime/src/glib/gvariant.h
index 7ffd458fa4..528492b685 100644
--- a/protocols/Sametime/src/glib/gvariant.h
+++ b/protocols/Sametime/src/glib/gvariant.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2009, 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvarianttype.c b/protocols/Sametime/src/glib/gvarianttype.c
index ef5c383b32..b33d60eef1 100644
--- a/protocols/Sametime/src/glib/gvarianttype.c
+++ b/protocols/Sametime/src/glib/gvarianttype.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2009, 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvarianttype.h b/protocols/Sametime/src/glib/gvarianttype.h
index 7263013817..124fa46b59 100644
--- a/protocols/Sametime/src/glib/gvarianttype.h
+++ b/protocols/Sametime/src/glib/gvarianttype.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2007, 2008 Ryan Lortie
* Copyright © 2009, 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvarianttypeinfo.c b/protocols/Sametime/src/glib/gvarianttypeinfo.c
index 1b04324219..c5998d39ec 100644
--- a/protocols/Sametime/src/glib/gvarianttypeinfo.c
+++ b/protocols/Sametime/src/glib/gvarianttypeinfo.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gvarianttypeinfo.h b/protocols/Sametime/src/glib/gvarianttypeinfo.h
index cc7c45614e..7c7b54412c 100644
--- a/protocols/Sametime/src/glib/gvarianttypeinfo.h
+++ b/protocols/Sametime/src/glib/gvarianttypeinfo.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright © 2008 Ryan Lortie
* Copyright © 2010 Codethink Limited
*
diff --git a/protocols/Sametime/src/glib/gwin32.c b/protocols/Sametime/src/glib/gwin32.c
index a630b0b07a..88e9a4b4ff 100644
--- a/protocols/Sametime/src/glib/gwin32.c
+++ b/protocols/Sametime/src/glib/gwin32.c
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald
* Copyright (C) 1998-1999 Tor Lillqvist
*
diff --git a/protocols/Sametime/src/glib/gwin32.h b/protocols/Sametime/src/glib/gwin32.h
index dc71fa31bd..5793335478 100644
--- a/protocols/Sametime/src/glib/gwin32.h
+++ b/protocols/Sametime/src/glib/gwin32.h
@@ -1,4 +1,4 @@
-/* GLIB - Library of useful routines for C programming
+/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/libcharset/libcharset.h b/protocols/Sametime/src/glib/libcharset/libcharset.h
index 8a30ca02d0..686241e742 100644
--- a/protocols/Sametime/src/glib/libcharset/libcharset.h
+++ b/protocols/Sametime/src/glib/libcharset/libcharset.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU CHARSET Library.
The GNU CHARSET Library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/libcharset/localcharset.c b/protocols/Sametime/src/glib/libcharset/localcharset.c
index 3e66d0d00c..a80a106e80 100644
--- a/protocols/Sametime/src/glib/libcharset/localcharset.c
+++ b/protocols/Sametime/src/glib/libcharset/localcharset.c
@@ -1,4 +1,4 @@
-/* Determine a canonical name for the current locale's character encoding.
+/* Determine a canonical name for the current locale's character encoding.
Copyright (C) 2000-2006 Free Software Foundation, Inc.
diff --git a/protocols/Sametime/src/glib/libcharset/localcharset.h b/protocols/Sametime/src/glib/libcharset/localcharset.h
index 4020fc0c55..674aa3ab72 100644
--- a/protocols/Sametime/src/glib/libcharset/localcharset.h
+++ b/protocols/Sametime/src/glib/libcharset/localcharset.h
@@ -1,4 +1,4 @@
-/* Determine a canonical name for the current locale's character encoding.
+/* Determine a canonical name for the current locale's character encoding.
Copyright (C) 2000-2003 Free Software Foundation, Inc.
This file is part of the GNU CHARSET Library.
diff --git a/protocols/Sametime/src/glib/libintl.c b/protocols/Sametime/src/glib/libintl.c
index 019f64a8e2..89b6c92af8 100644
--- a/protocols/Sametime/src/glib/libintl.c
+++ b/protocols/Sametime/src/glib/libintl.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2008 Tor Lillqvist
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/libintl.h b/protocols/Sametime/src/glib/libintl.h
index 0569a4c1ce..82d96e7d27 100644
--- a/protocols/Sametime/src/glib/libintl.h
+++ b/protocols/Sametime/src/glib/libintl.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2008 Tor Lillqvist
*
* This library is free software; you can redistribute it and/or
diff --git a/protocols/Sametime/src/glib/wdirent.c b/protocols/Sametime/src/glib/wdirent.c
index d35743f18b..098d8542e3 100644
--- a/protocols/Sametime/src/glib/wdirent.c
+++ b/protocols/Sametime/src/glib/wdirent.c
@@ -1,3 +1,3 @@
-#define _UNICODE 1
+#define _UNICODE 1
#define UNICODE 1
#include "dirent.c"
diff --git a/protocols/Sametime/src/glib/win_iconv.c b/protocols/Sametime/src/glib/win_iconv.c
index 3f02499e04..4ab1653533 100644
--- a/protocols/Sametime/src/glib/win_iconv.c
+++ b/protocols/Sametime/src/glib/win_iconv.c
@@ -1,4 +1,4 @@
-/*
+/*
* iconv library implemented with Win32 API.
*
* This file is placed in the public domain.
diff --git a/protocols/Sametime/src/meanwhile/src/channel.c b/protocols/Sametime/src/meanwhile/src/channel.c
index 1899abd027..07334c18e7 100644
--- a/protocols/Sametime/src/meanwhile/src/channel.c
+++ b/protocols/Sametime/src/meanwhile/src/channel.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/cipher.c b/protocols/Sametime/src/meanwhile/src/cipher.c
index 7b3c72f02f..8e5bd6f042 100644
--- a/protocols/Sametime/src/meanwhile/src/cipher.c
+++ b/protocols/Sametime/src/meanwhile/src/cipher.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/common.c b/protocols/Sametime/src/meanwhile/src/common.c
index d98b671d28..555edd2c1c 100644
--- a/protocols/Sametime/src/meanwhile/src/common.c
+++ b/protocols/Sametime/src/meanwhile/src/common.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/error.c b/protocols/Sametime/src/meanwhile/src/error.c
index 2250b9ed40..23977c6626 100644
--- a/protocols/Sametime/src/meanwhile/src/error.c
+++ b/protocols/Sametime/src/meanwhile/src/error.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/message.c b/protocols/Sametime/src/meanwhile/src/message.c
index cfaecd1c23..f9afec4c9b 100644
--- a/protocols/Sametime/src/meanwhile/src/message.c
+++ b/protocols/Sametime/src/meanwhile/src/message.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mpi/mpi-config.h b/protocols/Sametime/src/meanwhile/src/mpi/mpi-config.h
index 681c858338..6972c8878d 100644
--- a/protocols/Sametime/src/meanwhile/src/mpi/mpi-config.h
+++ b/protocols/Sametime/src/meanwhile/src/mpi/mpi-config.h
@@ -1,4 +1,4 @@
-/* Default configuration for MPI library */
+/* Default configuration for MPI library */
#ifndef MPI_CONFIG_H_
#define MPI_CONFIG_H_
diff --git a/protocols/Sametime/src/meanwhile/src/mpi/mpi-types.h b/protocols/Sametime/src/meanwhile/src/mpi/mpi-types.h
index 3a18923291..137047ca77 100644
--- a/protocols/Sametime/src/meanwhile/src/mpi/mpi-types.h
+++ b/protocols/Sametime/src/meanwhile/src/mpi/mpi-types.h
@@ -1,4 +1,4 @@
-
+
#include <glib.h>
typedef gchar mw_mp_sign;
diff --git a/protocols/Sametime/src/meanwhile/src/mpi/mpi.c b/protocols/Sametime/src/meanwhile/src/mpi/mpi.c
index ccdf5cf0f7..3a18c99050 100644
--- a/protocols/Sametime/src/meanwhile/src/mpi/mpi.c
+++ b/protocols/Sametime/src/meanwhile/src/mpi/mpi.c
@@ -1,4 +1,4 @@
-/*
+/*
mpi.c
by Michael J. Fromberger <http://www.dartmouth.edu/~sting/>
diff --git a/protocols/Sametime/src/meanwhile/src/mpi/mpi.h b/protocols/Sametime/src/meanwhile/src/mpi/mpi.h
index 14a6573e25..0e7cc527a1 100644
--- a/protocols/Sametime/src/meanwhile/src/mpi/mpi.h
+++ b/protocols/Sametime/src/meanwhile/src/mpi/mpi.h
@@ -1,4 +1,4 @@
-/*
+/*
mpi.h
by Michael J. Fromberger <http://www.dartmouth.edu/~sting/>
diff --git a/protocols/Sametime/src/meanwhile/src/mw_channel.h b/protocols/Sametime/src/meanwhile/src/mw_channel.h
index b9b3316875..7af5e22d86 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_channel.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_channel.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_cipher.h b/protocols/Sametime/src/meanwhile/src/mw_cipher.h
index 38894bf6e6..a75781397e 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_cipher.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_cipher.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_common.h b/protocols/Sametime/src/meanwhile/src/mw_common.h
index 4e7967510a..6138ce1b4d 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_common.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_common.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_debug.c b/protocols/Sametime/src/meanwhile/src/mw_debug.c
index cb84bbb6e0..d22d2876eb 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_debug.c
+++ b/protocols/Sametime/src/meanwhile/src/mw_debug.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_debug.h b/protocols/Sametime/src/meanwhile/src/mw_debug.h
index 000047a3eb..e1919c11c8 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_debug.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_debug.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_error.h b/protocols/Sametime/src/meanwhile/src/mw_error.h
index aa6e3bf620..e53cc0c996 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_error.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_error.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_message.h b/protocols/Sametime/src/meanwhile/src/mw_message.h
index 6e55842d5f..a825ec271b 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_message.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_message.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_service.h b/protocols/Sametime/src/meanwhile/src/mw_service.h
index 9a7cf8a5a2..9bcd6509db 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_service.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_service.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_session.h b/protocols/Sametime/src/meanwhile/src/mw_session.h
index 5065008a9e..e606e0ca98 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_session.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_session.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_aware.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_aware.h
index 412ecd2f24..0d5090d258 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_aware.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_aware.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_conf.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_conf.h
index 771ce3d0de..ea162e6e73 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_conf.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_conf.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_dir.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_dir.h
index d8a9523629..c45e850232 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_dir.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_dir.h
@@ -1,4 +1,4 @@
-/*
+/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_ft.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_ft.h
index 0887661de0..aef7de886a 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_ft.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_ft.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_im.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_im.h
index 9bd6331cd5..adb710e32c 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_im.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_im.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_place.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_place.h
index 3283692222..bba97b61e9 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_place.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_place.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_resolve.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_resolve.h
index 7c621f4bdb..5429640a1e 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_resolve.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_resolve.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_srvc_store.h b/protocols/Sametime/src/meanwhile/src/mw_srvc_store.h
index a8524e5ef9..b55ddf21fe 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_srvc_store.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_srvc_store.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_st_list.h b/protocols/Sametime/src/meanwhile/src/mw_st_list.h
index 535ca933dd..d54de15bac 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_st_list.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_st_list.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_util.c b/protocols/Sametime/src/meanwhile/src/mw_util.c
index b8f0a5a16b..57c1845b38 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_util.c
+++ b/protocols/Sametime/src/meanwhile/src/mw_util.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/mw_util.h b/protocols/Sametime/src/meanwhile/src/mw_util.h
index cd75d59b83..a94b85131f 100644
--- a/protocols/Sametime/src/meanwhile/src/mw_util.h
+++ b/protocols/Sametime/src/meanwhile/src/mw_util.h
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/service.c b/protocols/Sametime/src/meanwhile/src/service.c
index c4f4ea4263..9ff8d8639f 100644
--- a/protocols/Sametime/src/meanwhile/src/service.c
+++ b/protocols/Sametime/src/meanwhile/src/service.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/session.c b/protocols/Sametime/src/meanwhile/src/session.c
index 6688d9635a..d02d3a09bd 100644
--- a/protocols/Sametime/src/meanwhile/src/session.c
+++ b/protocols/Sametime/src/meanwhile/src/session.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_aware.c b/protocols/Sametime/src/meanwhile/src/srvc_aware.c
index a7e2b457b3..8c399b9832 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_aware.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_aware.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_conf.c b/protocols/Sametime/src/meanwhile/src/srvc_conf.c
index 4c421fd687..46d12fd849 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_conf.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_conf.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_dir.c b/protocols/Sametime/src/meanwhile/src/srvc_dir.c
index 4a84ee0d7c..be944429cf 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_dir.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_dir.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_ft.c b/protocols/Sametime/src/meanwhile/src/srvc_ft.c
index e4d3ee6fc2..df623e5181 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_ft.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_ft.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_im.c b/protocols/Sametime/src/meanwhile/src/srvc_im.c
index 345453fd53..c200487812 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_im.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_im.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_place.c b/protocols/Sametime/src/meanwhile/src/srvc_place.c
index 1b33165d6f..d07e886bc9 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_place.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_place.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_resolve.c b/protocols/Sametime/src/meanwhile/src/srvc_resolve.c
index 1f910d5701..3a282291cc 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_resolve.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_resolve.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/srvc_store.c b/protocols/Sametime/src/meanwhile/src/srvc_store.c
index af792adbc2..edfd0281ef 100644
--- a/protocols/Sametime/src/meanwhile/src/srvc_store.c
+++ b/protocols/Sametime/src/meanwhile/src/srvc_store.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/meanwhile/src/st_list.c b/protocols/Sametime/src/meanwhile/src/st_list.c
index 106a126fa8..186d5a39a3 100644
--- a/protocols/Sametime/src/meanwhile/src/st_list.c
+++ b/protocols/Sametime/src/meanwhile/src/st_list.c
@@ -1,4 +1,4 @@
-
+
/*
Meanwhile - Unofficial Lotus Sametime Community Client Library
Copyright (C) 2004 Christopher (siege) O'Brien
diff --git a/protocols/Sametime/src/messaging.cpp b/protocols/Sametime/src/messaging.cpp
index 57d1efdc0e..9b0fa0b9fb 100644
--- a/protocols/Sametime/src/messaging.cpp
+++ b/protocols/Sametime/src/messaging.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
CSametimeProto* getProtoFromMwConversation(mwConversation* conv)
diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp
index 541320b2f3..188f0afd79 100644
--- a/protocols/Sametime/src/options.cpp
+++ b/protocols/Sametime/src/options.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
diff --git a/protocols/Sametime/src/places.cpp b/protocols/Sametime/src/places.cpp
index 0110a8f174..8b3a030ed1 100644
--- a/protocols/Sametime/src/places.cpp
+++ b/protocols/Sametime/src/places.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
/* Stubs, NOT IMPLEMENTED NOW */
diff --git a/protocols/Sametime/src/resource.h b/protocols/Sametime/src/resource.h
index 79356b96cd..761b400d0d 100644
--- a/protocols/Sametime/src/resource.h
+++ b/protocols/Sametime/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index ff9c9d2599..0987008bec 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
#include "version.h"
diff --git a/protocols/Sametime/src/sametime.h b/protocols/Sametime/src/sametime.h
index aa7b4d36db..2458028af0 100644
--- a/protocols/Sametime/src/sametime.h
+++ b/protocols/Sametime/src/sametime.h
@@ -1,4 +1,4 @@
-#ifndef _SAMETIME_H
+#ifndef _SAMETIME_H
#define _SAMETIME_H
diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index 8df09daf9e..3fb384cb38 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
CSametimeProto::CSametimeProto(const char* pszProtoName, const wchar_t* tszUserName) :
diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index 35bae49b43..f822118c88 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -1,4 +1,4 @@
-
+
#ifndef _SAMETIME_PROTO_H
#define _SAMETIME_PROTO_H
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp
index f030fa195b..3646cc2f34 100644
--- a/protocols/Sametime/src/sametime_session.cpp
+++ b/protocols/Sametime/src/sametime_session.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
/// not in CSametimeProto (used at NETLIBOPENCONNECTION_tag.waitcallback)
diff --git a/protocols/Sametime/src/session_announce_win.cpp b/protocols/Sametime/src/session_announce_win.cpp
index 5e9e72a821..45c4dffa2d 100644
--- a/protocols/Sametime/src/session_announce_win.cpp
+++ b/protocols/Sametime/src/session_announce_win.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp
index ca3062933c..a61398189a 100644
--- a/protocols/Sametime/src/userlist.cpp
+++ b/protocols/Sametime/src/userlist.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
MCONTACT CSametimeProto::FindContactByUserId(const char* id)
diff --git a/protocols/Sametime/src/utils.cpp b/protocols/Sametime/src/utils.cpp
index f129a09ebe..17f545cf96 100644
--- a/protocols/Sametime/src/utils.cpp
+++ b/protocols/Sametime/src/utils.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
#include "sametime.h"
diff --git a/protocols/Sametime/src/version.h b/protocols/Sametime/src/version.h
index 36fa301b78..fc60a0cfff 100644
--- a/protocols/Sametime/src/version.h
+++ b/protocols/Sametime/src/version.h
@@ -1,4 +1,4 @@
-#define __MAJOR_VERSION 0
+#define __MAJOR_VERSION 0
#define __MINOR_VERSION 7
#define __RELEASE_NUM 0
#define __BUILD_NUM 5
--
cgit v1.2.3