[vinagre/no-separate-plugins: 9/11] Remove active plugin list from settings

[David King <davidk src gnome org>]

commit 54ccee8eace4604b2a117ab2b00cc00d3b600cd0
Author: David King <amigadave amigadave com>
Date:   Sat Jun 11 08:17:08 2011 +0200

    Remove active plugin list from settings

 configure.ac                          |    7 -------
 data/org.gnome.Vinagre.gschema.xml.in |    5 -----
 vinagre/vinagre-prefs.c               |   16 ----------------
 3 files changed, 0 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c799bdd..86115c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,13 +213,6 @@ AS_IF([test "x$ac_cv_header_ifaddrs_h" = "xyes"],
   [AS_IF([test "x$have_sockaddr_storage" = "xyes"],
     [AC_DEFINE([RFC2553], [], [Define if RFC2553 is followed])])])
 
-# Active plugins for org.gnome.Vinagre.gschema.xml
-# TODO: Make this work.
-ACTIVE_PLUGINS="vnc"
-AS_IF([test "x$enable_ssh" = "xyes"],
-  [ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"])
-AC_SUBST([ACTIVE_PLUGINS])
-
 GNOME_DOC_INIT
 
 GLIB_GSETTINGS
diff --git a/data/org.gnome.Vinagre.gschema.xml.in b/data/org.gnome.Vinagre.gschema.xml.in
index ccc2684..0a49389 100644
--- a/data/org.gnome.Vinagre.gschema.xml.in
+++ b/data/org.gnome.Vinagre.gschema.xml.in
@@ -26,10 +26,5 @@
       <_summary>Whether we should start the program listening for reverse connections</_summary>
       <_description>Set to "true" to always start the program listening for reverse connections.</_description>
     </key>
-    <key name="active-plugins" type="as">
-      <default>[ 'vnc' ]</default>
-      <_summary>Active plugins</_summary>
-      <_description>List of active plugins. It contains the "Location" of the active plugins. See the .vinagre-plugin file for obtaining the "Location" of a given plugin.</_description>
-    </key>
   </schema>
 </schemalist>
diff --git a/vinagre/vinagre-prefs.c b/vinagre/vinagre-prefs.c
index f52ccce..158b4f5 100644
--- a/vinagre/vinagre-prefs.c
+++ b/vinagre/vinagre-prefs.c
@@ -28,7 +28,6 @@
 #define VM_HISTORY_SIZE			"history-size"
 #define VM_ALWAYS_ENABLE_LISTENING	"always-enable-listening"
 #define VM_SHARED_FLAG			"shared-flag"
-#define VM_ACTIVE_PLUGINS		"active-plugins"
 
 struct _VinagrePrefsPrivate
 {
@@ -41,7 +40,6 @@ enum
   PROP_0,
   PROP_SHARED_FLAG,
   PROP_HISTORY_SIZE,
-  PROP_ACTIVE_PLUGINS,
   PROP_LAST_PROTOCOL,
   PROP_ALWAYS_ENABLE_LISTENING
 };
@@ -101,9 +99,6 @@ vinagre_prefs_set_property (GObject *object, guint prop_id, const GValue *value,
       case PROP_HISTORY_SIZE:
 	g_settings_set_int (prefs->priv->gsettings, VM_HISTORY_SIZE, g_value_get_int (value));
 	break;
-      case PROP_ACTIVE_PLUGINS:
-	g_settings_set_strv (prefs->priv->gsettings, VM_ACTIVE_PLUGINS, g_value_get_boxed (value));
-	break;
       case PROP_ALWAYS_ENABLE_LISTENING:
 	g_settings_set_boolean (prefs->priv->gsettings, VM_ALWAYS_ENABLE_LISTENING, g_value_get_boolean (value));
 	break;
@@ -126,9 +121,6 @@ vinagre_prefs_get_property (GObject *object, guint prop_id, GValue *value, GPara
       case PROP_HISTORY_SIZE:
 	g_value_set_int (value, g_settings_get_int (prefs->priv->gsettings, VM_HISTORY_SIZE));
 	break;
-      case PROP_ACTIVE_PLUGINS:
-	g_value_set_boxed (value, g_settings_get_strv (prefs->priv->gsettings, VM_ACTIVE_PLUGINS));
-	break;
       case PROP_ALWAYS_ENABLE_LISTENING:
 	g_value_set_boolean (value, g_settings_get_boolean (prefs->priv->gsettings, VM_ALWAYS_ENABLE_LISTENING));
 	break;
@@ -180,14 +172,6 @@ vinagre_prefs_class_init (VinagrePrefsClass *klass)
 						     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (object_class,
-				   PROP_ACTIVE_PLUGINS,
-				   g_param_spec_boxed ("active-plugins",
-						       "Active plugins",
-						       "The list of active plugins",
-						       G_TYPE_STRV,
-						       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (object_class,
 				   PROP_ALWAYS_ENABLE_LISTENING,
 				   g_param_spec_boolean ("always-enable-listening",
 							 "Always enable listening",