Attachment #295927 for bug #394817

View | Details | Raw Unified | Return to bug 394817
Collapse All | Expand All

Lines 65-70 Link Here

(-)a/Makefile.am (-2 / +27 lines)
65	vinagre/vinagre-window.h \	65	vinagre/vinagre-window.h \
66	vinagre/vinagre-ssh.h	66	vinagre/vinagre-ssh.h
67		67
		68	libvinagre_vala_sources = \
		69	vinagre/vinagre-dirs.vala \
		70	vinagre/vinagre-utils.vala
		71
68	vinagre_vinagre_SOURCES = \	72	vinagre_vinagre_SOURCES = \
69	vinagre/vinagre-main.c \	73	vinagre/vinagre-main.c \
70	vinagre/vinagre-options.c \	74	vinagre/vinagre-options.c \
Lines 80-93 Link Here
80	vinagre/vinagre-connect.c \	84	vinagre/vinagre-connect.c \
81	vinagre/vinagre-connection.c \	85	vinagre/vinagre-connection.c \
82	vinagre/vinagre-debug.c \	86	vinagre/vinagre-debug.c \
83	vinagre/vinagre-dirs.vala \
84	vinagre/vinagre-notebook.c \	87	vinagre/vinagre-notebook.c \
85	vinagre/vinagre-prefs.c \	88	vinagre/vinagre-prefs.c \
86	vinagre/vinagre-reverse-vnc-listener.c \	89	vinagre/vinagre-reverse-vnc-listener.c \
87	vinagre/vinagre-reverse-vnc-listener-dialog.c \	90	vinagre/vinagre-reverse-vnc-listener-dialog.c \
88	vinagre/vinagre-static-extension.c \	91	vinagre/vinagre-static-extension.c \
89	vinagre/vinagre-tab.c \	92	vinagre/vinagre-tab.c \
90	vinagre/vinagre-utils.vala \
91	vinagre/vinagre-window.c \	93	vinagre/vinagre-window.c \
92	vinagre/vinagre-ssh.c \	94	vinagre/vinagre-ssh.c \
93	vinagre/vinagre-cache-prefs.c \	95	vinagre/vinagre-cache-prefs.c \
Lines 98-103 Link Here
98	plugins/vnc/vinagre-vnc-tab.c \	100	plugins/vnc/vinagre-vnc-tab.c \
99	plugins/vnc/vinagre-vnc-tunnel.c	101	plugins/vnc/vinagre-vnc-tunnel.c
100		102
		103	vinagre_vinagre_SOURCES += \
		104	$(libvinagre_vala_sources:.vala=.c)
		105
101	if VINAGRE_HAVE_SELF_IFADDRS	106	if VINAGRE_HAVE_SELF_IFADDRS
102	vinagre_vinagre_SOURCES += \	107	vinagre_vinagre_SOURCES += \
103	vinagre/if/getifaddrs.c	108	vinagre/if/getifaddrs.c
Lines 171-176 Link Here
171	plugins/ssh/vinagre-ssh-tab.c	176	plugins/ssh/vinagre-ssh-tab.c
172	endif	177	endif
173		178
		179	# Ensure vinagre-vala.h is available immediately since C sources #include it
		180	BUILT_SOURCES = \
		181	vinagre/vinagre-vala.h
		182
		183	# We have to write an explicit rule instead of just adding --header AM_VALAFLAGS
		184	# or VALAFLAGS because automake does not support per-target VALAFLAGS, so if in
		185	# the future we use a .vala file in a plugin, vinagre-vala.h will get clobbered.
		186	libvinagre_vala.stamp: $(libvinagre_vala_sources)
		187	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) --header vinagre/vinagre-vala.h -C $(libvinagre_vala_sources)
		188	$(AM_V_at)touch $@
		189
		190	# Automake doesn't have an implicit rule to generate headers from vala
		191	vinagre/vinagre-vala.h $(libvinagre_vala_sources:.vala=.c): $(srcdir)/libvinagre_vala.stamp
		192	@if test -f $@; then :; else \
		193	rm -f $(srcdir)/libvinagre_vala.stamp; \
		194	$(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libvinagre_vala.stamp; \
		195	fi
		196
174	iconthemedir = $(datadir)/icons/hicolor	197	iconthemedir = $(datadir)/icons/hicolor
175	mimeicon16dir = $(iconthemedir)/16x16/mimetypes	198	mimeicon16dir = $(iconthemedir)/16x16/mimetypes
176	mimeicon22dir = $(iconthemedir)/22x22/mimetypes	199	mimeicon22dir = $(iconthemedir)/22x22/mimetypes
Lines 276-281 Link Here
276		299
277	dist_noinst_DATA = \	300	dist_noinst_DATA = \
278	$(noinst_vinagreh_headers) \	301	$(noinst_vinagreh_headers) \
		302	vinagre/vinagre-vala.h \
		303	libvinagre_vala.stamp \
279	$(noinst_plugin_headers) \	304	$(noinst_plugin_headers) \
280	ChangeLog.pre-git \	305	ChangeLog.pre-git \
281	data/vinagre-mime.xml.in \	306	data/vinagre-mime.xml.in \

Lines 30-35 Link Here

(-)a/plugins/rdp/vinagre-rdp-tab.c (+1 lines)
30		30
31	#include "vinagre-rdp-tab.h"	31	#include "vinagre-rdp-tab.h"
32	#include "vinagre-rdp-connection.h"	32	#include "vinagre-rdp-connection.h"
		33	#include "vinagre-vala.h"
33		34
34	#define VINAGRE_RDP_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_RDP_TAB, VinagreRdpTabPrivate))	35	#define VINAGRE_RDP_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_RDP_TAB, VinagreRdpTabPrivate))
35		36

Lines 25-30 Link Here

(-)a/plugins/spice/vinagre-spice-connection.c (+1 lines)
25	#include <vinagre/vinagre-cache-prefs.h>	25	#include <vinagre/vinagre-cache-prefs.h>
26		26
27	#include "vinagre-spice-connection.h"	27	#include "vinagre-spice-connection.h"
		28	#include "vinagre-vala.h"
28		29
29	struct _VinagreSpiceConnectionPrivate	30	struct _VinagreSpiceConnectionPrivate
30	{	31	{

Lines 32-37 Link Here

(-)a/plugins/spice/vinagre-spice-tab.c (+1 lines)
32	#include "vinagre-spice-tab.h"	32	#include "vinagre-spice-tab.h"
33	#include "vinagre-spice-connection.h"	33	#include "vinagre-spice-connection.h"
34	#include "vinagre-spice-tunnel.h"	34	#include "vinagre-spice-tunnel.h"
		35	#include "vinagre-vala.h"
35		36
36	#define VINAGRE_SPICE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SPICE_TAB, VinagreSpiceTabPrivate))	37	#define VINAGRE_SPICE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SPICE_TAB, VinagreSpiceTabPrivate))
37		38

Lines 25-30 Link Here

(-)a/plugins/vnc/vinagre-vnc-connection.c (+1 lines)
25	#include <vinagre/vinagre-cache-prefs.h>	25	#include <vinagre/vinagre-cache-prefs.h>
26		26
27	#include "vinagre-vnc-connection.h"	27	#include "vinagre-vnc-connection.h"
		28	#include "vinagre-vala.h"
28		29
29	struct _VinagreVncConnectionPrivate	30	struct _VinagreVncConnectionPrivate
30	{	31	{

Lines 29-34 Link Here

(-)a/plugins/vnc/vinagre-vnc-tab.c (+1 lines)
29	#include "vinagre-vnc-tab.h"	29	#include "vinagre-vnc-tab.h"
30	#include "vinagre-vnc-connection.h"	30	#include "vinagre-vnc-connection.h"
31	#include "vinagre-vnc-tunnel.h"	31	#include "vinagre-vnc-tunnel.h"
		32	#include "vinagre-vala.h"
32		33
33	#define VINAGRE_VNC_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_VNC_TAB, VinagreVncTabPrivate))	34	#define VINAGRE_VNC_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_VNC_TAB, VinagreVncTabPrivate))
34		35

Lines 36-41 Link Here

(-)a/vinagre/vinagre-bookmarks-migration.c (+1 lines)
36	#include "vinagre-bookmarks-migration.h"	36	#include "vinagre-bookmarks-migration.h"
37	#include "vinagre-bookmarks.h"	37	#include "vinagre-bookmarks.h"
38	#include "vinagre-plugins-engine.h"	38	#include "vinagre-plugins-engine.h"
		39	#include "vinagre-vala.h"
39		40
40	static void	41	static void
41	fill_xml (GSList list, xmlTextWriter writer)	42	fill_xml (GSList list, xmlTextWriter writer)

Lines 25-30 Link Here

(-)a/vinagre/vinagre-bookmarks-ui.c (+1 lines)
25	#include "vinagre-bookmarks-ui.h"	25	#include "vinagre-bookmarks-ui.h"
26	#include "vinagre-bookmarks-tree.h"	26	#include "vinagre-bookmarks-tree.h"
27	#include "vinagre-plugins-engine.h"	27	#include "vinagre-plugins-engine.h"
		28	#include "vinagre-vala.h"
28		29
29	static void	30	static void
30	control_save_button_visibility (GtkEntry ed, GtkWidget bt)	31	control_save_button_visibility (GtkEntry ed, GtkWidget bt)

Lines 30-35 Link Here

(-)a/vinagre/vinagre-bookmarks.c (+1 lines)
30	#include "vinagre-bookmarks-migration.h"	30	#include "vinagre-bookmarks-migration.h"
31	#include "vinagre-connection.h"	31	#include "vinagre-connection.h"
32	#include "vinagre-plugins-engine.h"	32	#include "vinagre-plugins-engine.h"
		33	#include "vinagre-vala.h"
33		34
34	struct _VinagreBookmarksPrivate	35	struct _VinagreBookmarksPrivate
35	{	36	{

Lines 21-26 Link Here

(-)a/vinagre/vinagre-cache-prefs.c (+1 lines)
21	#include <config.h>	21	#include <config.h>
22	#include <glib/gi18n.h>	22	#include <glib/gi18n.h>
23	#include "vinagre-cache-prefs.h"	23	#include "vinagre-cache-prefs.h"
		24	#include "vinagre-vala.h"
24		25
25	static GKeyFile *keyfile = NULL;	26	static GKeyFile *keyfile = NULL;
26	static char* filename = NULL;	27	static char* filename = NULL;

Lines 39-44 Link Here

(-)a/vinagre/vinagre-commands.c (+1 lines)
39	#include "vinagre-cache-prefs.h"	39	#include "vinagre-cache-prefs.h"
40	#include "vinagre-plugins-engine.h"	40	#include "vinagre-plugins-engine.h"
41	#include "vinagre-reverse-vnc-listener-dialog.h"	41	#include "vinagre-reverse-vnc-listener-dialog.h"
		42	#include "vinagre-vala.h"
42		43
43	void	44	void
44	vinagre_cmd_direct_connect (VinagreConnection *conn,	45	vinagre_cmd_direct_connect (VinagreConnection *conn,

Lines 36-41 Link Here

(-)a/vinagre/vinagre-connect.c (+1 lines)
36	#include "vinagre-prefs.h"	36	#include "vinagre-prefs.h"
37	#include "vinagre-cache-prefs.h"	37	#include "vinagre-cache-prefs.h"
38	#include "vinagre-plugins-engine.h"	38	#include "vinagre-plugins-engine.h"
		39	#include "vinagre-vala.h"
39		40
40	typedef struct {	41	typedef struct {
41	GtkBuilder *xml;	42	GtkBuilder *xml;

Lines 27-32 Link Here

(-)a/vinagre/vinagre-connection.c (+1 lines)
27	#include "vinagre-connection.h"	27	#include "vinagre-connection.h"
28	#include "vinagre-bookmarks.h"	28	#include "vinagre-bookmarks.h"
29	#include "vinagre-plugins-engine.h"	29	#include "vinagre-plugins-engine.h"
		30	#include "vinagre-vala.h"
30		31
31	struct _VinagreConnectionPrivate	32	struct _VinagreConnectionPrivate
32	{	33	{

Lines 26-31 Link Here

(-)a/vinagre/vinagre-notebook.c (+1 lines)
26		26
27	#include "vinagre-dnd.h"	27	#include "vinagre-dnd.h"
28	#include "vinagre-prefs.h"	28	#include "vinagre-prefs.h"
		29	#include "vinagre-vala.h"
29		30
30	#define VINAGRE_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookPrivate))	31	#define VINAGRE_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookPrivate))
31		32

Lines 23-28 Link Here

(-)a/vinagre/vinagre-options.c (+2 lines)
23	#include "vinagre-connection.h"	23	#include "vinagre-connection.h"
24	#include "vinagre-window.h"	24	#include "vinagre-window.h"
25	#include "vinagre-commands.h"	25	#include "vinagre-commands.h"
		26	#include "vinagre-options.h"
		27	#include "vinagre-vala.h"
26		28
27	const GOptionEntry all_options [] =	29	const GOptionEntry all_options [] =
28	{	30	{

Lines 44-49 Link Here

(-)a/vinagre/vinagre-reverse-vnc-listener-dialog.c (+1 lines)
44	#include "vinagre-prefs.h"	44	#include "vinagre-prefs.h"
45	#include "vinagre-reverse-vnc-listener-dialog.h"	45	#include "vinagre-reverse-vnc-listener-dialog.h"
46	#include "vinagre-reverse-vnc-listener.h"	46	#include "vinagre-reverse-vnc-listener.h"
		47	#include "vinagre-vala.h"
47		48
48	typedef struct	49	typedef struct
49	{	50	{

Lines 37-42 Link Here

(-)a/vinagre/vinagre-reverse-vnc-listener.c (+1 lines)
37	#include "vinagre-commands.h"	37	#include "vinagre-commands.h"
38	#include "vinagre-reverse-vnc-listener.h"	38	#include "vinagre-reverse-vnc-listener.h"
39	#include "plugins/vnc/vinagre-vnc-connection.h"	39	#include "plugins/vnc/vinagre-vnc-connection.h"
		40	#include "vinagre-vala.h"
40		41
41	struct _VinagreReverseVncListenerPrivate	42	struct _VinagreReverseVncListenerPrivate
42	{	43	{

Lines 22-27 Link Here

(-)a/vinagre/vinagre-ssh.c (+1 lines)
22	#include <config.h>	22	#include <config.h>
23		23
24	#include "vinagre-ssh.h"	24	#include "vinagre-ssh.h"
		25	#include "vinagre-vala.h"
25	#include "pty_open.h"	26	#include "pty_open.h"
26		27
27	#ifdef G_OS_WIN32	28	#ifdef G_OS_WIN32

Lines 31-36 Link Here

(-)a/vinagre/vinagre-tab.c (+1 lines)
31	#include "vinagre-prefs.h"	31	#include "vinagre-prefs.h"
32	#include "view/autoDrawer.h"	32	#include "view/autoDrawer.h"
33	#include "vinagre-plugins-engine.h"	33	#include "vinagre-plugins-engine.h"
		34	#include "vinagre-vala.h"
34		35
35	#define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate))	36	#define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate))
36		37

Lines 40-45 Link Here

(-)a/vinagre/vinagre-tube-handler.c (+1 lines)
40	#include "vinagre-protocol.h"	40	#include "vinagre-protocol.h"
41	#include "vinagre-plugins-engine.h"	41	#include "vinagre-plugins-engine.h"
42	#include "plugins/vnc/vinagre-vnc-connection.h"	42	#include "plugins/vnc/vinagre-vnc-connection.h"
		43	#include "vinagre-vala.h"
43		44
44	G_DEFINE_TYPE (VinagreTubeHandler, vinagre_tube_handler, G_TYPE_OBJECT);	45	G_DEFINE_TYPE (VinagreTubeHandler, vinagre_tube_handler, G_TYPE_OBJECT);
45		46

Lines 41-46 Link Here

(-)a/vinagre/vinagre-window.c (-1 / +1 lines)
41	#include "vinagre-window-private.h"	41	#include "vinagre-window-private.h"
42	#include "vinagre-bookmarks-entry.h"	42	#include "vinagre-bookmarks-entry.h"
43	#include "vinagre-plugins-engine.h"	43	#include "vinagre-plugins-engine.h"
		44	#include "vinagre-vala.h"
44		45
45	#ifdef VINAGRE_HAVE_AVAHI	46	#ifdef VINAGRE_HAVE_AVAHI
46	#include "vinagre-mdns.h"	47	#include "vinagre-mdns.h"
47	-

Return to bug 394817