[vinagre] stuff

From: Jonh Wendell <jwendell src gnome org>
To: svn-commits-list gnome org
Subject: [vinagre] stuff
Date: Mon, 27 Jul 2009 12:01:56 +0000 (UTC)
commit 9a4397ca565a00a542610ee2b5b7cfe5bce38fe1
Author: Jonh Wendell <jwendell gnome org>
Date:   Tue Jul 7 16:35:15 2009 +0100

    stuff

 Makefile.am                      |    3 +-
 vinagre/vinagre-debug.c          |  120 ++++++++++++++++----------------
 vinagre/vinagre-debug.h          |   26 ++++---
 vinagre/vinagre-main.c           |   35 ++++++----
 vinagre/vinagre-plugins-engine.c |  141 ++++++++++++++++++-------------------
 vinagre/vinagre-plugins-engine.h |   51 +++++++-------
 6 files changed, 191 insertions(+), 185 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index aace85e..d19414f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
-#SUBDIRS = vinagre plugins help po data 
-SUBDIRS = vinagre help po data 
+SUBDIRS = vinagre help po data plugins plugin-loaders
 
 vinagredocdir = ${datadir}/doc/vinagre
 vinagredoc_DATA = \
diff --git a/vinagre/vinagre-debug.c b/vinagre/vinagre-debug.c
index 6e228d9..d306c46 100644
--- a/vinagre/vinagre-debug.c
+++ b/vinagre/vinagre-debug.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include "vinagre-debug.h"
 
-#define ENABLE_PROFILING
+/* #define ENABLE_PROFILING */
 
 #ifdef ENABLE_PROFILING
 static GTimer *timer = NULL;
@@ -37,27 +37,29 @@ static VinagreDebugSection debug = VINAGRE_NO_DEBUG;
 void
 vinagre_debug_init ()
 {
-	if (g_getenv ("VINAGRE_DEBUG") != NULL)
-	{
-		/* enable all debugging */
-		debug = ~VINAGRE_NO_DEBUG;
-		goto out;
-	}
-
-	if (g_getenv ("VINAGRE_DEBUG_VIEW") != NULL)
-		debug = debug | VINAGRE_DEBUG_VIEW;
-	if (g_getenv ("VINAGRE_DEBUG_PREFS") != NULL)
-		debug = debug | VINAGRE_DEBUG_PREFS;
-	if (g_getenv ("VINAGRE_DEBUG_PRINT") != NULL)
-		debug = debug | VINAGRE_DEBUG_PRINT;
-	if (g_getenv ("VINAGRE_DEBUG_PLUGINS") != NULL)
-		debug = debug | VINAGRE_DEBUG_PLUGINS;
-	if (g_getenv ("VINAGRE_DEBUG_UTILS") != NULL)
-		debug = debug | VINAGRE_DEBUG_UTILS;
-	if (g_getenv ("VINAGRE_DEBUG_WINDOW") != NULL)
-		debug = debug | VINAGRE_DEBUG_WINDOW;
-	if (g_getenv ("VINAGRE_DEBUG_LOADER") != NULL)
-		debug = debug | VINAGRE_DEBUG_LOADER;
+  if (g_getenv ("VINAGRE_DEBUG") != NULL)
+    {
+      /* enable all debugging */
+      debug = ~VINAGRE_NO_DEBUG;
+      goto out;
+    }
+
+  if (g_getenv ("VINAGRE_DEBUG_VIEW") != NULL)
+    debug = debug | VINAGRE_DEBUG_VIEW;
+  if (g_getenv ("VINAGRE_DEBUG_PREFS") != NULL)
+    debug = debug | VINAGRE_DEBUG_PREFS;
+  if (g_getenv ("VINAGRE_DEBUG_PRINT") != NULL)
+    debug = debug | VINAGRE_DEBUG_PRINT;
+  if (g_getenv ("VINAGRE_DEBUG_PLUGINS") != NULL)
+    debug = debug | VINAGRE_DEBUG_PLUGINS;
+  if (g_getenv ("VINAGRE_DEBUG_UTILS") != NULL)
+    debug = debug | VINAGRE_DEBUG_UTILS;
+  if (g_getenv ("VINAGRE_DEBUG_WINDOW") != NULL)
+    debug = debug | VINAGRE_DEBUG_WINDOW;
+  if (g_getenv ("VINAGRE_DEBUG_LOADER") != NULL)
+    debug = debug | VINAGRE_DEBUG_LOADER;
+  if (g_getenv ("VINAGRE_DEBUG_APP") != NULL)
+    debug = debug | VINAGRE_DEBUG_APP;
 
 out:		
 
@@ -70,62 +72,62 @@ out:
 
 void
 vinagre_debug_message (VinagreDebugSection  section,
-		     const gchar       *file,
-		     gint               line,
-		     const gchar       *function,
-		     const gchar       *format, ...)
+		       const gchar       *file,
+		       gint               line,
+		       const gchar       *function,
+		       const gchar       *format, ...)
 {
-	if (G_UNLIKELY (debug & section))
-	{	
+  if (G_UNLIKELY (debug & section))
+    {	
 #ifdef ENABLE_PROFILING
-		gdouble seconds;
+      gdouble seconds;
 #endif
 
-		va_list args;
-		gchar *msg;
+      va_list args;
+      gchar *msg;
 
-		g_return_if_fail (format != NULL);
+      g_return_if_fail (format != NULL);
 
-		va_start (args, format);
-		msg = g_strdup_vprintf (format, args);
-		va_end (args);
+      va_start (args, format);
+      msg = g_strdup_vprintf (format, args);
+      va_end (args);
 
 #ifdef ENABLE_PROFILING
-		g_return_if_fail (timer != NULL);
+      g_return_if_fail (timer != NULL);
 
-		seconds = g_timer_elapsed (timer, NULL);
-		g_print ("[%f (%f)] %s:%d (%s) %s\n", 
-			 seconds, seconds - last,  file, line, function, msg);
-		last = seconds;			 
+      seconds = g_timer_elapsed (timer, NULL);
+      g_print ("[%f (%f)] %s:%d (%s) %s\n", 
+		 seconds, seconds - last,  file, line, function, msg);
+      last = seconds;			 
 #else
-		g_print ("%s:%d (%s) %s\n", file, line, function, msg);	
+      g_print ("%s:%d (%s) %s\n", file, line, function, msg);	
 #endif
 
-		fflush (stdout);
-
-		g_free (msg);
-	}
+      fflush (stdout);
+      g_free (msg);
+    }
 }
 
 void vinagre_debug (VinagreDebugSection  section,
-		  const gchar       *file,
-		  gint               line,
-		  const gchar       *function)
+		    const gchar       *file,
+		    gint               line,
+		    const gchar       *function)
 {
-	if (G_UNLIKELY (debug & section))
-	{
+  if (G_UNLIKELY (debug & section))
+    {
 #ifdef ENABLE_PROFILING
-		gdouble seconds;
+      gdouble seconds;
 
-		g_return_if_fail (timer != NULL);
+      g_return_if_fail (timer != NULL);
 
-		seconds = g_timer_elapsed (timer, NULL);		
-		g_print ("[%f (%f)] %s:%d (%s)\n", 
-			 seconds, seconds - last, file, line, function);
-		last = seconds;
+      seconds = g_timer_elapsed (timer, NULL);		
+      g_print ("[%f (%f)] %s:%d (%s)\n", 
+	       seconds, seconds - last, file, line, function);
+      last = seconds;
 #else
-		g_print ("%s:%d (%s)\n", file, line, function);
+      g_print ("%s:%d (%s)\n", file, line, function);
 #endif		
-		fflush (stdout);
-	}
+      fflush (stdout);
+    }
 }
+/* vim: set ts=8: */
diff --git a/vinagre/vinagre-debug.h b/vinagre/vinagre-debug.h
index 360e268..954f9db 100644
--- a/vinagre/vinagre-debug.h
+++ b/vinagre/vinagre-debug.h
@@ -37,30 +37,32 @@ typedef enum {
 	VINAGRE_DEBUG_UTILS    = 1 << 4,
 	VINAGRE_DEBUG_WINDOW   = 1 << 5,
 	VINAGRE_DEBUG_LOADER   = 1 << 6,
+	VINAGRE_DEBUG_APP      = 1 << 7,
 } VinagreDebugSection;
 
 
-#define	DEBUG_VIEW   	VINAGRE_DEBUG_VIEW,    __FILE__, __LINE__, G_STRFUNC
-#define	DEBUG_PRINT	  VINAGRE_DEBUG_PRINT,   __FILE__, __LINE__, G_STRFUNC
-#define	DEBUG_PREFS	  VINAGRE_DEBUG_PREFS,   __FILE__, __LINE__, G_STRFUNC
+#define	DEBUG_VIEW	VINAGRE_DEBUG_VIEW,    __FILE__, __LINE__, G_STRFUNC
+#define	DEBUG_PRINT	VINAGRE_DEBUG_PRINT,   __FILE__, __LINE__, G_STRFUNC
+#define	DEBUG_PREFS	VINAGRE_DEBUG_PREFS,   __FILE__, __LINE__, G_STRFUNC
 #define	DEBUG_PLUGINS	VINAGRE_DEBUG_PLUGINS, __FILE__, __LINE__, G_STRFUNC
-#define	DEBUG_UTILS	  VINAGRE_DEBUG_UTILS,   __FILE__, __LINE__, G_STRFUNC
+#define	DEBUG_UTILS	VINAGRE_DEBUG_UTILS,   __FILE__, __LINE__, G_STRFUNC
 #define	DEBUG_WINDOW	VINAGRE_DEBUG_WINDOW,  __FILE__, __LINE__, G_STRFUNC
 #define	DEBUG_LOADER	VINAGRE_DEBUG_LOADER,  __FILE__, __LINE__, G_STRFUNC
+#define	DEBUG_APP	VINAGRE_DEBUG_APP,  __FILE__, __LINE__, G_STRFUNC
 
 void vinagre_debug_init (void);
 
 void vinagre_debug (VinagreDebugSection  section,
-		  const gchar       *file,
-		  gint               line,
-		  const gchar       *function);
+		    const gchar         *file,
+		    gint                 line,
+		    const gchar         *function);
 
 void vinagre_debug_message (VinagreDebugSection  section,
-			  const gchar       *file,
-			  gint               line,
-			  const gchar       *function,
-			  const gchar       *format, ...) G_GNUC_PRINTF(5, 6);
+			    const gchar         *file,
+			    gint                 line,
+			    const gchar         *function,
+			    const gchar         *format, ...) G_GNUC_PRINTF(5, 6);
 
 
 #endif /* __VINAGRE_DEBUG_H__ */
-
+/* vim: set ts=8: */
diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
index 6d741c3..baf43cb 100644
--- a/vinagre/vinagre-main.c
+++ b/vinagre/vinagre-main.c
@@ -35,10 +35,11 @@
 #include "vinagre-utils.h"
 #include "vinagre-prefs.h"
 #include "vinagre-bacon.h"
+#include "vinagre-plugins-engine.h"
+
 #ifdef HAVE_TELEPATHY
 #include "vinagre-tubes-manager.h"
 #endif
-#include <vncdisplay.h>
 
 #ifdef VINAGRE_ENABLE_AVAHI
 #include "vinagre-mdns.h"
@@ -52,9 +53,6 @@ static gboolean new_window = FALSE;
 
 static const GOptionEntry options [] =
 {
-  { "file", 'f', 0, G_OPTION_ARG_FILENAME_ARRAY, &files,
-    N_("Opens a .vnc file"), N_("filename")},
-
   { "new-window", 'n', 0, G_OPTION_ARG_NONE, &new_window,
     N_("Create a new toplevel window in an existing instance of vinagre"), NULL },
 
@@ -125,25 +123,37 @@ vinagre_main_process_command_line (VinagreWindow *window)
 }
 
 int main (int argc, char **argv) {
-  GOptionContext    *context;
-  GError            *error = NULL;
-  GSList            *l, *next;
-  VinagreWindow     *window;
-  VinagreApp        *app;
+  GOptionContext       *context;
+  GError               *error = NULL;
+  GSList               *l, *next;
+  VinagreWindow        *window;
+  VinagreApp           *app;
+  VinagrePluginsEngine *engine;
 #ifdef HAVE_TELEPATHY
   VinagreTubesManager *vinagre_tubes_manager;
 #endif
 
+  if (!g_thread_supported ())
+    g_thread_init (NULL);
+  g_type_init();
+
+  /* Setup debugging */
+  vinagre_debug_init ();
+  vinagre_debug_message (DEBUG_APP, "Startup");
+
   setlocale (LC_ALL, "");
   bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
+  /* Init plugins engine */
+  vinagre_debug_message (DEBUG_APP, "Init plugins");
+  engine = vinagre_plugins_engine_get_default ();
+
   /* Setup command line options */
-  context = g_option_context_new (_("- VNC Client for GNOME"));
+  context = g_option_context_new (_("- Remote Desktop Viewer"));
   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
-  g_option_context_add_group (context, vnc_display_get_option_group ());
   g_option_context_parse (context, &argc, &argv, &error);
   if (error)
     {
@@ -159,9 +169,6 @@ int main (int argc, char **argv) {
 
   vinagre_bacon_start (servers, new_window);
 
-  if (!g_thread_supported ())
-    g_thread_init (NULL);
-
   app = vinagre_app_get_default ();
   window = vinagre_app_create_window (app, NULL);
   gtk_widget_show (GTK_WIDGET(window));
diff --git a/vinagre/vinagre-plugins-engine.c b/vinagre/vinagre-plugins-engine.c
index 68f85ef..82f1960 100644
--- a/vinagre/vinagre-plugins-engine.c
+++ b/vinagre/vinagre-plugins-engine.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <string.h>
-
 #include <glib/gi18n.h>
 
 #include "vinagre-plugins-engine.h"
@@ -36,7 +35,7 @@
 #include "vinagre-object-module.h"
 #include "vinagre-dirs.h"
 
-#define VINAGRE_PLUGINS_ENGINE_BASE_KEY "/apps/vinagre-2/plugins"
+#define VINAGRE_PLUGINS_ENGINE_BASE_KEY "/apps/vinagre/plugins"
 #define VINAGRE_PLUGINS_ENGINE_KEY VINAGRE_PLUGINS_ENGINE_BASE_KEY "/active-plugins"
 
 #define PLUGIN_EXT	".vinagre-plugin"
@@ -44,16 +43,16 @@
 
 typedef struct
 {
-	VinagrePluginLoader *loader;
-	VinagreObjectModule *module;
+  VinagrePluginLoader *loader;
+  VinagreObjectModule *module;
 } LoaderInfo;
 
 /* Signals */
 enum
 {
-	ACTIVATE_PLUGIN,
-	DEACTIVATE_PLUGIN,
-	LAST_SIGNAL
+  ACTIVATE_PLUGIN,
+  DEACTIVATE_PLUGIN,
+  LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL];
@@ -62,18 +61,18 @@ G_DEFINE_TYPE(VinagrePluginsEngine, vinagre_plugins_engine, G_TYPE_OBJECT)
 
 struct _VinagrePluginsEnginePrivate
 {
-	GList *plugin_list;
-	GHashTable *loaders;
+  GList *plugin_list;
+  GHashTable *loaders;
 
-	gboolean activate_from_prefs;
+  gboolean activate_from_prefs;
 };
 
 VinagrePluginsEngine *default_engine = NULL;
 
 static void	vinagre_plugins_engine_activate_plugin_real (VinagrePluginsEngine *engine,
-							   VinagrePluginInfo    *info);
-static void	vinagre_plugins_engine_deactivate_plugin_real (VinagrePluginsEngine *engine,
 							     VinagrePluginInfo    *info);
+static void	vinagre_plugins_engine_deactivate_plugin_real (VinagrePluginsEngine *engine,
+							       VinagrePluginInfo    *info);
 
 typedef gboolean (*LoadDirCallback)(VinagrePluginsEngine *engine, const gchar *filename, gpointer userdata);
 
@@ -483,39 +482,38 @@ get_plugin_loader (VinagrePluginsEngine *engine,
 VinagrePluginsEngine *
 vinagre_plugins_engine_get_default (void)
 {
-	if (default_engine != NULL)
-		return default_engine;
+  if (default_engine != NULL)
+    return default_engine;
 
-	default_engine = VINAGRE_PLUGINS_ENGINE (g_object_new (VINAGRE_TYPE_PLUGINS_ENGINE, NULL));
-	g_object_add_weak_pointer (G_OBJECT (default_engine),
-				   (gpointer) &default_engine);
-	return default_engine;
+  default_engine = VINAGRE_PLUGINS_ENGINE (g_object_new (VINAGRE_TYPE_PLUGINS_ENGINE, NULL));
+  g_object_add_weak_pointer (G_OBJECT (default_engine),
+			     (gpointer) &default_engine);
+  return default_engine;
 }
 
 const GList *
 vinagre_plugins_engine_get_plugin_list (VinagrePluginsEngine *engine)
 {
-	vinagre_debug (DEBUG_PLUGINS);
-
-	return engine->priv->plugin_list;
+  vinagre_debug (DEBUG_PLUGINS);
+  return engine->priv->plugin_list;
 }
 
 static gint
 compare_plugin_info_and_name (VinagrePluginInfo *info,
 			      const gchar *module_name)
 {
-	return strcmp (vinagre_plugin_info_get_module_name (info), module_name);
+  return strcmp (vinagre_plugin_info_get_module_name (info), module_name);
 }
 
 VinagrePluginInfo *
 vinagre_plugins_engine_get_plugin_info (VinagrePluginsEngine *engine,
                           				      const gchar        *name)
 {
-	GList *l = g_list_find_custom (engine->priv->plugin_list,
-				       name,
-				       (GCompareFunc) compare_plugin_info_and_name);
+  GList *l = g_list_find_custom (engine->priv->plugin_list,
+				 name,
+				 (GCompareFunc) compare_plugin_info_and_name);
 
-	return l == NULL ? NULL : (VinagrePluginInfo *) l->data;
+  return l == NULL ? NULL : (VinagrePluginInfo *) l->data;
 }
 
 static void
@@ -656,71 +654,70 @@ vinagre_plugins_engine_deactivate_plugin_real (VinagrePluginsEngine *engine,
 
 gboolean
 vinagre_plugins_engine_deactivate_plugin (VinagrePluginsEngine *engine,
-                                					VinagrePluginInfo    *info)
+					  VinagrePluginInfo    *info)
 {
-	vinagre_debug (DEBUG_PLUGINS);
+  vinagre_debug (DEBUG_PLUGINS);
 
-	g_return_val_if_fail (info != NULL, FALSE);
+  g_return_val_if_fail (info != NULL, FALSE);
 
-	if (!vinagre_plugin_info_is_active (info))
-		return TRUE;
+  if (!vinagre_plugin_info_is_active (info))
+    return TRUE;
 
-	g_signal_emit (engine, signals[DEACTIVATE_PLUGIN], 0, info);
-	if (!vinagre_plugin_info_is_active (info))
-		save_active_plugin_list (engine);
+  g_signal_emit (engine, signals[DEACTIVATE_PLUGIN], 0, info);
+  if (!vinagre_plugin_info_is_active (info))
+    save_active_plugin_list (engine);
 
-	return !vinagre_plugin_info_is_active (info);
+  return !vinagre_plugin_info_is_active (info);
 }
 
 void
 vinagre_plugins_engine_activate_plugins (VinagrePluginsEngine *engine,
-                                         VinagreWindow        *window)
+					 VinagreWindow        *window)
 {
-	GSList *active_plugins = NULL;
-	GList *pl;
+  GSList *active_plugins = NULL;
+  GList *pl;
 
-	vinagre_debug (DEBUG_PLUGINS);
+  vinagre_debug (DEBUG_PLUGINS);
 
-	g_return_if_fail (VINAGRE_IS_PLUGINS_ENGINE (engine));
-	g_return_if_fail (VINAGRE_IS_WINDOW (window));
+  g_return_if_fail (VINAGRE_IS_PLUGINS_ENGINE (engine));
+  g_return_if_fail (VINAGRE_IS_WINDOW (window));
 
-	/* the first time, we get the 'active' plugins from gconf */
-	if (engine->priv->activate_from_prefs)
-	{
-//AQUI		active_plugins = vinagre_prefs_manager_get_active_plugins ();
-	}
+  /* the first time, we get the 'active' plugins from gconf */
+  if (engine->priv->activate_from_prefs)
+    {
+      //AQUI: active_plugins = vinagre_prefs_manager_get_active_plugins ();
+    }
 
-	for (pl = engine->priv->plugin_list; pl; pl = pl->next)
-	{
-		VinagrePluginInfo *info = (VinagrePluginInfo*)pl->data;
+  for (pl = engine->priv->plugin_list; pl; pl = pl->next)
+    {
+      VinagrePluginInfo *info = (VinagrePluginInfo*)pl->data;
 		
-		if (engine->priv->activate_from_prefs && 
-		    g_slist_find_custom (active_plugins,
-					 vinagre_plugin_info_get_module_name (info),
-					 (GCompareFunc)strcmp) == NULL)
-			continue;
+      if (engine->priv->activate_from_prefs && 
+	  g_slist_find_custom (active_plugins,
+			       vinagre_plugin_info_get_module_name (info),
+			       (GCompareFunc)strcmp) == NULL)
+	continue;
 		
-		/* If plugin is not active, don't try to activate/load it */
-		if (!engine->priv->activate_from_prefs && 
-		    !vinagre_plugin_info_is_active (info))
-			continue;
-
-		if (load_plugin (engine, info))
-			vinagre_plugin_activate (info->plugin,
-					       window);
-	}
+      /* If plugin is not active, don't try to activate/load it */
+      if (!engine->priv->activate_from_prefs && 
+	  !vinagre_plugin_info_is_active (info))
+	continue;
+
+      if (load_plugin (engine, info))
+	vinagre_plugin_activate (info->plugin, window);
+    }
 	
-	if (engine->priv->activate_from_prefs)
-	{
-		g_slist_foreach (active_plugins, (GFunc) g_free, NULL);
-		g_slist_free (active_plugins);
-		engine->priv->activate_from_prefs = FALSE;
-	}
+  if (engine->priv->activate_from_prefs)
+    {
+      g_slist_foreach (active_plugins, (GFunc) g_free, NULL);
+      g_slist_free (active_plugins);
+      engine->priv->activate_from_prefs = FALSE;
+    }
 	
-	vinagre_debug_message (DEBUG_PLUGINS, "End");
+  vinagre_debug_message (DEBUG_PLUGINS, "End");
 
-	/* also call update_ui after activation */
-	vinagre_plugins_engine_update_plugins_ui (engine, window);
+  /* also call update_ui after activation */
+  vinagre_plugins_engine_update_plugins_ui (engine, window);
 }
 
 void
diff --git a/vinagre/vinagre-plugins-engine.h b/vinagre/vinagre-plugins-engine.h
index d6c9572..08eac1b 100644
--- a/vinagre/vinagre-plugins-engine.h
+++ b/vinagre/vinagre-plugins-engine.h
@@ -40,57 +40,56 @@ typedef struct _VinagrePluginsEnginePrivate	VinagrePluginsEnginePrivate;
 
 struct _VinagrePluginsEngine
 {
-	GObject parent;
-	VinagrePluginsEnginePrivate *priv;
+  GObject parent;
+  VinagrePluginsEnginePrivate *priv;
 };
 
-typedef struct _VinagrePluginsEngineClass		VinagrePluginsEngineClass;
+typedef struct _VinagrePluginsEngineClass	VinagrePluginsEngineClass;
 
 struct _VinagrePluginsEngineClass
 {
-	GObjectClass parent_class;
+  GObjectClass parent_class;
 
-	void	 (* activate_plugin)		(VinagrePluginsEngine *engine,
-						 VinagrePluginInfo    *info);
+  void	 (* activate_plugin)		(VinagrePluginsEngine *engine,
+					 VinagrePluginInfo    *info);
 
-	void	 (* deactivate_plugin)		(VinagrePluginsEngine *engine,
-						 VinagrePluginInfo    *info);
+  void	 (* deactivate_plugin)		(VinagrePluginsEngine *engine,
+					 VinagrePluginInfo    *info);
 };
 
 GType			 vinagre_plugins_engine_get_type		(void) G_GNUC_CONST;
 
-VinagrePluginsEngine	*vinagre_plugins_engine_get_default	(void);
+VinagrePluginsEngine	*vinagre_plugins_engine_get_default		(void);
 
-void		 vinagre_plugins_engine_garbage_collect	(VinagrePluginsEngine *engine);
+void			 vinagre_plugins_engine_garbage_collect		(VinagrePluginsEngine *engine);
 
-const GList	*vinagre_plugins_engine_get_plugin_list 	(VinagrePluginsEngine *engine);
+const GList		*vinagre_plugins_engine_get_plugin_list 	(VinagrePluginsEngine *engine);
 
-VinagrePluginInfo	*vinagre_plugins_engine_get_plugin_info	(VinagrePluginsEngine *engine,
-							 const gchar        *name);
+VinagrePluginInfo	*vinagre_plugins_engine_get_plugin_info		(VinagrePluginsEngine *engine,
+									 const gchar        *name);
 
 /* plugin load and unloading (overall, for all windows) */
 gboolean 	 vinagre_plugins_engine_activate_plugin 	(VinagrePluginsEngine *engine,
-							 VinagrePluginInfo    *info);
+								 VinagrePluginInfo    *info);
 gboolean 	 vinagre_plugins_engine_deactivate_plugin	(VinagrePluginsEngine *engine,
-							 VinagrePluginInfo    *info);
+								 VinagrePluginInfo    *info);
 
 void	 	 vinagre_plugins_engine_configure_plugin	(VinagrePluginsEngine *engine,
-							 VinagrePluginInfo    *info,
-							 GtkWindow          *parent);
+								 VinagrePluginInfo    *info,
+								 GtkWindow            *parent);
 
 /* plugin activation/deactivation per window, private to VinagreWindow */
-void 		 vinagre_plugins_engine_activate_plugins   (VinagrePluginsEngine *engine,
-							  VinagreWindow        *window);
-void 		 vinagre_plugins_engine_deactivate_plugins (VinagrePluginsEngine *engine,
-							  VinagreWindow        *window);
-void		 vinagre_plugins_engine_update_plugins_ui  (VinagrePluginsEngine *engine,
-							  VinagreWindow        *window);
+void 		 vinagre_plugins_engine_activate_plugins 	 (VinagrePluginsEngine *engine,
+								  VinagreWindow        *window);
+void 		 vinagre_plugins_engine_deactivate_plugins	 (VinagrePluginsEngine *engine,
+								  VinagreWindow        *window);
+void		 vinagre_plugins_engine_update_plugins_ui	 (VinagrePluginsEngine *engine,
+								  VinagreWindow        *window);
 
 /* private for gconf notification */
-void		 vinagre_plugins_engine_active_plugins_changed
-							(VinagrePluginsEngine *engine);
+void		 vinagre_plugins_engine_active_plugins_changed	(VinagrePluginsEngine *engine);
 
-void		 vinagre_plugins_engine_rescan_plugins	(VinagrePluginsEngine *engine);
+void		 vinagre_plugins_engine_rescan_plugins		(VinagrePluginsEngine *engine);
 
 G_END_DECLS
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]