ack
On Fri, 2017-01-27 at 14:45 +0400, marcandre.lureau@xxxxxxxxxx wrote:
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
>
> PyGtk 2.0 got removed in 0917002c48a0a5deb615d120a0e5997eefc89fd4,
> remove some remaining files.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
> ---
> src/Makefile.am | 2 -
> src/spice-client-gtk-manual.defs | 117 ---------------------------
> src/spice-client-gtk.override | 171 ----------------------------
> -----------
> 3 files changed, 290 deletions(-)
> delete mode 100644 src/spice-client-gtk-manual.defs
> delete mode 100644 src/spice-client-gtk.override
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index b991a5f..7542fac 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -37,8 +37,6 @@ EXTRA_DIST =
> \
> map-file \
> spice-glib-sym-file \
> spice-gtk-sym-file \
> - spice-client-gtk-manual.defs \
> - spice-client-gtk.override \
> spice-marshal.txt \
> spice-version.h.in \
> $(NULL)
> diff --git a/src/spice-client-gtk-manual.defs b/src/spice-client-
> gtk-manual.defs
> deleted file mode 100644
> index 9631b74..0000000
> --- a/src/spice-client-gtk-manual.defs
> +++ /dev/null
> @@ -1,117 +0,0 @@
> -(define-method set_display
> - (of-object "SpiceMainChannel")
> - (c-name "spice_main_set_display")
> - (return-type "none")
> - (parameters
> - '("int" "id")
> - '("int" "x")
> - '("int" "y")
> - '("int" "width")
> - '("int" "height")
> - )
> -)
> -
> -(define-method clipboard_grab
> - (of-object "SpiceMainChannel")
> - (c-name "spice_main_clipboard_grab")
> - (return-type "none")
> - (parameters
> - '("int*" "types")
> - '("int" "ntypes")
> - )
> -)
> -
> -(define-method clipboard_release
> - (of-object "SpiceMainChannel")
> - (c-name "spice_main_clipboard_release")
> - (return-type "none")
> -)
> -
> -(define-method motion
> - (of-object "SpiceInputsChannel")
> - (c-name "spice_inputs_motion")
> - (return-type "none")
> - (parameters
> - '("gint" "dx")
> - '("gint" "dy")
> - '("gint" "button_state")
> - )
> -)
> -
> -(define-method position
> - (of-object "SpiceInputsChannel")
> - (c-name "spice_inputs_position")
> - (return-type "none")
> - (parameters
> - '("gint" "x")
> - '("gint" "y")
> - '("gint" "display")
> - '("gint" "button_state")
> - )
> -)
> -
> -(define-method button_press
> - (of-object "SpiceInputsChannel")
> - (c-name "spice_inputs_button_press")
> - (return-type "none")
> - (parameters
> - '("gint" "button")
> - '("gint" "button_state")
> - )
> -)
> -
> -(define-method button_release
> - (of-object "SpiceInputsChannel")
> - (c-name "spice_inputs_button_release")
> - (return-type "none")
> - (parameters
> - '("gint" "button")
> - '("gint" "button_state")
> - )
> -)
> -
> -(define-method key_press
> - (of-object "SpiceInputsChannel")
> - (c-name "spice_inputs_key_press")
> - (return-type "none")
> - (parameters
> - '("guint" "keyval")
> - )
> -)
> -
> -(define-method key_release
> - (of-object "SpiceInputsChannel")
> - (c-name "spice_inputs_key_release")
> - (return-type "none")
> - (parameters
> - '("guint" "keyval")
> - )
> -)
> -
> -(define-method set_key_locks
> - (of-object "SpiceInputsChannel")
> - (c-name "spice_inputs_set_key_locks")
> - (return-type "none")
> - (parameters
> - '("guint" "locks")
> - )
> -)
> -
> -(define-enum ClientError
> - (in-module "Spice")
> - (c-name "SpiceClientError")
> - (values
> - '("failed" "SPICE_CLIENT_ERROR_FAILED")
> - )
> -)
> -
> -(define-function spice_audio_new
> - (c-name "spice_audio_new")
> - (is-constructor-of "SpiceAudio")
> - (return-type "SpiceAudio*")
> - (parameters
> - '("SpiceSession*" "session")
> - '("GMainContext*" "context")
> - '("const-char*" "name")
> - )
> -)
> diff --git a/src/spice-client-gtk.override b/src/spice-client-
> gtk.override
> deleted file mode 100644
> index 41aeee3..0000000
> --- a/src/spice-client-gtk.override
> +++ /dev/null
> @@ -1,171 +0,0 @@
> -%%
> -headers
> -#include <Python.h>
> -#include "pygobject.h"
> -#include "spice-common.h"
> -#include "spice-widget.h"
> -#include "spice-gtk-session.h"
> -#include "spice-audio.h"
> -#include "usb-device-widget.h"
> -%%
> -modulename spice_client_gtk
> -%%
> -import gobject.GObject as PyGObject_Type
> -import gtk.DrawingArea as PyGtkDrawingArea_Type
> -import gtk.Widget as PyGtkWidget_Type
> -import gtk.VBox as PyGtkVBox_Type
> -%%
> -ignore-glob
> - *_get_type
> -%%
> -%%
> -override spice_display_send_keys kwargs
> -static PyObject*
> -_wrap_spice_display_send_keys(PyGObject *self,
> - PyObject *args, PyObject *kwargs)
> -{
> - static char *kwlist[] = {"keys", "kind", NULL};
> - PyObject *keyList;
> - int kind = SPICE_DISPLAY_KEY_EVENT_CLICK;
> - int i, len;
> - guint *keys;
> -
> - if (!PyArg_ParseTupleAndKeywords(args, kwargs,
> - "O|I:SpiceDisplay.send_keys",
> kwlist,
> - &keyList, &kind))
> - return NULL;
> -
> - if (!PyList_Check(keyList))
> - return NULL;
> -
> - len = PyList_Size(keyList);
> - keys = g_malloc0(sizeof(guint)*len);
> -
> - for (i = 0 ; i < len ; i++) {
> - PyObject *val;
> - char *sym;
> - val = PyList_GetItem(keyList, i);
> - sym = PyString_AsString(val);
> - if (!sym) {
> - g_free(keys);
> - return NULL;
> - }
> - keys[i] = gdk_keyval_from_name(sym);
> - }
> -
> - spice_display_send_keys(SPICE_DISPLAY(self->obj), keys, len,
> kind);
> - g_free(keys);
> -
> - Py_INCREF(Py_None);
> - return Py_None;
> -}
> -%%
> -override spice_display_get_grab_keys kwargs
> -static PyObject*
> -_wrap_spice_display_get_grab_keys(PyGObject *self,
> - PyObject *args, PyObject *kwargs)
> -{
> - SpiceGrabSequence *seq;
> - PyObject *keyList;
> - int i;
> -
> - seq = spice_display_get_grab_keys(SPICE_DISPLAY(self->obj));
> -
> - keyList = PyList_New(0);
> - for (i = 0 ; i < seq->nkeysyms ; i++)
> - PyList_Append(keyList, PyInt_FromLong(seq->keysyms[i]));
> -
> - return keyList;
> -}
> -%%
> -override spice_display_set_grab_keys kwargs
> -static PyObject*
> -_wrap_spice_display_set_grab_keys(PyGObject *self,
> - PyObject *args, PyObject *kwargs)
> -{
> - static char *kwlist[] = {"keys", NULL};
> - PyObject *keyList;
> - int i;
> - guint nkeysyms;
> - guint *keysyms;
> - SpiceGrabSequence *seq;
> -
> - if (!PyArg_ParseTupleAndKeywords(args, kwargs,
> - "O|I:SpiceDisplay.set_grab_key
> s", kwlist,
> - &keyList))
> - return NULL;
> -
> - if (!PyList_Check(keyList))
> - return NULL;
> -
> - nkeysyms = PyList_Size(keyList);
> - keysyms = g_new0(guint, nkeysyms);
> -
> - for (i = 0 ; i < nkeysyms ; i++) {
> - PyObject *val = PyList_GetItem(keyList, i);
> - keysyms[i] = (guint)PyInt_AsLong(val);
> - }
> -
> - seq = spice_grab_sequence_new(nkeysyms, keysyms);
> - g_free(keysyms);
> -
> - spice_display_set_grab_keys(SPICE_DISPLAY(self->obj), seq);
> -
> - spice_grab_sequence_free(seq);
> -
> - Py_INCREF(Py_None);
> - return Py_None;
> -}
> -%%
> -override spice_session_get_channels
> -static PyObject*
> -_wrap_spice_session_get_channels(PyGObject *self,
> - PyObject *args, PyObject *kwargs)
> -{
> - PyObject *py_list;
> - GList *list, *tmp;
> - PyObject *chann;
> -
> - list = spice_session_get_channels(SPICE_SESSION(self->obj));
> -
> - if ((py_list = PyList_New(0)) == NULL) {
> - return NULL;
> - }
> - for (tmp = list; tmp != NULL; tmp = tmp->next) {
> - chann = pygobject_new(G_OBJECT(tmp->data));
> - if (chann == NULL) {
> - Py_DECREF(py_list);
> - return NULL;
> - }
> - PyList_Append(py_list, chann);
> - Py_DECREF(chann);
> - }
> - return py_list;
> -}
> -%%
> -override spice_audio_new
> -static int
> -_wrap_spice_audio_new(PyGObject *self,
> - PyObject *args, PyObject *kwargs)
> -{
> - static char *kwlist[] = {"session", "context", "name", NULL};
> - PyGObject *session = NULL;
> - PyObject *py_context = NULL;
> - char *name = NULL;
> -
> - if (!PyArg_ParseTupleAndKeywords(args, kwargs,
> - "O!|Os:SpiceAudio", kwlist,
> - &PySpiceSession_Type,
> &session,
> - &py_context, &name))
> - return -1;
> -
> - self->obj = (GObject *)spice_audio_new(SPICE_SESSION(session-
> >obj), NULL, NULL);
> -
> - if (!self->obj) {
> - PyErr_SetString(PyExc_RuntimeError, "could not create
> SpiceAudio object");
> - return -1;
> - }
> - pygobject_register_wrapper((PyObject *)self);
> - return 0;
> -
> -}
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel