GUACAMOLE-169: Use proper namespace for internal common headers.

src/common-ssh/guac_sftp.h

@@ -20,7 +20,7 @@
 #ifndef GUAC_COMMON_SSH_SFTP_H
 #define GUAC_COMMON_SSH_SFTP_H
 
-#include "guac_json.h"
+#include "common/json.h"
 #include "guac_ssh.h"
 
 #include <guacamole/object.h>

src/common/Makefile.am

@@ -22,39 +22,39 @@ ACLOCAL_AMFLAGS = -I m4
 
 noinst_LTLIBRARIES = libguac_common.la
 
-noinst_HEADERS =          \
-    guac_io.h             \
-    guac_blank_cursor.h   \
-    guac_clipboard.h      \
-    guac_cursor.h         \
-    guac_display.h        \
-    guac_dot_cursor.h     \
-    guac_ibar_cursor.h    \
-    guac_iconv.h          \
-    guac_json.h           \
-    guac_list.h           \
-    guac_pointer_cursor.h \
-    guac_recording.h      \
-    guac_rect.h           \
-    guac_string.h         \
-    guac_surface.h
+noinst_HEADERS =            \
+    common/io.h             \
+    common/blank_cursor.h   \
+    common/clipboard.h      \
+    common/cursor.h         \
+    common/display.h        \
+    common/dot_cursor.h     \
+    common/ibar_cursor.h    \
+    common/iconv.h          \
+    common/json.h           \
+    common/list.h           \
+    common/pointer_cursor.h \
+    common/recording.h      \
+    common/rect.h           \
+    common/string.h         \
+    common/surface.h
 
 libguac_common_la_SOURCES = \
-    guac_io.c               \
-    guac_blank_cursor.c     \
-    guac_clipboard.c        \
-    guac_cursor.c           \
-    guac_display.c          \
-    guac_dot_cursor.c       \
-    guac_ibar_cursor.c      \
-    guac_iconv.c            \
-    guac_json.c             \
-    guac_list.c             \
-    guac_pointer_cursor.c   \
-    guac_recording.c        \
-    guac_rect.c             \
-    guac_string.c           \
-    guac_surface.c
+    io.c                    \
+    blank_cursor.c          \
+    clipboard.c             \
+    cursor.c                \
+    display.c               \
+    dot_cursor.c            \
+    ibar_cursor.c           \
+    iconv.c                 \
+    json.c                  \
+    list.c                  \
+    pointer_cursor.c        \
+    recording.c             \
+    rect.c                  \
+    string.c                \
+    surface.c
 
 libguac_common_la_CFLAGS =  \
     -Werror -Wall -pedantic \

src/common/clipboard.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_clipboard.h"
+#include "common/clipboard.h"
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>

src/common/common/cursor.h

@@ -21,7 +21,7 @@
 #ifndef GUAC_COMMON_CURSOR_H
 #define GUAC_COMMON_CURSOR_H
 
-#include "guac_surface.h"
+#include "surface.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>

src/common/common/display.h

@@ -20,8 +20,8 @@
 #ifndef GUAC_COMMON_DISPLAY_H
 #define GUAC_COMMON_DISPLAY_H
 
-#include "guac_cursor.h"
-#include "guac_surface.h"
+#include "cursor.h"
+#include "surface.h"
 
 #include <guacamole/client.h>
 #include <guacamole/socket.h>

src/common/common/surface.h

@@ -21,7 +21,7 @@
 #define __GUAC_COMMON_SURFACE_H
 
 #include "config.h"
-#include "guac_rect.h"
+#include "rect.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>

src/common/cursor.c

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-#include "guac_blank_cursor.h"
-#include "guac_dot_cursor.h"
-#include "guac_cursor.h"
-#include "guac_ibar_cursor.h"
-#include "guac_pointer_cursor.h"
-#include "guac_surface.h"
+#include "common/blank_cursor.h"
+#include "common/dot_cursor.h"
+#include "common/cursor.h"
+#include "common/ibar_cursor.h"
+#include "common/pointer_cursor.h"
+#include "common/surface.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>

src/common/display.c

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include "guac_cursor.h"
-#include "guac_display.h"
-#include "guac_surface.h"
+#include "common/cursor.h"
+#include "common/display.h"
+#include "common/surface.h"
 
 #include <guacamole/client.h>
 #include <guacamole/socket.h>

src/common/iconv.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_iconv.h"
+#include "common/iconv.h"
 
 #include <guacamole/unicode.h>
 #include <stdint.h>

src/common/io.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_io.h"
+#include "common/io.h"
 
 #include <unistd.h>
 

src/common/json.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_json.h"
+#include "common/json.h"
 
 #include <assert.h>
 #include <stdlib.h>

src/common/list.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_list.h"
+#include "common/list.h"
 
 #include <stdlib.h>
 #include <pthread.h>

src/common/recording.c

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "guac_recording.h"
+#include "common/recording.h"
 
 #include <guacamole/client.h>
 #include <guacamole/socket.h>

src/common/rect.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_rect.h"
+#include "common/rect.h"
 
 void guac_common_rect_init(guac_common_rect* rect, int x, int y, int width, int height) {
     rect->x      = x;

src/common/string.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_string.h"
+#include "common/string.h"
 
 #include <stdlib.h>
 #include <string.h>

src/common/surface.c

@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "guac_rect.h"
-#include "guac_surface.h"
+#include "common/rect.h"
+#include "common/surface.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>

src/guacd/proc-map.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_list.h"
+#include "common/list.h"
 #include "proc.h"
 #include "proc-map.h"
 #include "user.h"

src/guacd/proc-map.h

@@ -22,7 +22,7 @@
 #define _GUACD_PROC_MAP_H
 
 #include "config.h"
-#include "guac_list.h"
+#include "common/list.h"
 #include "proc.h"
 #include "user.h"
 

src/protocols/rdp/dvc.c

@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
+#include "common/list.h"
 #include "dvc.h"
-#include "guac_list.h"
 #include "rdp.h"
 
 #include <freerdp/channels/channels.h>

src/protocols/rdp/dvc.h

@@ -21,7 +21,7 @@
 #define GUAC_RDP_DVC_H
 
 #include "config.h"
-#include "guac_list.h"
+#include "common/list.h"
 
 #include <freerdp/freerdp.h>
 

src/protocols/rdp/rdp.c

@@ -21,10 +21,10 @@
 
 #include "audio_input.h"
 #include "client.h"
+#include "common/cursor.h"
+#include "common/display.h"
+#include "common/recording.h"
 #include "dvc.h"
-#include "guac_cursor.h"
-#include "guac_display.h"
-#include "guac_recording.h"
 #include "keyboard.h"
 #include "rdp.h"
 #include "rdp_bitmap.h"

src/protocols/rdp/rdp.h

@@ -23,10 +23,10 @@
 #include "config.h"
 
 #include "audio_input.h"
-#include "guac_clipboard.h"
-#include "guac_display.h"
-#include "guac_surface.h"
-#include "guac_list.h"
+#include "common/clipboard.h"
+#include "common/display.h"
+#include "common/list.h"
+#include "common/surface.h"
 #include "keyboard.h"
 #include "rdp_disp.h"
 #include "rdp_fs.h"

src/protocols/rdp/rdp_bitmap.c

@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_display.h"
-#include "guac_surface.h"
+#include "common/display.h"
+#include "common/surface.h"
 #include "rdp.h"
 #include "rdp_bitmap.h"
 #include "rdp_settings.h"

src/protocols/rdp/rdp_bitmap.h

@@ -22,7 +22,7 @@
 #define _GUAC_RDP_RDP_BITMAP_H
 
 #include "config.h"
-#include "guac_display.h"
+#include "common/display.h"
 
 #include <freerdp/freerdp.h>
 #include <guacamole/layer.h>

src/protocols/rdp/rdp_cliprdr.c

@@ -20,10 +20,10 @@
 #include "config.h"
 
 #include "client.h"
+#include "common/clipboard.h"
+#include "common/iconv.h"
 #include "rdp.h"
 #include "rdp_cliprdr.h"
-#include "guac_clipboard.h"
-#include "guac_iconv.h"
 
 #include <freerdp/channels/channels.h>
 #include <freerdp/freerdp.h>

src/protocols/rdp/rdp_gdi.c

@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_surface.h"
+#include "common/surface.h"
 #include "rdp.h"
 #include "rdp_bitmap.h"
 #include "rdp_color.h"

src/protocols/rdp/rdp_glyph.c

@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_surface.h"
+#include "common/surface.h"
 #include "rdp.h"
 #include "rdp_color.h"
 #include "rdp_glyph.h"

src/protocols/rdp/rdp_pointer.c

@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_cursor.h"
-#include "guac_display.h"
+#include "common/cursor.h"
+#include "common/display.h"
 #include "rdp.h"
 #include "rdp_pointer.h"
 

src/protocols/rdp/rdp_pointer.h

@@ -22,7 +22,7 @@
 #define _GUAC_RDP_RDP_POINTER_H
 
 #include "config.h"
-#include "guac_display.h"
+#include "common/display.h"
 
 #include <freerdp/freerdp.h>
 

src/protocols/rdp/rdp_settings.c

@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_string.h"
+#include "common/string.h"
 #include "rdp.h"
 #include "rdp_settings.h"
 #include "resolution.h"

src/protocols/rdp/rdp_stream.c

@@ -20,7 +20,7 @@
 
 #include "config.h"
 #include "client.h"
-#include "guac_clipboard.h"
+#include "common/clipboard.h"
 #include "rdp.h"
 #include "rdp_fs.h"
 #include "rdp_svc.h"

src/protocols/rdp/rdp_stream.h

@@ -22,7 +22,7 @@
 #define _GUAC_RDP_STREAM_H
 
 #include "config.h"
-#include "guac_json.h"
+#include "common/json.h"
 #include "rdp_svc.h"
 
 #include <guacamole/user.h>

src/protocols/rdp/rdp_svc.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "client.h"
-#include "guac_list.h"
+#include "common/list.h"
 #include "rdp.h"
 #include "rdp_svc.h"
 

src/protocols/rdp/user.c

@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "audio_input.h"
+#include "common/display.h"
 #include "input.h"
-#include "guac_display.h"
 #include "user.h"
 #include "rdp.h"
 #include "rdp_settings.h"

src/protocols/ssh/input.c

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include "guac_cursor.h"
-#include "guac_display.h"
+#include "common/cursor.h"
+#include "common/display.h"
 #include "ssh.h"
 #include "terminal.h"
 

src/protocols/ssh/ssh.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "guac_recording.h"
+#include "common/recording.h"
 #include "guac_sftp.h"
 #include "guac_ssh.h"
 #include "settings.h"

src/protocols/ssh/user.c

@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "clipboard.h"
+#include "common/display.h"
 #include "input.h"
-#include "guac_display.h"
 #include "user.h"
 #include "sftp.h"
 #include "ssh.h"

src/protocols/telnet/telnet.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_recording.h"
+#include "common/recording.h"
 #include "telnet.h"
 #include "terminal.h"
 

src/protocols/vnc/clipboard.c

@@ -20,8 +20,8 @@
 #include "config.h"
 #include "client.h"
 #include "clipboard.h"
-#include "guac_clipboard.h"
-#include "guac_iconv.h"
+#include "common/clipboard.h"
+#include "common/iconv.h"
 #include "user.h"
 #include "vnc.h"
 

src/protocols/vnc/cursor.c

@@ -20,9 +20,9 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_cursor.h"
-#include "guac_display.h"
-#include "guac_surface.h"
+#include "common/cursor.h"
+#include "common/display.h"
+#include "common/surface.h"
 #include "vnc.h"
 
 #include <cairo/cairo.h>

src/protocols/vnc/display.c

@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_iconv.h"
-#include "guac_surface.h"
+#include "common/iconv.h"
+#include "common/surface.h"
 #include "vnc.h"
 
 #include <cairo/cairo.h>

src/protocols/vnc/input.c

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include "guac_cursor.h"
-#include "guac_display.h"
+#include "common/cursor.h"
+#include "common/display.h"
 #include "vnc.h"
 
 #include <guacamole/user.h>

src/protocols/vnc/log.c

@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_iconv.h"
-#include "guac_surface.h"
+#include "common/iconv.h"
+#include "common/surface.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>

src/protocols/vnc/log.h

@@ -23,8 +23,8 @@
 #include "config.h"
 
 #include "client.h"
-#include "guac_iconv.h"
-#include "guac_surface.h"
+#include "common/iconv.h"
+#include "common/surface.h"
 
 #include <cairo/cairo.h>
 #include <guacamole/client.h>

src/protocols/vnc/user.c

@@ -21,9 +21,9 @@
 
 #include "clipboard.h"
 #include "input.h"
-#include "guac_display.h"
-#include "guac_dot_cursor.h"
-#include "guac_pointer_cursor.h"
+#include "common/display.h"
+#include "common/dot_cursor.h"
+#include "common/pointer_cursor.h"
 #include "user.h"
 #include "sftp.h"
 #include "vnc.h"

src/protocols/vnc/vnc.c

@@ -22,12 +22,12 @@
 #include "auth.h"
 #include "client.h"
 #include "clipboard.h"
+#include "common/clipboard.h"
+#include "common/cursor.h"
+#include "common/display.h"
+#include "common/recording.h"
 #include "cursor.h"
 #include "display.h"
-#include "guac_clipboard.h"
-#include "guac_cursor.h"
-#include "guac_display.h"
-#include "guac_recording.h"
 #include "log.h"
 #include "settings.h"
 #include "vnc.h"

src/protocols/vnc/vnc.h

@@ -22,10 +22,10 @@
 
 #include "config.h"
 
-#include "guac_clipboard.h"
-#include "guac_display.h"
-#include "guac_iconv.h"
-#include "guac_surface.h"
+#include "common/clipboard.h"
+#include "common/display.h"
+#include "common/iconv.h"
+#include "common/surface.h"
 #include "settings.h"
 
 #include <guacamole/client.h>

src/terminal/display.c

@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include "common.h"
+#include "common/surface.h"
 #include "display.h"
-#include "guac_surface.h"
 #include "types.h"
 
 #include <math.h>

src/terminal/display.h

@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "guac_surface.h"
+#include "common/surface.h"
 #include "types.h"
 
 #include <guacamole/client.h>

src/terminal/terminal.c

@@ -21,10 +21,9 @@
 
 #include "buffer.h"
 #include "common.h"
+#include "common/clipboard.h"
+#include "common/cursor.h"
 #include "display.h"
-#include "guac_clipboard.h"
-#include "guac_cursor.h"
-#include "scrollbar.h"
 #include "terminal.h"
 #include "terminal_handlers.h"
 #include "types.h"

src/terminal/terminal.h

@@ -24,9 +24,9 @@
 #include "config.h"
 
 #include "buffer.h"
+#include "common/clipboard.h"
+#include "common/cursor.h"
 #include "display.h"
-#include "guac_clipboard.h"
-#include "guac_cursor.h"
 #include "scrollbar.h"
 #include "types.h"
 #include "typescript.h"

src/terminal/typescript.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "guac_io.h"
+#include "common/io.h"
 #include "typescript.h"
 
 #include <guacamole/timestamp.h>

tests/common/guac_iconv.c

@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "common_suite.h"
-#include "guac_iconv.h"
+#include "common/iconv.h"
 
 #include <stdlib.h>
 #include <CUnit/Basic.h>

tests/common/guac_rect.c

@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "common_suite.h"
-#include "guac_rect.h"
+#include "common/rect.h"
 
 #include <stdlib.h>
 #include <stdio.h>

tests/common/guac_string.c

@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "common_suite.h"
-#include "guac_string.h"
+#include "common/string.h"
 
 #include <stdlib.h>
 #include <CUnit/Basic.h>