move red_drawable_ref/unref/newgroup_id

2 files changed, 11 insertions, 10 deletions

diff --git a/server/red-parse-qxl.c b/server/red-parse-qxl.c
index f52703c7..d6a5784a 100644
--- a/server/red-parse-qxl.c
+++ b/server/red-parse-qxl.c
@@ -1630,6 +1630,12 @@ void red_cursor_cmd_unref(RedCursorCmd *cmd)
     g_free(cmd);
 }
 
+RedDrawable *red_drawable_ref(RedDrawable *drawable)
+{
+    drawable->refs++;
+    return drawable;
+}
+
 void red_drawable_unref(RedDrawable *red_drawable)
 {
     if (--red_drawable->refs) {
diff --git a/server/red-parse-qxl.h b/server/red-parse-qxl.h
index b7ae54a8..62466947 100644
--- a/server/red-parse-qxl.h
+++ b/server/red-parse-qxl.h
@@ -63,16 +63,6 @@ typedef struct RedDrawable {
     } u;
 } RedDrawable;
 
-RedDrawable *red_drawable_new(QXLInstance *qxl, RedMemSlotInfo *slots,
-                              const QXLCommandExt *qxl_cmd_ext, uint32_t flags);
-static inline RedDrawable *red_drawable_ref(RedDrawable *drawable)
-{
-    drawable->refs++;
-    return drawable;
-}
-
-void red_drawable_unref(RedDrawable *red_drawable);
-
 typedef struct RedUpdateCmd {
     RedQXLGuestResources guest_resources;
     int refs;
@@ -127,6 +117,11 @@ typedef struct RedCursorCmd {
 
 void red_get_rect_ptr(SpiceRect *red, const QXLRect *qxl);
 
+RedDrawable *red_drawable_new(QXLInstance *qxl, RedMemSlotInfo *slots,
+                              const QXLCommandExt *qxl_cmd_ext, uint32_t flags);
+RedDrawable *red_drawable_ref(RedDrawable *drawable);
+void red_drawable_unref(RedDrawable *red_drawable);
+
 RedUpdateCmd *red_update_cmd_new(QXLInstance *qxl, RedMemSlotInfo *slots, const QXLCommandExt *qxl_cmd_ext);
 RedUpdateCmd *red_update_cmd_ref(RedUpdateCmd *red);
 void red_update_cmd_unref(RedUpdateCmd *red);