Merge 0.9.12-incubating changes back to master.

configure.ac

@@ -18,7 +18,7 @@
 #
 
 AC_PREREQ([2.61])
-AC_INIT([guacamole-server], [0.9.11-incubating])
+AC_INIT([guacamole-server], [0.9.12-incubating])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])
 

doc/Doxyfile

@@ -22,7 +22,7 @@
 #
 
 PROJECT_NAME   = libguac
-PROJECT_NUMBER = 0.9.11-incubating
+PROJECT_NUMBER = 0.9.12-incubating
 
 #
 # Warn about undocumented parameters and return values, but do not fill output

src/common-ssh/Makefile.am

@@ -23,18 +23,18 @@ ACLOCAL_AMFLAGS = -I m4
 noinst_LTLIBRARIES = libguac_common_ssh.la
 
 libguac_common_ssh_la_SOURCES = \
-    guac_sftp.c                 \
+    buffer.c                    \
-    guac_ssh.c                  \
+    sftp.c                      \
-    guac_ssh_buffer.c           \
+    ssh.c                       \
-    guac_ssh_key.c              \
+    key.c                       \
-    guac_ssh_user.c
+    user.c
 
-noinst_HEADERS =      \
+noinst_HEADERS =        \
-    guac_sftp.h       \
+    common-ssh/buffer.h \
-    guac_ssh.h        \
+    common-ssh/key.h    \
-    guac_ssh_buffer.h \
+    common-ssh/sftp.h   \
-    guac_ssh_key.h    \
+    common-ssh/ssh.h    \
-    guac_ssh_user.h
+    common-ssh/user.h
 
 libguac_common_ssh_la_CFLAGS = \
     -Werror -Wall -pedantic    \

src/common-ssh/common-ssh/sftp.h

@@ -21,7 +21,7 @@
 #define GUAC_COMMON_SSH_SFTP_H
 
 #include "common/json.h"
-#include "guac_ssh.h"
+#include "ssh.h"
 
 #include <guacamole/object.h>
 #include <guacamole/user.h>

src/common-ssh/common-ssh/ssh.h

@@ -20,7 +20,7 @@
 #ifndef GUAC_COMMON_SSH_H
 #define GUAC_COMMON_SSH_H
 
-#include "guac_ssh_user.h"
+#include "user.h"
 
 #include <guacamole/client.h>
 #include <libssh2.h>

src/common-ssh/common-ssh/user.h

@@ -20,7 +20,7 @@
 #ifndef GUAC_COMMON_SSH_USER_H
 #define GUAC_COMMON_SSH_USER_H
 
-#include "guac_ssh_key.h"
+#include "key.h"
 
 /**
  * Data describing an SSH user, including their credentials.

src/common-ssh/key.c

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include "guac_ssh_buffer.h"
+#include "common-ssh/buffer.h"
-#include "guac_ssh_key.h"
+#include "common-ssh/key.h"
 
 #include <openssl/bio.h>
 #include <openssl/bn.h>

src/common-ssh/sftp.c

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/ssh.h"
 
 #include <guacamole/client.h>
 #include <guacamole/object.h>

src/common-ssh/ssh.c

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include "guac_ssh.h"
+#include "common-ssh/key.h"
-#include "guac_ssh_key.h"
+#include "common-ssh/ssh.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/user.h"
 
 #include <guacamole/client.h>
 #include <libssh2.h>

src/common-ssh/user.c

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "guac_ssh_key.h"
+#include "common-ssh/key.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/user.h"
 
 #include <stdlib.h>
 #include <string.h>

src/libguac/Makefile.am

@@ -104,7 +104,7 @@ libguac_la_CFLAGS = \
     -Werror -Wall -pedantic -Iguacamole
 
 libguac_la_LDFLAGS =     \
-    -version-info 12:1:0 \
+    -version-info 13:0:1 \
     @CAIRO_LIBS@         \
     @JPEG_LIBS@          \
     @PNG_LIBS@           \

src/protocols/rdp/client.c

@@ -27,9 +27,9 @@
 #include "user.h"
 
 #ifdef ENABLE_COMMON_SSH
-#include <guac_sftp.h>
+#include "common-ssh/sftp.h"
-#include <guac_ssh.h>
+#include "common-ssh/ssh.h"
-#include <guac_ssh_user.h>
+#include "common-ssh/user.h"
 #endif
 
 #include <freerdp/cache/cache.h>

src/protocols/rdp/rdp.c

@@ -41,9 +41,9 @@
 #include "rdp_svc.h"
 
 #ifdef ENABLE_COMMON_SSH
-#include <guac_sftp.h>
+#include "common-ssh/sftp.h"
-#include <guac_ssh.h>
+#include "common-ssh/ssh.h"
-#include <guac_ssh_user.h>
+#include "common-ssh/user.h"
 #endif
 
 #include <freerdp/cache/bitmap.h>

src/protocols/rdp/rdp.h

@@ -39,9 +39,9 @@
 #include <guacamole/client.h>
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/ssh.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/user.h"
 #endif
 
 #include <pthread.h>

src/protocols/rdp/sftp.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "rdp.h"
 #include "sftp.h"
 

src/protocols/ssh/client.c

@@ -20,9 +20,9 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "user.h"
 
 #include <langinfo.h>

src/protocols/ssh/clipboard.c

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "clipboard.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/stream.h>

src/protocols/ssh/input.c

@@ -22,7 +22,7 @@
 #include "common/cursor.h"
 #include "common/display.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/user.h>

src/protocols/ssh/sftp.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "sftp.h"
 #include "ssh.h"
 

src/protocols/ssh/ssh.c

@@ -20,12 +20,12 @@
 #include "config.h"
 
 #include "common/recording.h"
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/ssh.h"
 #include "settings.h"
 #include "sftp.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #ifdef ENABLE_SSH_AGENT
 #include "ssh_agent.h"

src/protocols/ssh/ssh.h

@@ -22,11 +22,11 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/ssh.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/user.h"
 #include "settings.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #ifdef ENABLE_SSH_AGENT
 #include "ssh_agent.h"

src/protocols/telnet/client.c

@@ -21,7 +21,7 @@
 #include "client.h"
 #include "settings.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "user.h"
 
 #include <langinfo.h>

src/protocols/telnet/client.h

@@ -21,7 +21,7 @@
 #define GUAC_TELNET__CLIENT_H
 
 #include "config.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <pthread.h>
 #include <regex.h>

src/protocols/telnet/clipboard.c

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "clipboard.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/stream.h>

src/protocols/telnet/input.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "input.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "telnet.h"
 
 #include <guacamole/client.h>

src/protocols/telnet/telnet.c

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "common/recording.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>

src/protocols/telnet/telnet.h

@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "settings.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <libtelnet.h>
 

src/protocols/telnet/user.c

@@ -23,7 +23,7 @@
 #include "input.h"
 #include "settings.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "user.h"
 
 #include <guacamole/client.h>

src/protocols/vnc/client.c

@@ -24,9 +24,9 @@
 #include "vnc.h"
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/ssh.h"
-#include "sftp.h"
+#include "common-ssh/user.h"
 #endif
 
 #ifdef ENABLE_PULSE

src/protocols/vnc/sftp.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
 #include "sftp.h"
 #include "vnc.h"
 

src/protocols/vnc/vnc.c

@@ -37,8 +37,8 @@
 #endif
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/ssh.h"
 #include "sftp.h"
 #endif
 

src/protocols/vnc/vnc.h

@@ -37,9 +37,9 @@
 #endif
 
 #ifdef ENABLE_COMMON_SSH
-#include "guac_sftp.h"
+#include "common-ssh/sftp.h"
-#include "guac_ssh.h"
+#include "common-ssh/ssh.h"
-#include "guac_ssh_user.h"
+#include "common-ssh/user.h"
 #endif
 
 #include <pthread.h>

src/terminal/Makefile.am

@@ -22,16 +22,16 @@ ACLOCAL_AMFLAGS = -I m4
 
 noinst_LTLIBRARIES = libguac_terminal.la
 
-noinst_HEADERS =                \
+noinst_HEADERS =                 \
-    buffer.h                    \
+    terminal/buffer.h            \
-    char_mappings.h             \
+    terminal/char_mappings.h     \
-    common.h                    \
+    terminal/common.h            \
-    display.h                   \
+    terminal/display.h           \
-    scrollbar.h                 \
+    terminal/scrollbar.h         \
-    terminal.h                  \
+    terminal/terminal.h          \
-    terminal_handlers.h         \
+    terminal/terminal_handlers.h \
-    types.h                     \
+    terminal/types.h             \
-    typescript.h
+    terminal/typescript.h
 
 libguac_terminal_la_SOURCES =   \
     buffer.c                    \

src/terminal/buffer.c

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include "buffer.h"
+#include "terminal/buffer.h"
-#include "common.h"
+#include "terminal/common.h"
 
 #include <stdlib.h>
 #include <string.h>

src/terminal/common.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "types.h"
+#include "terminal/types.h"
 
 #include <stdbool.h>
 #include <unistd.h>

src/terminal/display.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "common.h"
 #include "common/surface.h"
-#include "display.h"
+#include "terminal/common.h"
-#include "types.h"
+#include "terminal/display.h"
+#include "terminal/types.h"
 
 #include <math.h>
 #include <stdlib.h>

src/terminal/scrollbar.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "scrollbar.h"
+#include "terminal/scrollbar.h"
 
 #include <guacamole/client.h>
 #include <guacamole/layer.h>

src/terminal/terminal.c

@@ -19,15 +19,15 @@
 
 #include "config.h"
 
-#include "buffer.h"
-#include "common.h"
 #include "common/clipboard.h"
 #include "common/cursor.h"
-#include "display.h"
+#include "terminal/buffer.h"
-#include "terminal.h"
+#include "terminal/common.h"
-#include "terminal_handlers.h"
+#include "terminal/display.h"
-#include "types.h"
+#include "terminal/terminal.h"
-#include "typescript.h"
+#include "terminal/terminal_handlers.h"
+#include "terminal/types.h"
+#include "terminal/typescript.h"
 
 #include <errno.h>
 #include <pthread.h>

src/terminal/terminal_handlers.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "char_mappings.h"
+#include "terminal/char_mappings.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
-#include "terminal_handlers.h"
+#include "terminal/terminal_handlers.h"
-#include "types.h"
+#include "terminal/types.h"
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>

src/terminal/typescript.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "common/io.h"
-#include "typescript.h"
+#include "terminal/typescript.h"
 
 #include <guacamole/timestamp.h>