gtk: remove spice prefix in default signal handler

16 files changed, 48 insertions, 48 deletions

diff --git a/gtk/channel-cursor.c b/gtk/channel-cursor.c
index 693d8d8..8b6f396 100644
--- a/gtk/channel-cursor.c
+++ b/gtk/channel-cursor.c
@@ -83,7 +83,7 @@ static void spice_cursor_channel_class_init(SpiceCursorChannelClass *klass)
         g_signal_new("cursor-set",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceCursorChannelClass, spice_cursor_set),
+                     G_STRUCT_OFFSET(SpiceCursorChannelClass, cursor_set),
                      NULL, NULL,
                      g_cclosure_user_marshal_VOID__INT_INT_INT_INT_POINTER,
                      G_TYPE_NONE,
@@ -96,7 +96,7 @@ static void spice_cursor_channel_class_init(SpiceCursorChannelClass *klass)
         g_signal_new("cursor-move",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceCursorChannelClass, spice_cursor_move),
+                     G_STRUCT_OFFSET(SpiceCursorChannelClass, cursor_move),
                      NULL, NULL,
                      g_cclosure_user_marshal_VOID__INT_INT,
                      G_TYPE_NONE,
@@ -107,7 +107,7 @@ static void spice_cursor_channel_class_init(SpiceCursorChannelClass *klass)
         g_signal_new("cursor-hide",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceCursorChannelClass, spice_cursor_hide),
+                     G_STRUCT_OFFSET(SpiceCursorChannelClass, cursor_hide),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
@@ -117,7 +117,7 @@ static void spice_cursor_channel_class_init(SpiceCursorChannelClass *klass)
         g_signal_new("cursor-reset",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceCursorChannelClass, spice_cursor_reset),
+                     G_STRUCT_OFFSET(SpiceCursorChannelClass, cursor_reset),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
diff --git a/gtk/channel-cursor.h b/gtk/channel-cursor.h
index 1abd3ce..92005ed 100644
--- a/gtk/channel-cursor.h
+++ b/gtk/channel-cursor.h
@@ -43,11 +43,11 @@ struct _SpiceCursorChannelClass {
     SpiceChannelClass parent_class;
 
     /* signals */
-    void (*spice_cursor_set)(SpiceCursorChannel *channel, gint width, gint height,
-                             gint hot_x, gint hot_y, gpointer rgba);
-    void (*spice_cursor_move)(SpiceCursorChannel *channel, gint x, gint y);
-    void (*spice_cursor_hide)(SpiceCursorChannel *channel);
-    void (*spice_cursor_reset)(SpiceCursorChannel *channel);
+    void (*cursor_set)(SpiceCursorChannel *channel, gint width, gint height,
+                       gint hot_x, gint hot_y, gpointer rgba);
+    void (*cursor_move)(SpiceCursorChannel *channel, gint x, gint y);
+    void (*cursor_hide)(SpiceCursorChannel *channel);
+    void (*cursor_reset)(SpiceCursorChannel *channel);
 
     /* Do not add fields to this struct */
 };
diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index be62960..d1c2e0d 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -94,7 +94,7 @@ static void spice_display_channel_class_init(SpiceDisplayChannelClass *klass)
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceDisplayChannelClass,
-                                     spice_display_primary_create),
+                                     display_primary_create),
                      NULL, NULL,
                      g_cclosure_user_marshal_VOID__INT_INT_INT_INT_INT_POINTER,
                      G_TYPE_NONE,
@@ -107,7 +107,7 @@ static void spice_display_channel_class_init(SpiceDisplayChannelClass *klass)
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceDisplayChannelClass,
-                                     spice_display_primary_destroy),
+                                     display_primary_destroy),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
@@ -118,7 +118,7 @@ static void spice_display_channel_class_init(SpiceDisplayChannelClass *klass)
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceDisplayChannelClass,
-                                     spice_display_invalidate),
+                                     display_invalidate),
                      NULL, NULL,
                      g_cclosure_user_marshal_VOID__INT_INT_INT_INT,
                      G_TYPE_NONE,
@@ -130,7 +130,7 @@ static void spice_display_channel_class_init(SpiceDisplayChannelClass *klass)
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceDisplayChannelClass,
-                                     spice_display_mark),
+                                     display_mark),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__INT,
                      G_TYPE_NONE,
diff --git a/gtk/channel-display.h b/gtk/channel-display.h
index 874bfa9..90cefd8 100644
--- a/gtk/channel-display.h
+++ b/gtk/channel-display.h
@@ -43,14 +43,14 @@ struct _SpiceDisplayChannelClass {
     SpiceChannelClass parent_class;
 
     /* signals */
-    void (*spice_display_primary_create)(SpiceChannel *channel, gint format,
-                                         gint width, gint height, gint stride,
-                                         gint shmid, gpointer data);
-    void (*spice_display_primary_destroy)(SpiceChannel *channel);
-    void (*spice_display_invalidate)(SpiceChannel *channel,
-                                     gint x, gint y, gint w, gint h);
-    void (*spice_display_mark)(SpiceChannel *channel,
-                               gboolean mark);
+    void (*display_primary_create)(SpiceChannel *channel, gint format,
+                                   gint width, gint height, gint stride,
+                                   gint shmid, gpointer data);
+    void (*display_primary_destroy)(SpiceChannel *channel);
+    void (*display_invalidate)(SpiceChannel *channel,
+                               gint x, gint y, gint w, gint h);
+    void (*display_mark)(SpiceChannel *channel,
+                         gboolean mark);
 
     /* Do not add fields to this struct */
 };
diff --git a/gtk/channel-inputs.c b/gtk/channel-inputs.c
index 2bde14a..934ad4b 100644
--- a/gtk/channel-inputs.c
+++ b/gtk/channel-inputs.c
@@ -110,7 +110,7 @@ static void spice_inputs_channel_class_init(SpiceInputsChannelClass *klass)
         g_signal_new("inputs-modifiers",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceInputsChannelClass, spice_inputs_modifiers),
+                     G_STRUCT_OFFSET(SpiceInputsChannelClass, inputs_modifiers),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
diff --git a/gtk/channel-inputs.h b/gtk/channel-inputs.h
index 589f6da..ac96af5 100644
--- a/gtk/channel-inputs.h
+++ b/gtk/channel-inputs.h
@@ -49,7 +49,7 @@ struct _SpiceInputsChannelClass {
     SpiceChannelClass parent_class;
 
     /* signals */
-    void (*spice_inputs_modifiers)(SpiceChannel *channel);
+    void (*inputs_modifiers)(SpiceChannel *channel);
 
     /* Do not add fields to this struct */
 };
diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 156adfc..c70b484 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -185,7 +185,7 @@ static void spice_main_channel_class_init(SpiceMainChannelClass *klass)
         g_signal_new("main-mouse-update",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceMainChannelClass, spice_main_mouse_update),
+                     G_STRUCT_OFFSET(SpiceMainChannelClass, mouse_update),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
@@ -195,7 +195,7 @@ static void spice_main_channel_class_init(SpiceMainChannelClass *klass)
         g_signal_new("main-agent-update",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceMainChannelClass, spice_main_agent_update),
+                     G_STRUCT_OFFSET(SpiceMainChannelClass, agent_update),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
diff --git a/gtk/channel-main.h b/gtk/channel-main.h
index 03a9ebb..eac70ea 100644
--- a/gtk/channel-main.h
+++ b/gtk/channel-main.h
@@ -43,8 +43,8 @@ struct _SpiceMainChannelClass {
     SpiceChannelClass parent_class;
 
     /* signals */
-    void (*spice_main_mouse_update)(SpiceChannel *channel);
-    void (*spice_main_agent_update)(SpiceChannel *channel);
+    void (*mouse_update)(SpiceChannel *channel);
+    void (*agent_update)(SpiceChannel *channel);
 
     /* Do not add fields to this struct */
 };
diff --git a/gtk/channel-playback.c b/gtk/channel-playback.c
index ec9524a..3a7b435 100644
--- a/gtk/channel-playback.c
+++ b/gtk/channel-playback.c
@@ -70,7 +70,7 @@ static void spice_playback_channel_class_init(SpicePlaybackChannelClass *klass)
         g_signal_new("playback-start",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpicePlaybackChannelClass, spice_playback_start),
+                     G_STRUCT_OFFSET(SpicePlaybackChannelClass, playback_start),
                      NULL, NULL,
                      g_cclosure_user_marshal_VOID__INT_INT_INT,
                      G_TYPE_NONE,
@@ -81,7 +81,7 @@ static void spice_playback_channel_class_init(SpicePlaybackChannelClass *klass)
         g_signal_new("playback-data",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpicePlaybackChannelClass, spice_playback_data),
+                     G_STRUCT_OFFSET(SpicePlaybackChannelClass, playback_data),
                      NULL, NULL,
                      g_cclosure_user_marshal_VOID__POINTER_INT,
                      G_TYPE_NONE,
@@ -92,7 +92,7 @@ static void spice_playback_channel_class_init(SpicePlaybackChannelClass *klass)
         g_signal_new("playback-stop",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpicePlaybackChannelClass, spice_playback_stop),
+                     G_STRUCT_OFFSET(SpicePlaybackChannelClass, playback_stop),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
diff --git a/gtk/channel-playback.h b/gtk/channel-playback.h
index 5cfc9df..d7f952c 100644
--- a/gtk/channel-playback.h
+++ b/gtk/channel-playback.h
@@ -43,10 +43,10 @@ struct _SpicePlaybackChannelClass {
     SpiceChannelClass parent_class;
 
     /* signals */
-    void (*spice_playback_start)(SpicePlaybackChannel *channel,
-                                 gint format, gint channels, gint freq);
-    void (*spice_playback_data)(SpicePlaybackChannel *channel, gpointer *data, gint size);
-    void (*spice_playback_stop)(SpicePlaybackChannel *channel);
+    void (*playback_start)(SpicePlaybackChannel *channel,
+                           gint format, gint channels, gint freq);
+    void (*playback_data)(SpicePlaybackChannel *channel, gpointer *data, gint size);
+    void (*playback_stop)(SpicePlaybackChannel *channel);
 
     /*
      * If adding fields to this struct, remove corresponding
diff --git a/gtk/channel-record.c b/gtk/channel-record.c
index 010a42a..5a23a13 100644
--- a/gtk/channel-record.c
+++ b/gtk/channel-record.c
@@ -73,7 +73,7 @@ static void spice_record_channel_class_init(SpiceRecordChannelClass *klass)
         g_signal_new("record-start",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceRecordChannelClass, spice_record_start),
+                     G_STRUCT_OFFSET(SpiceRecordChannelClass, record_start),
                      NULL, NULL,
                      g_cclosure_user_marshal_VOID__INT_INT_INT,
                      G_TYPE_NONE,
@@ -84,7 +84,7 @@ static void spice_record_channel_class_init(SpiceRecordChannelClass *klass)
         g_signal_new("record-stop",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceRecordChannelClass, spice_record_stop),
+                     G_STRUCT_OFFSET(SpiceRecordChannelClass, record_stop),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__VOID,
                      G_TYPE_NONE,
diff --git a/gtk/channel-record.h b/gtk/channel-record.h
index 0398211..5b85f1d 100644
--- a/gtk/channel-record.h
+++ b/gtk/channel-record.h
@@ -43,10 +43,10 @@ struct _SpiceRecordChannelClass {
     SpiceChannelClass parent_class;
 
     /* signals */
-    void (*spice_record_start)(SpiceRecordChannel *channel,
-                                 gint format, gint channels, gint freq);
-    void (*spice_record_data)(SpiceRecordChannel *channel, gpointer *data, gint size);
-    void (*spice_record_stop)(SpiceRecordChannel *channel);
+    void (*record_start)(SpiceRecordChannel *channel,
+                         gint format, gint channels, gint freq);
+    void (*record_data)(SpiceRecordChannel *channel, gpointer *data, gint size);
+    void (*record_stop)(SpiceRecordChannel *channel);
 
     /*
      * If adding fields to this struct, remove corresponding
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index 797b4d1..c57c0bc 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -369,7 +369,7 @@ static void spice_session_class_init(SpiceSessionClass *klass)
         g_signal_new("channel-new",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceSessionClass, spice_session_channel_new),
+                     G_STRUCT_OFFSET(SpiceSessionClass, channel_new),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__OBJECT,
                      G_TYPE_NONE,
@@ -380,7 +380,7 @@ static void spice_session_class_init(SpiceSessionClass *klass)
         g_signal_new("channel-destroy",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceSessionClass, spice_session_channel_destroy),
+                     G_STRUCT_OFFSET(SpiceSessionClass, channel_destroy),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__OBJECT,
                      G_TYPE_NONE,
diff --git a/gtk/spice-session.h b/gtk/spice-session.h
index 99b0226..958c15a 100644
--- a/gtk/spice-session.h
+++ b/gtk/spice-session.h
@@ -43,8 +43,8 @@ struct _SpiceSessionClass
     GObjectClass parent_class;
 
     /* Signals */
-    void (*spice_session_channel_new)(SpiceSession *session, SpiceChannel *channel);
-    void (*spice_session_channel_destroy)(SpiceSession *session, SpiceChannel *channel);
+    void (*channel_new)(SpiceSession *session, SpiceChannel *channel);
+    void (*channel_destroy)(SpiceSession *session, SpiceChannel *channel);
 
     /*
      * If adding fields to this struct, remove corresponding
diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
index 2329b73..8c8ded6 100644
--- a/gtk/spice-widget.c
+++ b/gtk/spice-widget.c
@@ -1323,7 +1323,7 @@ static void spice_display_class_init(SpiceDisplayClass *klass)
         g_signal_new("mouse-grab",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceDisplayClass, spice_display_mouse_grab),
+                     G_STRUCT_OFFSET(SpiceDisplayClass, mouse_grab),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__INT,
                      G_TYPE_NONE,
@@ -1334,7 +1334,7 @@ static void spice_display_class_init(SpiceDisplayClass *klass)
         g_signal_new("keyboard-grab",
                      G_OBJECT_CLASS_TYPE(gobject_class),
                      G_SIGNAL_RUN_FIRST,
-                     G_STRUCT_OFFSET(SpiceDisplayClass, spice_display_keyboard_grab),
+                     G_STRUCT_OFFSET(SpiceDisplayClass, keyboard_grab),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__INT,
                      G_TYPE_NONE,
diff --git a/gtk/spice-widget.h b/gtk/spice-widget.h
index 67144e5..3c38507 100644
--- a/gtk/spice-widget.h
+++ b/gtk/spice-widget.h
@@ -49,8 +49,8 @@ struct _SpiceDisplayClass {
     GtkDrawingAreaClass parent_class;
 
     /* signals */
-    void (*spice_display_mouse_grab)(SpiceChannel *channel, gint grabbed);
-    void (*spice_display_keyboard_grab)(SpiceChannel *channel, gint grabbed);
+    void (*mouse_grab)(SpiceChannel *channel, gint grabbed);
+    void (*keyboard_grab)(SpiceChannel *channel, gint grabbed);
 
     /*
      * If adding fields to this struct, remove corresponding