Breaking ABI is a good time to remove deprecated code.
Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
---
src/spice-widget.c | 71 ------------------------------------------------------
src/spice-widget.h | 7 ------
2 files changed, 78 deletions(-)
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 3e7a731..1225f5f 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -81,7 +81,6 @@ enum {
PROP_KEYBOARD_GRAB,
PROP_MOUSE_GRAB,
PROP_RESIZE_GUEST,
- PROP_AUTO_CLIPBOARD,
PROP_SCALING,
PROP_ONLY_DOWNSCALE,
PROP_DISABLE_INPUTS,
@@ -128,7 +127,6 @@ static void spice_display_get_property(GObject *object,
{
SpiceDisplay *display = SPICE_DISPLAY(object);
SpiceDisplayPrivate *d = display->priv;
- gboolean boolean;
switch (prop_id) {
case PROP_SESSION:
@@ -149,10 +147,6 @@ static void spice_display_get_property(GObject *object,
case PROP_RESIZE_GUEST:
g_value_set_boolean(value, d->resize_guest_enable);
break;
- case PROP_AUTO_CLIPBOARD:
- g_object_get(d->gtk_session, "auto-clipboard", &boolean, NULL);
- g_value_set_boolean(value, boolean);
- break;
case PROP_SCALING:
g_value_set_boolean(value, d->allow_scaling);
break;
@@ -368,10 +362,6 @@ static void spice_display_set_property(GObject *object,
d->only_downscale = g_value_get_boolean(value);
scaling_updated(display);
break;
- case PROP_AUTO_CLIPBOARD:
- g_object_set(d->gtk_session, "auto-clipboard",
- g_value_get_boolean(value), NULL);
- break;
case PROP_DISABLE_INPUTS:
d->disable_inputs = g_value_get_boolean(value);
gtk_widget_set_can_focus(GTK_WIDGET(display), !d->disable_inputs);
@@ -1930,25 +1920,6 @@ static void spice_display_class_init(SpiceDisplayClass *klass)
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
- /**
- * SpiceDisplay:auto-clipboard:
- *
- * When this is true the clipboard gets automatically shared between host
- * and guest.
- *
- * Deprecated: 0.8: Use SpiceGtkSession:auto-clipboard property instead
- **/
- g_object_class_install_property
- (gobject_class, PROP_AUTO_CLIPBOARD,
- g_param_spec_boolean("auto-clipboard",
- "Auto clipboard",
- "Automatically relay clipboard changes between "
- "host and guest.",
- TRUE,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS |
- G_PARAM_DEPRECATED));
-
g_object_class_install_property
(gobject_class, PROP_SCALING,
g_param_spec_boolean("scaling", "Scaling",
@@ -2640,48 +2611,6 @@ void spice_display_mouse_ungrab(SpiceDisplay *display)
}
/**
- * spice_display_copy_to_guest:
- * @display: a #SpiceDisplay
- *
- * Copy client-side clipboard to guest clipboard.
- *
- * Deprecated: 0.8: Use spice_gtk_session_copy_to_guest() instead
- **/
-void spice_display_copy_to_guest(SpiceDisplay *display)
-{
- SpiceDisplayPrivate *d;
-
- g_return_if_fail(SPICE_IS_DISPLAY(display));
-
- d = display->priv;
-
- g_return_if_fail(d->gtk_session != NULL);
-
- spice_gtk_session_copy_to_guest(d->gtk_session);
-}
-
-/**
- * spice_display_paste_from_guest:
- * @display: a #SpiceDisplay
- *
- * Copy guest clipboard to client-side clipboard.
- *
- * Deprecated: 0.8: Use spice_gtk_session_paste_from_guest() instead
- **/
-void spice_display_paste_from_guest(SpiceDisplay *display)
-{
- SpiceDisplayPrivate *d;
-
- g_return_if_fail(SPICE_IS_DISPLAY(display));
-
- d = display->priv;
-
- g_return_if_fail(d->gtk_session != NULL);
-
- spice_gtk_session_paste_from_guest(d->gtk_session);
-}
-
-/**
* spice_display_get_pixbuf:
* @display: a #SpiceDisplay
*
diff --git a/src/spice-widget.h b/src/spice-widget.h
index 5a7c206..a8adf9c 100644
--- a/src/spice-widget.h
+++ b/src/spice-widget.h
@@ -70,13 +70,6 @@ void spice_display_send_keys(SpiceDisplay *display, const guint *keyvals,
int nkeyvals, SpiceDisplayKeyEvent kind);
GdkPixbuf *spice_display_get_pixbuf(SpiceDisplay *display);
-#ifndef SPICE_DISABLE_DEPRECATED
-SPICE_DEPRECATED_FOR(spice_gtk_session_copy_to_guest)
-void spice_display_copy_to_guest(SpiceDisplay *display);
-SPICE_DEPRECATED_FOR(spice_gtk_session_paste_from_guest)
-void spice_display_paste_from_guest(SpiceDisplay *display);
-#endif
-
G_END_DECLS
#endif /* __SPICE_CLIENT_WIDGET_H__ */
--
2.5.0
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel