summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2015-01-12 15:45:43 -0600
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-02-23 23:00:41 +0100
commitdb79b29f504f882c237996b9d4df0925fe96a39b (patch)
treea0708eba3a49f3a89618ff70d9cff11cccda8963
parenta60781a11f6b54ce4db602e6ea9fdcc820df3bf2 (diff)
downloadspice-db79b29f504f882c237996b9d4df0925fe96a39b.tar.gz
spice-db79b29f504f882c237996b9d4df0925fe96a39b.tar.xz
spice-db79b29f504f882c237996b9d4df0925fe96a39b.zip
PALLET -> PALETTE
Use the correct spelling for the enumeration
-rw-r--r--server/cache-item.c.template2
-rw-r--r--server/dcc-send.c2
-rw-r--r--server/dcc.c6
-rw-r--r--server/display-channel.c2
-rw-r--r--server/display-channel.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/server/cache-item.c.template b/server/cache-item.c.template
index e5770cf6..ad2b5794 100644
--- a/server/cache-item.c.template
+++ b/server/cache-item.c.template
@@ -33,7 +33,7 @@
#define CACHE_HASH_KEY PALETTE_CACHE_HASH_KEY
#define CACHE_HASH_SIZE PALETTE_CACHE_HASH_SIZE
#define CACHE_INVAL_TYPE SPICE_MSG_DISPLAY_INVAL_PALETTE
-#define PIPE_ITEM_TYPE PIPE_ITEM_TYPE_INVAL_PALLET_CACHE
+#define PIPE_ITEM_TYPE PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE
#define FUNC_NAME(name) red_palette_cache_##name
#define VAR_NAME(name) palette_cache_##name
#define CHANNEL DisplayChannel
diff --git a/server/dcc-send.c b/server/dcc-send.c
index 61650278..351ae5bf 100644
--- a/server/dcc-send.c
+++ b/server/dcc-send.c
@@ -2409,7 +2409,7 @@ void dcc_send_item(DisplayChannelClient *dcc, PipeItem *pipe_item)
case PIPE_ITEM_TYPE_PIXMAP_RESET:
display_channel_marshall_reset_cache(rcc, m);
break;
- case PIPE_ITEM_TYPE_INVAL_PALLET_CACHE:
+ case PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE:
dcc_palette_cache_reset(dcc);
red_channel_client_init_send_data(rcc, SPICE_MSG_DISPLAY_INVAL_ALL_PALETTES, NULL);
break;
diff --git a/server/dcc.c b/server/dcc.c
index 579e0c2a..7efdbd2e 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -420,7 +420,7 @@ void dcc_start(DisplayChannelClient *dcc)
red_channel_client_ack_zero_messages_window(RED_CHANNEL_CLIENT(dcc));
if (display->surfaces[0].context.canvas) {
display_channel_current_flush(display, 0);
- red_channel_client_pipe_add_type(rcc, PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
+ red_channel_client_pipe_add_type(rcc, PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE);
dcc_create_surface(dcc, 0);
dcc_push_surface_image(dcc, 0);
dcc_push_monitors_config(dcc);
@@ -1475,7 +1475,7 @@ int dcc_handle_migrate_data(DisplayChannelClient *dcc, uint32_t size, void *mess
spice_return_val_if_fail(surfaces_restored, FALSE);
- red_channel_client_pipe_add_type(RED_CHANNEL_CLIENT(dcc), PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
+ red_channel_client_pipe_add_type(RED_CHANNEL_CLIENT(dcc), PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE);
/* enable sending messages */
red_channel_client_ack_zero_messages_window(RED_CHANNEL_CLIENT(dcc));
return TRUE;
@@ -1587,7 +1587,7 @@ static void release_item_before_push(DisplayChannelClient *dcc, PipeItem *item)
case PIPE_ITEM_TYPE_MIGRATE_DATA:
case PIPE_ITEM_TYPE_PIXMAP_SYNC:
case PIPE_ITEM_TYPE_PIXMAP_RESET:
- case PIPE_ITEM_TYPE_INVAL_PALLET_CACHE:
+ case PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE:
case PIPE_ITEM_TYPE_STREAM_ACTIVATE_REPORT:
free(item);
break;
diff --git a/server/display-channel.c b/server/display-channel.c
index f3925267..dcbde74f 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -1760,7 +1760,7 @@ void display_channel_destroy_surfaces(DisplayChannel *display)
spice_warn_if_fail(ring_is_empty(&display->streams));
if (red_channel_is_connected(RED_CHANNEL(display))) {
- red_channel_pipes_add_type(RED_CHANNEL(display), PIPE_ITEM_TYPE_INVAL_PALLET_CACHE);
+ red_channel_pipes_add_type(RED_CHANNEL(display), PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE);
red_pipes_add_verb(RED_CHANNEL(display), SPICE_MSG_DISPLAY_STREAM_DESTROY_ALL);
}
diff --git a/server/display-channel.h b/server/display-channel.h
index 7b986aee..7c200a9c 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -87,7 +87,7 @@ enum {
PIPE_ITEM_TYPE_MIGRATE_DATA,
PIPE_ITEM_TYPE_PIXMAP_SYNC,
PIPE_ITEM_TYPE_PIXMAP_RESET,
- PIPE_ITEM_TYPE_INVAL_PALLET_CACHE,
+ PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE,
PIPE_ITEM_TYPE_CREATE_SURFACE,
PIPE_ITEM_TYPE_DESTROY_SURFACE,
PIPE_ITEM_TYPE_MONITORS_CONFIG,