diff options
| -rw-r--r-- | .gitignore | 43 | ||||
| -rw-r--r-- | data/gtkrc | 1 | ||||
| -rw-r--r-- | gtk/.gitignore | 5 | ||||
| -rw-r--r-- | gtk/Makefile.am | 8 | ||||
| -rw-r--r-- | gtk/spice-client-gtk.defs | 21 | ||||
| -rw-r--r-- | gtk/spice-option.h | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
7 files changed, 54 insertions, 28 deletions
@@ -1,13 +1,17 @@ -/*.bak -/*.lo -/*.o -/*.orig -/*.rej -/*.tab.c -/*~ -/.*.sw[nop] -/.deps -/.gitignore +*.bak +*.lo +*.o +*.orig +*.rej +*.tab.c +*~ +.*.sw[nop] +.deps +.libs +*.gir +*.typelib +*.la +*.stamp /.libs /.version /ABOUT-NLS @@ -16,8 +20,8 @@ /GSYMS /GTAGS /ID -/Makefile -/Makefile.in +Makefile +Makefile.in /TAGS /_libs /aclocal.m4 @@ -87,15 +91,7 @@ /m4/wchar_t.m4 /m4/wint_t.m4 /m4/xsize.m4 -/po/*.gmo -/po/*.mo -/po/.intltool-merge-cache -/po/Makefile -/po/Makefile.in -/po/Makefile.in.in -/po/POTFILES -/po/spice-gtk.pot -/po/stamp-it +po/* /so_locations /spice-client-glib-2.0.pc /spice-client-gtk-2.0.pc @@ -103,3 +99,8 @@ /spice-controller.pc /stamp-h1 /tags +gtk/controller/controller.c +gtk/controller/menu.c +gtk/controller/spice-controller.h +gtk/controller/test-controller +doc/reference/spice-gtk-overrides.txt diff --git a/data/gtkrc b/data/gtkrc new file mode 100644 index 0000000..4a0ddd0 --- /dev/null +++ b/data/gtkrc @@ -0,0 +1 @@ +gtk-theme-name = "MS-Windows" diff --git a/gtk/.gitignore b/gtk/.gitignore index 2ae158f..f070332 100644 --- a/gtk/.gitignore +++ b/gtk/.gitignore @@ -20,6 +20,9 @@ /SpiceClientGLib-2.0.typelib /SpiceClientGtk-3.0.gir /SpiceClientGtk-3.0.typelib +/SpiceClientGtk-2.0.gir +/SpiceClientGtk-2.0.typelib +/SpiceClientGtk.la /TAGS /_libs /generated_demarshallers.c @@ -27,9 +30,11 @@ /generated_marshallers.c /generated_marshallers1.c /libspice-client-glib-2.0.la +/libspice-client-gtk-2.0.la /libspice-client-gtk-3.0.la /snappy /so_locations +/spice-client-gtk-module.defs.c /spice-glib-enums.c /spice-glib-enums.h /spice-marshal.c diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 8899365..9925e4e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -388,16 +388,16 @@ spice-widget-enums.h: spice-widget.h generated_demarshallers.c: $(top_srcdir)/spice.proto - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include messages.h $< $@ + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include messages.h $< $@ >/dev/null generated_demarshallers1.c: $(top_srcdir)/spice1.proto - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include messages.h --prefix 1 --ptrsize 8 $< $@ + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include messages.h --prefix 1 --ptrsize 8 $< $@ >/dev/null generated_marshallers.c: $(top_srcdir)/spice.proto - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client $< $@ + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client $< $@ >/dev/null generated_marshallers1.c: $(top_srcdir)/spice1.proto - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client --prefix 1 --ptrsize 8 $< $@ + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client --prefix 1 --ptrsize 8 $< $@ >/dev/null vncdisplaykeymap.c: $(KEYMAPS) diff --git a/gtk/spice-client-gtk.defs b/gtk/spice-client-gtk.defs index fda17dc..f718c8c 100644 --- a/gtk/spice-client-gtk.defs +++ b/gtk/spice-client-gtk.defs @@ -383,7 +383,7 @@ (c-name "spice_channel_disconnect") (return-type "none") (parameters - '("SpiceChannelEvent" "event") + '("SpiceChannelEvent" "reason") ) ) @@ -470,6 +470,23 @@ +;; From spice-option.h + +(define-function spice_get_option_group + (c-name "spice_get_option_group") + (return-type "GOptionGroup*") +) + +(define-function spice_set_session_option + (c-name "spice_set_session_option") + (return-type "none") + (parameters + '("SpiceSession*" "session") + ) +) + + + ;; From channel-cursor.h (define-function spice_cursor_channel_get_type @@ -618,7 +635,7 @@ '("SpiceRecordChannel*" "channel") '("gpointer" "data") '("gsize" "bytes") - '("uint32_t" "time") + '("guint32" "time") ) ) diff --git a/gtk/spice-option.h b/gtk/spice-option.h index 69351d3..ce24f65 100644 --- a/gtk/spice-option.h +++ b/gtk/spice-option.h @@ -19,7 +19,7 @@ #define SPICE_OPTION_H #include <glib.h> -#include <spice-session.h> +#include "spice-session.h" G_BEGIN_DECLS diff --git a/po/POTFILES.in b/po/POTFILES.in index a79f4c5..a1875c5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,3 +8,5 @@ gtk/display/gnome-rr-config.c gtk/display/gnome-rr-windows.c gtk/display/gnome-rr-x11.c gtk/display/gnome-rr-generic.c +gtk/spice-option.c +gtk/spicy-stats.c |