summaryrefslogtreecommitdiff
path: root/protocols/Sametime/src
diff options
context:
space:
mode:
authorKirill Volinsky <Mataes2007@gmail.com>2017-12-06 13:00:20 +0300
committerKirill Volinsky <Mataes2007@gmail.com>2017-12-06 13:09:18 +0300
commit62202ed10617927d5429bc59898e12a366abe744 (patch)
tree4960bf1241b59cf009118da6cdab87294b1a95e1 /protocols/Sametime/src
parentb30e7ca1c642a3f88659a4346832e653407e1c0f (diff)
convert all files exept curl and new_gpg to utf-8 BOM
Diffstat (limited to 'protocols/Sametime/src')
-rw-r--r--protocols/Sametime/src/StdAfx.cpp2
-rw-r--r--protocols/Sametime/src/StdAfx.h2
-rw-r--r--protocols/Sametime/src/conference.cpp2
-rw-r--r--protocols/Sametime/src/files.cpp2
-rw-r--r--protocols/Sametime/src/glib/CMakeLists.txt2
-rw-r--r--protocols/Sametime/src/glib/config.h2
-rw-r--r--protocols/Sametime/src/glib/dirent.c2
-rw-r--r--protocols/Sametime/src/glib/dirent.h2
-rw-r--r--protocols/Sametime/src/glib/galloca.h2
-rw-r--r--protocols/Sametime/src/glib/garray.c2
-rw-r--r--protocols/Sametime/src/glib/garray.h2
-rw-r--r--protocols/Sametime/src/glib/gasyncqueue.c2
-rw-r--r--protocols/Sametime/src/glib/gasyncqueue.h2
-rw-r--r--protocols/Sametime/src/glib/gatomic-gcc.c2
-rw-r--r--protocols/Sametime/src/glib/gatomic.c2
-rw-r--r--protocols/Sametime/src/glib/gatomic.h2
-rw-r--r--protocols/Sametime/src/glib/gbacktrace.c2
-rw-r--r--protocols/Sametime/src/glib/gbacktrace.h2
-rw-r--r--protocols/Sametime/src/glib/gbase64.c2
-rw-r--r--protocols/Sametime/src/glib/gbase64.h2
-rw-r--r--protocols/Sametime/src/glib/gbitlock.c2
-rw-r--r--protocols/Sametime/src/glib/gbitlock.h2
-rw-r--r--protocols/Sametime/src/glib/gbookmarkfile.c2
-rw-r--r--protocols/Sametime/src/glib/gbookmarkfile.h2
-rw-r--r--protocols/Sametime/src/glib/gbsearcharray.h2
-rw-r--r--protocols/Sametime/src/glib/gbuffer.c2
-rw-r--r--protocols/Sametime/src/glib/gbuffer.h2
-rw-r--r--protocols/Sametime/src/glib/gcache.c2
-rw-r--r--protocols/Sametime/src/glib/gcache.h2
-rw-r--r--protocols/Sametime/src/glib/gchecksum.c2
-rw-r--r--protocols/Sametime/src/glib/gchecksum.h2
-rw-r--r--protocols/Sametime/src/glib/gcompletion.c2
-rw-r--r--protocols/Sametime/src/glib/gcompletion.h2
-rw-r--r--protocols/Sametime/src/glib/gconvert.c2
-rw-r--r--protocols/Sametime/src/glib/gconvert.h2
-rw-r--r--protocols/Sametime/src/glib/gdataset.c2
-rw-r--r--protocols/Sametime/src/glib/gdataset.h2
-rw-r--r--protocols/Sametime/src/glib/gdatasetprivate.h2
-rw-r--r--protocols/Sametime/src/glib/gdate.c2
-rw-r--r--protocols/Sametime/src/glib/gdate.h2
-rw-r--r--protocols/Sametime/src/glib/gdatetime.c2
-rw-r--r--protocols/Sametime/src/glib/gdatetime.h2
-rw-r--r--protocols/Sametime/src/glib/gdebug.h2
-rw-r--r--protocols/Sametime/src/glib/gdir.c2
-rw-r--r--protocols/Sametime/src/glib/gdir.h2
-rw-r--r--protocols/Sametime/src/glib/gerror.c2
-rw-r--r--protocols/Sametime/src/glib/gerror.h2
-rw-r--r--protocols/Sametime/src/glib/gfileutils.c2
-rw-r--r--protocols/Sametime/src/glib/gfileutils.h2
-rw-r--r--protocols/Sametime/src/glib/ghash.c2
-rw-r--r--protocols/Sametime/src/glib/ghash.h2
-rw-r--r--protocols/Sametime/src/glib/ghook.c2
-rw-r--r--protocols/Sametime/src/glib/ghook.h2
-rw-r--r--protocols/Sametime/src/glib/ghostutils.c2
-rw-r--r--protocols/Sametime/src/glib/ghostutils.h2
-rw-r--r--protocols/Sametime/src/glib/gi18n-lib.h2
-rw-r--r--protocols/Sametime/src/glib/gi18n.h2
-rw-r--r--protocols/Sametime/src/glib/giochannel.c2
-rw-r--r--protocols/Sametime/src/glib/giochannel.h2
-rw-r--r--protocols/Sametime/src/glib/giounix.c2
-rw-r--r--protocols/Sametime/src/glib/giowin32.c2
-rw-r--r--protocols/Sametime/src/glib/gkeyfile.c2
-rw-r--r--protocols/Sametime/src/glib/gkeyfile.h2
-rw-r--r--protocols/Sametime/src/glib/glib-object.h2
-rw-r--r--protocols/Sametime/src/glib/glib.h2
-rw-r--r--protocols/Sametime/src/glib/glib_trace.h2
-rw-r--r--protocols/Sametime/src/glib/glibconfig.h2
-rw-r--r--protocols/Sametime/src/glib/glibintl.h2
-rw-r--r--protocols/Sametime/src/glib/glist.c2
-rw-r--r--protocols/Sametime/src/glib/glist.h2
-rw-r--r--protocols/Sametime/src/glib/gmacros.h2
-rw-r--r--protocols/Sametime/src/glib/gmain.c2
-rw-r--r--protocols/Sametime/src/glib/gmain.h2
-rw-r--r--protocols/Sametime/src/glib/gmappedfile.c2
-rw-r--r--protocols/Sametime/src/glib/gmappedfile.h2
-rw-r--r--protocols/Sametime/src/glib/gmarkup.c2
-rw-r--r--protocols/Sametime/src/glib/gmarkup.h2
-rw-r--r--protocols/Sametime/src/glib/gmem.c2
-rw-r--r--protocols/Sametime/src/glib/gmem.h2
-rw-r--r--protocols/Sametime/src/glib/gmessages.c2
-rw-r--r--protocols/Sametime/src/glib/gmessages.h2
-rw-r--r--protocols/Sametime/src/glib/gmirroringtable.h2
-rw-r--r--protocols/Sametime/src/glib/gnode.c2
-rw-r--r--protocols/Sametime/src/glib/gnode.h2
-rw-r--r--protocols/Sametime/src/glib/gnulib/asnprintf.c2
-rw-r--r--protocols/Sametime/src/glib/gnulib/g-gnulib.h2
-rw-r--r--protocols/Sametime/src/glib/gnulib/printf-args.c2
-rw-r--r--protocols/Sametime/src/glib/gnulib/printf-args.h2
-rw-r--r--protocols/Sametime/src/glib/gnulib/printf-parse.c2
-rw-r--r--protocols/Sametime/src/glib/gnulib/printf-parse.h2
-rw-r--r--protocols/Sametime/src/glib/gnulib/printf.c2
-rw-r--r--protocols/Sametime/src/glib/gnulib/printf.h2
-rw-r--r--protocols/Sametime/src/glib/gnulib/vasnprintf.c2
-rw-r--r--protocols/Sametime/src/glib/gnulib/vasnprintf.h2
-rw-r--r--protocols/Sametime/src/glib/goption.c2
-rw-r--r--protocols/Sametime/src/glib/goption.h2
-rw-r--r--protocols/Sametime/src/glib/gpattern.c2
-rw-r--r--protocols/Sametime/src/glib/gpattern.h2
-rw-r--r--protocols/Sametime/src/glib/gpoll.c2
-rw-r--r--protocols/Sametime/src/glib/gpoll.h2
-rw-r--r--protocols/Sametime/src/glib/gprimes.c2
-rw-r--r--protocols/Sametime/src/glib/gprimes.h2
-rw-r--r--protocols/Sametime/src/glib/gprintf.c2
-rw-r--r--protocols/Sametime/src/glib/gprintf.h2
-rw-r--r--protocols/Sametime/src/glib/gprintfint.h2
-rw-r--r--protocols/Sametime/src/glib/gqsort.c2
-rw-r--r--protocols/Sametime/src/glib/gqsort.h2
-rw-r--r--protocols/Sametime/src/glib/gquark.h2
-rw-r--r--protocols/Sametime/src/glib/gqueue.c2
-rw-r--r--protocols/Sametime/src/glib/gqueue.h2
-rw-r--r--protocols/Sametime/src/glib/grand.c2
-rw-r--r--protocols/Sametime/src/glib/grand.h2
-rw-r--r--protocols/Sametime/src/glib/gregex.c2
-rw-r--r--protocols/Sametime/src/glib/gregex.h2
-rw-r--r--protocols/Sametime/src/glib/grel.c2
-rw-r--r--protocols/Sametime/src/glib/grel.h2
-rw-r--r--protocols/Sametime/src/glib/gscanner.c2
-rw-r--r--protocols/Sametime/src/glib/gscanner.h2
-rw-r--r--protocols/Sametime/src/glib/gscripttable.h2
-rw-r--r--protocols/Sametime/src/glib/gsequence.c2
-rw-r--r--protocols/Sametime/src/glib/gsequence.h2
-rw-r--r--protocols/Sametime/src/glib/gshell.c2
-rw-r--r--protocols/Sametime/src/glib/gshell.h2
-rw-r--r--protocols/Sametime/src/glib/gslice.c2
-rw-r--r--protocols/Sametime/src/glib/gslice.h2
-rw-r--r--protocols/Sametime/src/glib/gslist.c2
-rw-r--r--protocols/Sametime/src/glib/gslist.h2
-rw-r--r--protocols/Sametime/src/glib/gspawn-win32-helper-console.c2
-rw-r--r--protocols/Sametime/src/glib/gspawn-win32-helper.c2
-rw-r--r--protocols/Sametime/src/glib/gspawn-win32.c2
-rw-r--r--protocols/Sametime/src/glib/gspawn-win64-helper-console.c2
-rw-r--r--protocols/Sametime/src/glib/gspawn-win64-helper.c2
-rw-r--r--protocols/Sametime/src/glib/gspawn.c2
-rw-r--r--protocols/Sametime/src/glib/gspawn.h2
-rw-r--r--protocols/Sametime/src/glib/gstdio.c2
-rw-r--r--protocols/Sametime/src/glib/gstdio.h2
-rw-r--r--protocols/Sametime/src/glib/gstrfuncs.c2
-rw-r--r--protocols/Sametime/src/glib/gstrfuncs.h2
-rw-r--r--protocols/Sametime/src/glib/gstring.c2
-rw-r--r--protocols/Sametime/src/glib/gstring.h2
-rw-r--r--protocols/Sametime/src/glib/gtester.c2
-rw-r--r--protocols/Sametime/src/glib/gtestutils.c2
-rw-r--r--protocols/Sametime/src/glib/gtestutils.h2
-rw-r--r--protocols/Sametime/src/glib/gthread.c2
-rw-r--r--protocols/Sametime/src/glib/gthread.h2
-rw-r--r--protocols/Sametime/src/glib/gthreadpool.c2
-rw-r--r--protocols/Sametime/src/glib/gthreadpool.h2
-rw-r--r--protocols/Sametime/src/glib/gthreadprivate.h2
-rw-r--r--protocols/Sametime/src/glib/gtimer.c2
-rw-r--r--protocols/Sametime/src/glib/gtimer.h2
-rw-r--r--protocols/Sametime/src/glib/gtimezone.c2
-rw-r--r--protocols/Sametime/src/glib/gtimezone.h2
-rw-r--r--protocols/Sametime/src/glib/gtimezoneprivate.h2
-rw-r--r--protocols/Sametime/src/glib/gtree.c2
-rw-r--r--protocols/Sametime/src/glib/gtree.h2
-rw-r--r--protocols/Sametime/src/glib/gtypes.h2
-rw-r--r--protocols/Sametime/src/glib/gunibreak.c2
-rw-r--r--protocols/Sametime/src/glib/gunibreak.h2
-rw-r--r--protocols/Sametime/src/glib/gunichartables.h2
-rw-r--r--protocols/Sametime/src/glib/gunicode.h2
-rw-r--r--protocols/Sametime/src/glib/gunicodeprivate.h2
-rw-r--r--protocols/Sametime/src/glib/gunicollate.c2
-rw-r--r--protocols/Sametime/src/glib/gunicomp.h2
-rw-r--r--protocols/Sametime/src/glib/gunidecomp.c2
-rw-r--r--protocols/Sametime/src/glib/gunidecomp.h2
-rw-r--r--protocols/Sametime/src/glib/guniprop.c2
-rw-r--r--protocols/Sametime/src/glib/gurifuncs.c2
-rw-r--r--protocols/Sametime/src/glib/gurifuncs.h2
-rw-r--r--protocols/Sametime/src/glib/gutf8.c2
-rw-r--r--protocols/Sametime/src/glib/gutils.c2
-rw-r--r--protocols/Sametime/src/glib/gutils.h2
-rw-r--r--protocols/Sametime/src/glib/gvariant-core.c2
-rw-r--r--protocols/Sametime/src/glib/gvariant-core.h2
-rw-r--r--protocols/Sametime/src/glib/gvariant-internal.h2
-rw-r--r--protocols/Sametime/src/glib/gvariant-parser.c2
-rw-r--r--protocols/Sametime/src/glib/gvariant-serialiser.c2
-rw-r--r--protocols/Sametime/src/glib/gvariant-serialiser.h2
-rw-r--r--protocols/Sametime/src/glib/gvariant.c2
-rw-r--r--protocols/Sametime/src/glib/gvariant.h2
-rw-r--r--protocols/Sametime/src/glib/gvarianttype.c2
-rw-r--r--protocols/Sametime/src/glib/gvarianttype.h2
-rw-r--r--protocols/Sametime/src/glib/gvarianttypeinfo.c2
-rw-r--r--protocols/Sametime/src/glib/gvarianttypeinfo.h2
-rw-r--r--protocols/Sametime/src/glib/gwin32.c2
-rw-r--r--protocols/Sametime/src/glib/gwin32.h2
-rw-r--r--protocols/Sametime/src/glib/libcharset/libcharset.h2
-rw-r--r--protocols/Sametime/src/glib/libcharset/localcharset.c2
-rw-r--r--protocols/Sametime/src/glib/libcharset/localcharset.h2
-rw-r--r--protocols/Sametime/src/glib/libintl.c2
-rw-r--r--protocols/Sametime/src/glib/libintl.h2
-rw-r--r--protocols/Sametime/src/glib/wdirent.c2
-rw-r--r--protocols/Sametime/src/glib/win_iconv.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/channel.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/cipher.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/common.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/error.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/message.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mpi/mpi-config.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mpi/mpi-types.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mpi/mpi.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mpi/mpi.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_channel.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_cipher.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_common.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_debug.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_debug.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_error.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_message.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_service.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_session.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_aware.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_conf.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_dir.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_ft.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_im.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_place.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_resolve.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_srvc_store.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_st_list.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_util.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/mw_util.h2
-rw-r--r--protocols/Sametime/src/meanwhile/src/service.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/session.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_aware.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_conf.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_dir.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_ft.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_im.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_place.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_resolve.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/srvc_store.c2
-rw-r--r--protocols/Sametime/src/meanwhile/src/st_list.c2
-rw-r--r--protocols/Sametime/src/messaging.cpp2
-rw-r--r--protocols/Sametime/src/options.cpp2
-rw-r--r--protocols/Sametime/src/places.cpp2
-rw-r--r--protocols/Sametime/src/resource.h2
-rw-r--r--protocols/Sametime/src/sametime.cpp2
-rw-r--r--protocols/Sametime/src/sametime.h2
-rw-r--r--protocols/Sametime/src/sametime_proto.cpp2
-rw-r--r--protocols/Sametime/src/sametime_proto.h2
-rw-r--r--protocols/Sametime/src/sametime_session.cpp2
-rw-r--r--protocols/Sametime/src/session_announce_win.cpp2
-rw-r--r--protocols/Sametime/src/userlist.cpp2
-rw-r--r--protocols/Sametime/src/utils.cpp2
-rw-r--r--protocols/Sametime/src/version.h2
245 files changed, 245 insertions, 245 deletions
diff --git a/protocols/Sametime/src/StdAfx.cpp b/protocols/Sametime/src/StdAfx.cpp
index 287357e7a4..ad64bb0652 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 3eae2826f9..5a19f18e2b 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 c79baf20cb..0b75094638 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 6d4813dbca..26d0dbab5f 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 3c18c15003..0a2032bcac 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 1fb52d66d7..c0b5781f27 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 26b6cb1e54..389bf83a0e 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 237665b4ed..ea6e096d51 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 8876836a6f..748846b59b 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 ac9a354b77..c22e77ff09 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 6bc51f797e..f5305a1b97 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 97672e71f5..74ddbc2569 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 9da43e36da..2e4ce85ce4 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 9f28ceecaf..3ed534e30e 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 845c866865..0275774133 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 ddd39b8a3a..9c3b756c8c 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 ae16ef8699..eb460e8ae5 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 43a0c46a21..737eebcf78 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 8a492de363..b2e06f8c20 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 930389a674..d8bf37a885 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 1b8c41733c..180a4c3d64 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 5f6a67fd84..aa600a7fd1 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 db2a8bcb1f..6f73a84800 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 f663ebf27f..ae0e4e6358 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 1ad893c4ac..70b5e4b112 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 f7e30441cf..9c52dd8a8b 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 6bb29b73c8..cd7fd85a02 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 6a6163cd6d..1b2533eb44 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 7d60d5888c..782644bfd7 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 b0d10c1ad2..633127a363 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 57aea103f7..72fa52a926 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 710e6c0662..26caed1b9e 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 04c024fc5a..03056d2595 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 52a3dd8617..9e493d424d 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 e4c20d77d5..342305126e 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 cd3a51eac6..59d0709f27 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 2733ffb033..b5c168378d 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 80d0ccf8f0..5ae561bfd9 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 2fab2f27f3..d600bbf6c8 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 cb1f566155..d6c2cf964c 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 7df91180c2..16cff592b1 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 b76df89c7e..e69fb0d91b 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 dea3dde7da..ab368b6a0c 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 6aab68b77b..99c4132119 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 85e989695a..3654b042b2 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 1f39739100..b0e0546108 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 b303487782..a773344c47 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 6965cbf020..616acdf21e 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 d8f9d3bea1..fa1dec6a9f 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 5f2df05bde..ea74e3c666 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 9128721bcf..522017e36e 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 1406b58039..b8b1804901 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 5577fc3e21..c2fbe5370d 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 c0361958f4..d51a5ee3f6 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 0349da364b..7da9fb2757 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 ca002a7221..0468bcf62c 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 c710046ee7..34ba4971ef 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 e70e40a5ed..485cd230c1 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 2a40aa29ae..c1f46ba20a 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 72a3ed4df6..366636b07c 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 3a0b92655e..5c36cd52f0 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 fa20c5a8b4..eb9ef80f1c 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 e16dc61272..a247b788b9 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 10cff1b0ea..44a1339e5e 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 06d0190b24..4928c73458 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 789e88d694..4754189b0a 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 2fa4af628f..035080b426 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 6d79a268e7..eef1461eb9 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 c8f7434637..e8be8ce2e4 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 e74ed96f15..6ce659b997 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 9f9c25dcb1..06f9f2976f 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 5bba96d60d..9dd24e19fc 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 24c6171fe6..50e47fefe0 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 540ae5d91f..766f2e68b7 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 dbb3f89e6a..6fbbd9ff83 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 1ad1ba8b2f..c1f03b60c7 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 7bfc08641c..a96c68dcd7 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 7212ae49db..b4728d7aa5 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 01d953e6c5..22d6833bdd 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 f9592ba1a1..6e633121b9 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 9acaec6375..33dcbbd4f2 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 dd8f18a7ce..b3f32b019c 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 22d19379c7..f592544d76 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 205d47c763..993d154230 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 765d98ce57..eec651b84b 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 88f3e0eb11..cb3dce02ea 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 75a2a5497f..47cacc4402 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 082567568a..7b6a0acbe7 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 961b0816d5..153e81cab5 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 ab414782dc..6e3fc3ae1d 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 b3392999f7..f273d0a9cc 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 a7be56f488..e67599aa21 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 d37027a670..07b279d629 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 65f1bc13dd..f2f4209770 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 f09c7e1570..48d94584f9 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 557d8f7130..3d4714b585 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 1c37e98e6f..e1aac6bb8c 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 b653d713f0..d348892930 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 e9410c7ded..6e7eeb339a 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 cc79381a69..399674d128 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 6698c5606a..4e8e62cc07 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 af5728602b..c78b3484dd 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 7ef15d3d8d..175b7a25d4 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 d96870fb44..fcb977883e 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 0c975a1eed..cabb0f0aa3 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 25508167f9..d6549c7c85 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 3a47a584ee..626d2619c1 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 a0cbe2fd72..f40fced7bc 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 5e5535e902..ac08f75fae 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 e78488fb65..b3ac702584 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 c00d70868d..68acc24cf8 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 07907dfc17..156558337b 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 45f24fec97..1dc738d6fc 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 ce1b44a972..3f5fb9b82a 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 59d5bbbfc4..3b9ee0a28c 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 5cb8d09d4b..82ce91afb3 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 1234a60b26..301254e496 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 3b7ad6fab0..037d5e8ba7 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 b63e2da550..27c51f2e0c 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 8b28ce79a7..2d31e1973b 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 fa79066e06..f5f6c76bb8 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 1461f29ba2..d2ba312019 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 130f1008c8..9a7dbb2532 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 05de6b3681..2a55086086 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 962199e099..43dbb5d7ac 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 dfbd354403..51bc7059aa 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 8b01faf5cd..280730dfe7 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 dca4499fb6..4b21548e70 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 87d4423e6d..c27819c6a0 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 d13d9906f1..8fa8570e71 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 dca4499fb6..4b21548e70 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 d8641ffd0f..32ad66626c 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 4c48862527..2f7f37744b 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 9836b34242..02ac35e00c 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 fb5a9fb593..d1e94cea77 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 b92eb6c490..df27823f5f 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 04f686b401..a481236672 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 5c7332a3c4..c5e572f3ff 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 9b25fb614b..2cddfa8571 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 2b1dd6ece2..d30761230d 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 12e576c61a..e7dfb3c371 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 c5754ec0c0..52e29e96af 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 b441fe08bc..67dd02156b 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 2a00c60a9b..6d181b32fa 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 82d40c0b85..8a82d47c7c 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 3bab274192..54103607c6 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 d5864241e6..4659929e82 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 c75924c257..2a883bd0a8 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 843b983144..86ad1293fb 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 743eed1f90..577fef1a28 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 a909fc5f45..ab49450a7e 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 1032a3c09c..35b3aabdbb 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 767d310c88..df30ea46d6 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 8a4387f79b..7f93282d4a 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 db06ba3b82..344bcebee3 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 e616f9988c..21d4447680 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 4b4f0e2faf..f390155ec4 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 37be2af8cf..faae717f60 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 044a44ff45..6773c62849 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 4ca7bd3017..a702c1eac8 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 c6cca842c2..541d57cdce 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 165ecbc250..38fa5f9533 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 23a9087b7f..9ce37dc7fe 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 0bd7ced2c8..7d29540605 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 135d10742e..24210c04b4 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 639057434d..27c32f2c1c 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 6a77244c6d..786736163a 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 bbc8f8800a..2f61daa079 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 98f4707161..4930d3cc87 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 49bbadbee0..3a815592b7 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 90281579c6..d9f579d08d 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 6f019307a4..5e0b786b7c 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 33c0ef313a..7461601d12 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 66a080af48..ac7d672480 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 c38732d685..b9a81a4d7d 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 68128e2da1..d54c7eeb36 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 f26b118d5c..8ea573360e 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 e333597069..076f04d28d 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 528492b685..7ffd458fa4 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 b33d60eef1..ef5c383b32 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 124fa46b59..7263013817 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 c5998d39ec..1b04324219 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 7c7b54412c..cc7c45614e 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 88e9a4b4ff..a630b0b07a 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 5793335478..dc71fa31bd 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 686241e742..8a30ca02d0 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 a80a106e80..3e66d0d00c 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 674aa3ab72..4020fc0c55 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 89b6c92af8..019f64a8e2 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 82d96e7d27..0569a4c1ce 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 098d8542e3..d35743f18b 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 4ab1653533..3f02499e04 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 07334c18e7..1899abd027 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 8e5bd6f042..7b3c72f02f 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 555edd2c1c..d98b671d28 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 23977c6626..2250b9ed40 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 f9afec4c9b..cfaecd1c23 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 6972c8878d..681c858338 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 137047ca77..3a18923291 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 3a18c99050..ccdf5cf0f7 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 0e7cc527a1..14a6573e25 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 7af5e22d86..b9b3316875 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 a75781397e..38894bf6e6 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 6138ce1b4d..4e7967510a 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 d22d2876eb..cb84bbb6e0 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 e1919c11c8..000047a3eb 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 e53cc0c996..aa6e3bf620 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 a825ec271b..6e55842d5f 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 9bcd6509db..9a7cf8a5a2 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 e606e0ca98..5065008a9e 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 0d5090d258..412ecd2f24 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 ea162e6e73..771ce3d0de 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 c45e850232..d8a9523629 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 aef7de886a..0887661de0 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 adb710e32c..9bd6331cd5 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 bba97b61e9..3283692222 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 5429640a1e..7c621f4bdb 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 b55ddf21fe..a8524e5ef9 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 d54de15bac..535ca933dd 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 57c1845b38..b8f0a5a16b 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 a94b85131f..cd75d59b83 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 9ff8d8639f..c4f4ea4263 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 d02d3a09bd..6688d9635a 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 8c399b9832..a7e2b457b3 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 46d12fd849..4c421fd687 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 be944429cf..4a84ee0d7c 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 df623e5181..e4d3ee6fc2 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 c200487812..345453fd53 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 d07e886bc9..1b33165d6f 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 3a282291cc..1f910d5701 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 edfd0281ef..af792adbc2 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 186d5a39a3..106a126fa8 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 9b0fa0b9fb..57d1efdc0e 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 188f0afd79..541320b2f3 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 8b3a030ed1..0110a8f174 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 761b400d0d..79356b96cd 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 0987008bec..ff9c9d2599 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 2458028af0..aa7b4d36db 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 3fb384cb38..8df09daf9e 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 f822118c88..35bae49b43 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 3646cc2f34..f030fa195b 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 45c4dffa2d..5e9e72a821 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 a61398189a..ca3062933c 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 17f545cf96..f129a09ebe 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 fc60a0cfff..36fa301b78 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