[vinagre/plugin] Vinagre Plugin Support

From: Jorge Pereira <jpereira src gnome org>
To: svn-commits-list gnome org
Subject: [vinagre/plugin] Vinagre Plugin Support
Date: Tue, 7 Jul 2009 04:39:32 +0000 (UTC)
commit 285c6af73b01fdc7a073a704c53f9418c443293e
Author: Jorge Pereira <jpereira gnome org>
Date:   Tue Jul 7 01:06:42 2009 -0300

    Vinagre Plugin Support

 .gitignore                                 |    2 +
 INSTALL                                    |  302 ++++++++++++++++++++++++++--
 Makefile.am                                |    3 +-
 autogen.sh                                 |    4 +-
 configure.ac                               |   29 +++-
 plugin-loaders/Makefile.am                 |    3 +
 plugin-loaders/c/Makefile.am               |   24 +++
 plugin-loaders/c/vinagre-plugin-loader-c.c |  182 +++++++++++++++++
 plugin-loaders/c/vinagre-plugin-loader-c.h |   60 ++++++
 vinagre/Makefile.am                        |    3 +-
 vinagre/view/Makefile.am                   |    4 +-
 11 files changed, 593 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27317d0..8fe77d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,8 @@ po/Makefile.in
 po/Makefile.in.in
 po/POTFILES
 po/stamp-it
+plugins/Makefile
+plugins/Makefile.in
 vinagre/.deps/
 vinagre/GNOME_VinagreApplet.server
 vinagre/GNOME_VinagreApplet.server.in
diff --git a/INSTALL b/INSTALL
index e9bd97f..8b82ade 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,291 @@
-Vinagre Installation Instructions
-=================================
+Installation Instructions
+*************************
 
-You need the devel packages of the following libraries:
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
 
- - gtk+ >= 2.14
- - glib >= 2.18
- - libglade-2.0
- - gconf-2.0
- - gnome-keyring
- - gtk-vnc widget >= 0.3.8 (http://sourceforge.net/projects/gtk-vnc)
- - avahi-gobject and avahi-ui >= 0.6.22
- - libpanelapplet-2.0 >= 2.0.0
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
 
-To compile it, just do:
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
 
-./configure [--prefix=/usr]
-make
-make install (as root, or with sudo)
diff --git a/Makefile.am b/Makefile.am
index e3bb7b1..aace85e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS = src help po data
+#SUBDIRS = vinagre plugins help po data 
+SUBDIRS = vinagre help po data 
 
 vinagredocdir = ${datadir}/doc/vinagre
 vinagredoc_DATA = \
diff --git a/autogen.sh b/autogen.sh
index 55c0a68..414a5f0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="vinagre"
 
-(test -f $srcdir/src/vinagre-main.c) || {
+(test -f $srcdir/vinagre/vinagre-main.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
@@ -21,4 +21,4 @@ REQUIRED_AUTOCONF_VERSION=2.57
 REQUIRED_AUTOMAKE_VERSION=1.7
 REQUIRED_INTLTOOL_VERSION=0.35.0
 REQUIRED_PKG_CONFIG_VERSION=0.16.0
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index ef59695..77784fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,18 +127,43 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
+# Plugins
 #*******************************************************************************
+#
+dnl active plugins for vinagre.schemas
+ACTIVE_PLUGINS="dummy"
+AC_SUBST(ACTIVE_PLUGINS)
 
+VINAGRE_IMPLIB=""
+PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
+LOADER_LIBTOOL_FLAGS="-module -avoid-version"
+
+AC_SUBST(VINAGRE_IMPLIB)
+AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+AC_SUBST(LOADER_LIBTOOL_FLAGS)
+
+VINAGRE_PLUGINS_DATA_DIR="$datadir/vinagre/plugins"
+AC_SUBST(VINAGRE_PLUGINS_DATA_DIR)
+
+VINAGRE_PLUGINS_LIBS_DIR="$libdir/vinagre/plugins"
+AC_SUBST(VINAGRE_PLUGINS_LIBS_DIR)
+
+#*******************************************************************************
 AC_OUTPUT([
 Makefile
 data/Makefile
 data/vinagre.desktop.in
 data/vinagre-file.desktop.in
 data/icons/Makefile
+data/pixmaps/Makefile
 help/Makefile
 po/Makefile.in
-src/Makefile
-src/view/Makefile
+plugin-loaders/Makefile
+plugin-loaders/c/Makefile
+plugins/Makefile
+plugins/dummy/Makefile
+vinagre/Makefile
+vinagre/view/Makefile
 ])
 
 #*******************************************************************************
diff --git a/plugin-loaders/Makefile.am b/plugin-loaders/Makefile.am
new file mode 100644
index 0000000..2573ec3
--- /dev/null
+++ b/plugin-loaders/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = c
+
+-include $(top_srcdir)/git.mk
diff --git a/plugin-loaders/c/Makefile.am b/plugin-loaders/c/Makefile.am
new file mode 100644
index 0000000..a39234f
--- /dev/null
+++ b/plugin-loaders/c/Makefile.am
@@ -0,0 +1,24 @@
+# C plugin loader
+
+loaderdir = $(libdir)/vinagre/plugin-loaders
+
+INCLUDES = \
+	-I$(top_srcdir) 						\
+	$(VINAGRE_CFLAGS) 						\
+	$(WARN_CFLAGS)							\
+	$(DISABLE_DEPRECATED_CFLAGS)					\
+	-DVINAGRE_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+loader_LTLIBRARIES = libcloader.la
+
+NOINST_H_FILES = \
+	vinagre-plugin-loader-c.h
+
+libcloader_la_SOURCES = \
+	vinagre-plugin-loader-c.c 	\
+	$(NOINST_H_FILES)
+
+libcloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS)
+libcloader_la_LIBADD = $(VINAGRE_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugin-loaders/c/vinagre-plugin-loader-c.c b/plugin-loaders/c/vinagre-plugin-loader-c.c
new file mode 100644
index 0000000..4b82a44
--- /dev/null
+++ b/plugin-loaders/c/vinagre-plugin-loader-c.c
@@ -0,0 +1,182 @@
+/*
+ * vinagre-plugin-loader-c.c
+ * This file is part of vinagre
+ *
+ * Copyright (C) 2008 - Jesse van den Kieboom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, 
+ * Boston, MA 02111-1307, USA. 
+ */
+
+#include "vinagre-plugin-loader-c.h"
+#include <vinagre/vinagre-object-module.h>
+
+#define VINAGRE_PLUGIN_LOADER_C_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderCPrivate))
+
+struct _VinagrePluginLoaderCPrivate
+{
+	GHashTable *loaded_plugins;
+};
+
+static void vinagre_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
+
+VINAGRE_PLUGIN_LOADER_REGISTER_TYPE (VinagrePluginLoaderC, vinagre_plugin_loader_c, G_TYPE_OBJECT, vinagre_plugin_loader_iface_init);
+
+
+static const gchar *
+vinagre_plugin_loader_iface_get_id (void)
+{
+	return "C";
+}
+
+static VinagrePlugin *
+vinagre_plugin_loader_iface_load (VinagrePluginLoader *loader,
+				VinagrePluginInfo   *info,
+				const gchar       *path)
+{
+	VinagrePluginLoaderC *cloader = VINAGRE_PLUGIN_LOADER_C (loader);
+	VinagreObjectModule *module;
+	const gchar *module_name;
+	VinagrePlugin *result;
+
+	module = (VinagreObjectModule *)g_hash_table_lookup (cloader->priv->loaded_plugins, info);
+	module_name = vinagre_plugin_info_get_module_name (info);
+
+	if (module == NULL)
+	{
+		/* For now we force all modules to be resident */
+		module = vinagre_object_module_new (module_name,
+						  path,
+						  "register_vinagre_plugin",
+						  TRUE);
+
+		/* Infos are available for all the lifetime of the loader.
+		 * If this changes, we should use weak refs or something */
+
+		g_hash_table_insert (cloader->priv->loaded_plugins, info, module);
+	}
+
+	if (!g_type_module_use (G_TYPE_MODULE (module)))
+	{
+		g_warning ("Could not load plugin module: %s", vinagre_plugin_info_get_name (info));
+
+		return NULL;
+	}
+
+	/* TODO: for now we force data-dir-name = module-name... if needed we can
+	 * add a datadir field to the plugin descriptor file.
+	 */
+	result = (VinagrePlugin *)vinagre_object_module_new_object (module,
+								"install-dir", path,
+								"data-dir-name", module_name,
+								NULL);
+
+	if (!result)
+	{
+		g_warning ("Could not create plugin object: %s", vinagre_plugin_info_get_name (info));
+		g_type_module_unuse (G_TYPE_MODULE (module));
+		
+		return NULL;
+	}
+
+	g_type_module_unuse (G_TYPE_MODULE (module));
+	
+	return result;
+}
+
+static void
+vinagre_plugin_loader_iface_unload (VinagrePluginLoader *loader,
+				  VinagrePluginInfo   *info)
+{
+	//VinagrePluginLoaderC *cloader = VINAGRE_PLUGIN_LOADER_C (loader);
+	
+	/* this is a no-op, since the type module will be properly unused as
+	   the last reference to the plugin dies. When the plugin is activated
+	   again, the library will be reloaded */
+}
+
+static void
+vinagre_plugin_loader_iface_init (gpointer g_iface, 
+				gpointer iface_data)
+{
+	VinagrePluginLoaderInterface *iface = (VinagrePluginLoaderInterface *)g_iface;
+	
+	iface->get_id = vinagre_plugin_loader_iface_get_id;
+	iface->load = vinagre_plugin_loader_iface_load;
+	iface->unload = vinagre_plugin_loader_iface_unload;
+}
+
+static void
+vinagre_plugin_loader_c_finalize (GObject *object)
+{
+	VinagrePluginLoaderC *cloader = VINAGRE_PLUGIN_LOADER_C (object);
+	GList *infos;
+	GList *item;
+
+	/* FIXME: this sanity check it's not efficient. Let's remove it
+	 * once we are confident with the code */
+
+	infos = g_hash_table_get_keys (cloader->priv->loaded_plugins);
+	
+	for (item = infos; item; item = item->next)
+	{
+		VinagrePluginInfo *info = (VinagrePluginInfo *)item->data;
+
+		if (vinagre_plugin_info_is_active (info))
+		{
+			g_warning ("There are still C plugins loaded during destruction");
+			break;
+		}
+	}
+
+	g_list_free (infos);	
+
+	g_hash_table_destroy (cloader->priv->loaded_plugins);
+	
+	G_OBJECT_CLASS (vinagre_plugin_loader_c_parent_class)->finalize (object);
+}
+
+static void
+vinagre_plugin_loader_c_class_init (VinagrePluginLoaderCClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	
+	object_class->finalize = vinagre_plugin_loader_c_finalize;
+
+	g_type_class_add_private (object_class, sizeof (VinagrePluginLoaderCPrivate));
+}
+
+static void
+vinagre_plugin_loader_c_class_finalize (VinagrePluginLoaderCClass *klass)
+{
+}
+
+static void
+vinagre_plugin_loader_c_init (VinagrePluginLoaderC *self)
+{
+	self->priv = VINAGRE_PLUGIN_LOADER_C_GET_PRIVATE (self);
+	
+	/* loaded_plugins maps VinagrePluginInfo to a VinagreObjectModule */
+	self->priv->loaded_plugins = g_hash_table_new (g_direct_hash,
+						       g_direct_equal);
+}
+
+VinagrePluginLoaderC *
+vinagre_plugin_loader_c_new ()
+{
+	GObject *loader = g_object_new (VINAGRE_TYPE_PLUGIN_LOADER_C, NULL);
+
+	return VINAGRE_PLUGIN_LOADER_C (loader);
+}
diff --git a/plugin-loaders/c/vinagre-plugin-loader-c.h b/plugin-loaders/c/vinagre-plugin-loader-c.h
new file mode 100644
index 0000000..2f55236
--- /dev/null
+++ b/plugin-loaders/c/vinagre-plugin-loader-c.h
@@ -0,0 +1,60 @@
+/*
+ * vinagre-plugin-loader-c.h
+ * This file is part of vinagre
+ *
+ * Copyright (C) 2008 - Jesse van den Kieboom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, 
+ * Boston, MA 02111-1307, USA. 
+ */
+
+#ifndef __VINAGRE_PLUGIN_LOADER_C_H__
+#define __VINAGRE_PLUGIN_LOADER_C_H__
+
+#include <vinagre/vinagre-plugin-loader.h>
+
+G_BEGIN_DECLS
+
+#define VINAGRE_TYPE_PLUGIN_LOADER_C		(vinagre_plugin_loader_c_get_type ())
+#define VINAGRE_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderC))
+#define VINAGRE_PLUGIN_LOADER_C_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderC const))
+#define VINAGRE_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderCClass))
+#define VINAGRE_IS_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C))
+#define VINAGRE_IS_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PLUGIN_LOADER_C))
+#define VINAGRE_PLUGIN_LOADER_C_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderCClass))
+
+typedef struct _VinagrePluginLoaderC		VinagrePluginLoaderC;
+typedef struct _VinagrePluginLoaderCClass		VinagrePluginLoaderCClass;
+typedef struct _VinagrePluginLoaderCPrivate	VinagrePluginLoaderCPrivate;
+
+struct _VinagrePluginLoaderC {
+	GObject parent;
+	
+	VinagrePluginLoaderCPrivate *priv;
+};
+
+struct _VinagrePluginLoaderCClass {
+	GObjectClass parent_class;
+};
+
+GType vinagre_plugin_loader_c_get_type (void) G_GNUC_CONST;
+VinagrePluginLoaderC *vinagre_plugin_loader_c_new(void);
+
+/* All the loaders must implement this function */
+G_MODULE_EXPORT GType register_vinagre_plugin_loader (GTypeModule * module);
+
+G_END_DECLS
+
+#endif /* __VINAGRE_PLUGIN_LOADER_C_H__ */
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index d961aee..ea50e27 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -39,6 +39,7 @@ libvinagre_la_SOURCES = \
   \
   vinagre-debug.h vinagre-debug.c \
   vinagre-dirs.h vinagre-dirs.c \
+  vinagre-object-module.h vinagre-object-module.c \
   vinagre-plugin.h vinagre-plugin.c \
   vinagre-plugin-manager.h vinagre-plugin-manager.c \
   vinagre-plugin-info.h vinagre-plugin-info-priv.h vinagre-plugin-info.c \
@@ -132,7 +133,7 @@ vinagre_applet_LDADD =			\
 ##############################
 
 vinagre_enum_headers = \
-	$(top_srcdir)/src/vinagre-connection.h \
+	$(top_srcdir)/vinagre/vinagre-connection.h \
 	$(NULL)
 
 vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers)
diff --git a/vinagre/view/Makefile.am b/vinagre/view/Makefile.am
index 947068c..f2dd0f8 100644
--- a/vinagre/view/Makefile.am
+++ b/vinagre/view/Makefile.am
@@ -3,8 +3,8 @@ NULL =
 INCLUDES =                                  \
         -I$(top_srcdir)                     \
         -I$(top_builddir)                   \
-        -I$(top_srcdir)/src                 \
-        -I$(top_builddir)/src               \
+        -I$(top_srcdir)/vinagre             \
+        -I$(top_builddir)/vinagre           \
         $(VINAGRE_CFLAGS)                   \
         $(NULL)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]