[gtk-vnc] Remove trailing whitespace at end of lines
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] Remove trailing whitespace at end of lines
- Date: Fri, 9 Dec 2011 17:43:00 +0000 (UTC)
commit 2b0eca7d54f2f379f4e2bf053650d3e98d21106d
Author: Daniel P. Berrange <berrange redhat com>
Date: Fri Dec 9 17:32:27 2011 +0000
Remove trailing whitespace at end of lines
examples/gvncviewer.c | 2 +-
examples/gvncviewer.pl | 2 +-
plugin/npapi.h | 42 +++++++++++++++++++++---------------------
plugin/npupp.h | 24 ++++++++++++------------
src/vncconnection.c | 4 ++--
tools/gvnccapture.c | 4 ++--
6 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
index c0ba95e..6d47d71 100644
--- a/examples/gvncviewer.c
+++ b/examples/gvncviewer.c
@@ -696,7 +696,7 @@ int main(int argc, char **argv)
} else
snprintf(port, sizeof(port), "%d", 5900);
- if (!*hostname)
+ if (!*hostname)
snprintf(hostname, sizeof(hostname), "%s", "127.0.0.1");
vnc_display_open_host(VNC_DISPLAY(vnc), hostname, port);
vnc_display_set_keyboard_grab(VNC_DISPLAY(vnc), TRUE);
diff --git a/examples/gvncviewer.pl b/examples/gvncviewer.pl
index d2a09c0..1e15898 100755
--- a/examples/gvncviewer.pl
+++ b/examples/gvncviewer.pl
@@ -12,5 +12,5 @@ my $dpy = GtkVnc::Display->new();
$win->set_title("GTK-VNC with Perl");
$win->add($dpy);
$dpy->open_host("localhost", "5900");
-$win->show_all;
+$win->show_all;
Gtk3::main;
diff --git a/plugin/npapi.h b/plugin/npapi.h
index 5da7aae..20582b8 100644
--- a/plugin/npapi.h
+++ b/plugin/npapi.h
@@ -64,12 +64,12 @@
#define _UINT32
#endif
-/*
- * NO_NSPR_10_SUPPORT disables the inclusion
- * of obsolete/protypes.h, whose int16, uint16,
- * int32, and uint32 typedefs conflict with those
- * in this file.
- */
+/*
+ * NO_NSPR_10_SUPPORT disables the inclusion
+ * of obsolete/protypes.h, whose int16, uint16,
+ * int32, and uint32 typedefs conflict with those
+ * in this file.
+ */
#ifndef NO_NSPR_10_SUPPORT
#define NO_NSPR_10_SUPPORT
#endif
@@ -107,7 +107,7 @@
#endif
#endif
-#if defined(XP_UNIX)
+#if defined(XP_UNIX)
# include <stdio.h>
# if defined(MOZ_X11)
# include <X11/Xlib.h>
@@ -291,11 +291,11 @@ typedef struct _NPRect
uint16 right;
} NPRect;
-typedef struct _NPSize
-{
- int32 width;
- int32 height;
-} NPSize;
+typedef struct _NPSize
+{
+ int32 width;
+ int32 height;
+} NPSize;
#ifdef XP_UNIX
/*
@@ -338,21 +338,21 @@ typedef struct
/*
- * The following masks are applied on certain platforms to NPNV and
- * NPPV selectors that pass around pointers to COM interfaces. Newer
- * compilers on some platforms may generate vtables that are not
- * compatible with older compilers. To prevent older plugins from
- * not understanding a new browser's ABI, these masks change the
+ * The following masks are applied on certain platforms to NPNV and
+ * NPPV selectors that pass around pointers to COM interfaces. Newer
+ * compilers on some platforms may generate vtables that are not
+ * compatible with older compilers. To prevent older plugins from
+ * not understanding a new browser's ABI, these masks change the
* values of those selectors on those platforms. To remain backwards
- * compatible with differenet versions of the browser, plugins can
+ * compatible with differenet versions of the browser, plugins can
* use these masks to dynamically determine and use the correct C++
- * ABI that the browser is expecting. This does not apply to Windows
+ * ABI that the browser is expecting. This does not apply to Windows
* as Microsoft's COM ABI will likely not change.
*/
#define NP_ABI_GCC3_MASK 0x10000000
/*
- * gcc 3.x generated vtables on UNIX and OSX are incompatible with
+ * gcc 3.x generated vtables on UNIX and OSX are incompatible with
* previous compilers.
*/
#if (defined (XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3))
@@ -368,7 +368,7 @@ typedef struct
* different than CFM. In addition to having a different
* C++ ABI, it also has has different C calling convention.
* You must use glue code when calling between CFM and
- * Mach-O C functions.
+ * Mach-O C functions.
*/
#if (defined(TARGET_RT_MAC_MACHO))
#define _NP_ABI_MIXIN_FOR_MACHO NP_ABI_MACHO_MASK
diff --git a/plugin/npupp.h b/plugin/npupp.h
index e1755a3..dab1e39 100644
--- a/plugin/npupp.h
+++ b/plugin/npupp.h
@@ -258,7 +258,7 @@ typedef void (* NP_LOADDS NPN_StatusUPP)(NPP instance, const char* message);
#define NewNPN_StatusProc(FUNC) \
((NPN_StatusUPP) (FUNC))
#define CallNPN_StatusProc(FUNC, npp, msg) \
- (*(FUNC))((npp), (msg))
+ (*(FUNC))((npp), (msg))
/* NPN_UserAgent */
typedef const char* (* NP_LOADDS NPN_UserAgentUPP)(NPP instance);
@@ -272,28 +272,28 @@ typedef void* (* NP_LOADDS NPN_MemAllocUPP)(uint32 size);
#define NewNPN_MemAllocProc(FUNC) \
((NPN_MemAllocUPP) (FUNC))
#define CallNPN_MemAllocProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+ (*(FUNC))((ARG1))
/* NPN__MemFree */
typedef void (* NP_LOADDS NPN_MemFreeUPP)(void* ptr);
#define NewNPN_MemFreeProc(FUNC) \
((NPN_MemFreeUPP) (FUNC))
#define CallNPN_MemFreeProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+ (*(FUNC))((ARG1))
/* NPN_MemFlush */
typedef uint32 (* NP_LOADDS NPN_MemFlushUPP)(uint32 size);
#define NewNPN_MemFlushProc(FUNC) \
((NPN_MemFlushUPP) (FUNC))
#define CallNPN_MemFlushProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+ (*(FUNC))((ARG1))
/* NPN_ReloadPlugins */
typedef void (* NP_LOADDS NPN_ReloadPluginsUPP)(NPBool reloadPages);
#define NewNPN_ReloadPluginsProc(FUNC) \
((NPN_ReloadPluginsUPP) (FUNC))
#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+ (*(FUNC))((ARG1))
/* NPN_GetJavaEnv */
#ifdef OJI
@@ -302,7 +302,7 @@ typedef JRIEnv* (* NP_LOADDS NPN_GetJavaEnvUPP)(void);
#define NewNPN_GetJavaEnvProc(FUNC) \
((NPN_GetJavaEnvUPP) (FUNC))
#define CallNPN_GetJavaEnvProc(FUNC) \
- (*(FUNC))()
+ (*(FUNC))()
/* NPN_GetJavaPeer */
#ifdef OJI
@@ -311,28 +311,28 @@ typedef jref (* NP_LOADDS NPN_GetJavaPeerUPP)(NPP instance);
#define NewNPN_GetJavaPeerProc(FUNC) \
((NPN_GetJavaPeerUPP) (FUNC))
#define CallNPN_GetJavaPeerProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+ (*(FUNC))((ARG1))
/* NPN_InvalidateRect */
typedef void (* NP_LOADDS NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
#define NewNPN_InvalidateRectProc(FUNC) \
((NPN_InvalidateRectUPP) (FUNC))
#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \
- (*(FUNC))((ARG1), (ARG2))
+ (*(FUNC))((ARG1), (ARG2))
/* NPN_InvalidateRegion */
typedef void (* NP_LOADDS NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
#define NewNPN_InvalidateRegionProc(FUNC) \
((NPN_InvalidateRegionUPP) (FUNC))
#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \
- (*(FUNC))((ARG1), (ARG2))
+ (*(FUNC))((ARG1), (ARG2))
/* NPN_ForceRedraw */
typedef void (* NP_LOADDS NPN_ForceRedrawUPP)(NPP instance);
#define NewNPN_ForceRedrawProc(FUNC) \
((NPN_ForceRedrawUPP) (FUNC))
#define CallNPN_ForceRedrawProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+ (*(FUNC))((ARG1))
/* NPN_GetStringIdentifier */
typedef NPIdentifier (* NP_LOADDS NPN_GetStringIdentifierUPP)(const NPUTF8* name);
@@ -467,7 +467,7 @@ typedef void (* NP_LOADDS NPN_SetExceptionUPP)(NPObject *obj, const NPUTF8 *mess
#define NewNPN_SetExceptionProc(FUNC) \
((NPN_SetExceptionUPP) (FUNC))
#define CallNPN_SetExceptionProc(FUNC, ARG1, ARG2) \
- (*(FUNC))((ARG1), (ARG2))
+ (*(FUNC))((ARG1), (ARG2))
/* NPN_PushPopupsEnabledStateUPP */
typedef bool (* NP_LOADDS NPN_PushPopupsEnabledStateUPP)(NPP npp, NPBool enabled);
@@ -606,7 +606,7 @@ typedef NPError (* NP_LOADDS NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*,
* These can be called to retreive MIME information from the plugin dynamically
*
* Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
- * to get mime info from the plugin only on OSX and may not be supported
+ * to get mime info from the plugin only on OSX and may not be supported
* in furture version -- use NP_GetMIMEDescription instead
*/
diff --git a/src/vncconnection.c b/src/vncconnection.c
index 0addf82..47d24d4 100644
--- a/src/vncconnection.c
+++ b/src/vncconnection.c
@@ -2999,7 +2999,7 @@ static gboolean vnc_connection_server_message(VncConnection *conn)
green = vnc_connection_read_u16(conn);
blue = vnc_connection_read_u16(conn);
- vnc_color_map_set(map,
+ vnc_color_map_set(map,
i + first_color,
red, green, blue);
}
@@ -3445,7 +3445,7 @@ static gboolean vnc_connection_perform_auth_ard(VncConnection *conn)
gcry_randomize(userpass, sizeof(userpass), GCRY_STRONG_RANDOM);
memcpy(userpass, priv->cred_username, usernameLen);
memcpy(userpass+sizeof(userpass)/2, priv->cred_password, passwordLen);
-
+
error=gcry_cipher_open(&aes, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_ECB, 0);
if (gcry_err_code (error) != GPG_ERR_NO_ERROR) {
VNC_DEBUG("gcry_cipher_open error: %s\n", gcry_strerror(error));
diff --git a/tools/gvnccapture.c b/tools/gvnccapture.c
index c45b7ff..19dbc14 100644
--- a/tools/gvnccapture.c
+++ b/tools/gvnccapture.c
@@ -60,7 +60,7 @@
=head1 EXAMPLES
# gvnccapture localhost:1 desktop.png
- Password:
+ Password:
Connected to localhost:1
Saved display to desktop.png
@@ -265,7 +265,7 @@ static void do_vnc_desktop_resize(VncConnection *conn,
/* We'll fix our local copy as rgb888 */
capture->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- TRUE,
+ TRUE,
8,
width,
height);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]