[vinagre] Disabled the GUI to activate plugins. Closes #590255.
- From: Jonh Wendell <jwendell src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vinagre] Disabled the GUI to activate plugins. Closes #590255.
- Date: Mon, 10 Aug 2009 13:21:43 +0000 (UTC)
commit 6ad39a7b2d55e84978a8609970438c10c6ef4202
Author: Jonh Wendell <jwendell gnome org>
Date: Mon Aug 10 10:19:47 2009 -0300
Disabled the GUI to activate plugins. Closes #590255.
By now we just have one basic plugin, and we shouldn't allow
users to disable it.
configure.ac | 3 +++
data/vinagre-ui.xml | 2 ++
vinagre/vinagre-commands.c | 5 +++--
vinagre/vinagre-commands.h | 3 ++-
vinagre/vinagre-ui.h | 4 +++-
5 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 58e6446..4acf212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,9 @@ AC_SUBST(REBUILD)
#
dnl active plugins for vinagre.schemas
ACTIVE_PLUGINS="vnc"
+if test "x$enable_ssh" = "xyes" ; then
+ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"
+fi
AC_SUBST(ACTIVE_PLUGINS)
VINAGRE_IMPLIB="-lvinagre-${VINAGRE_API_VERSION}"
diff --git a/data/vinagre-ui.xml b/data/vinagre-ui.xml
index 4750b63..1f3fddc 100644
--- a/data/vinagre-ui.xml
+++ b/data/vinagre-ui.xml
@@ -38,7 +38,9 @@
<menu name="EditMenu" action="Edit">
<menuitem name="EditPreferencesMenu" action="EditPreferences"/>
+ <!--FIXME: Study this dialog for next release
<menuitem name="EditPluginsMenu" action="EditPlugins"/>
+ -->
</menu>
<menu name="ViewMenu" action="View">
diff --git a/vinagre/vinagre-commands.c b/vinagre/vinagre-commands.c
index 0a9f975..0d45927 100644
--- a/vinagre/vinagre-commands.c
+++ b/vinagre/vinagre-commands.c
@@ -39,8 +39,6 @@
#include "vinagre-window-private.h"
#include "vinagre-prefs.h"
#include "vinagre-plugin.h"
-#include "vinagre-plugin-dialog.h"
-#include "vinagre-plugin-manager.h"
#include "vinagre-plugin-info.h"
#include "vinagre-plugin-info-priv.h"
#include "vinagre-plugins-engine.h"
@@ -229,6 +227,8 @@ vinagre_cmd_edit_preferences (GtkAction *action,
vinagre_prefs_dialog_show (window);
}
+/*
+FIXME: Study this dialog for next release
void
vinagre_cmd_edit_plugins (GtkAction *action,
VinagreWindow *window)
@@ -237,6 +237,7 @@ vinagre_cmd_edit_plugins (GtkAction *action,
vinagre_plugin_dialog_show (GTK_WINDOW (window));
}
+*/
/* View Menu */
void
diff --git a/vinagre/vinagre-commands.h b/vinagre/vinagre-commands.h
index c87e6f6..ec5cacd 100644
--- a/vinagre/vinagre-commands.h
+++ b/vinagre/vinagre-commands.h
@@ -46,9 +46,10 @@ void vinagre_cmd_machine_quit (GtkAction *action,
void vinagre_cmd_edit_preferences (GtkAction *action,
VinagreWindow *window);
+/*FIXME: Study this dialog for next release
void vinagre_cmd_edit_plugins (GtkAction *action,
VinagreWindow *window);
-
+*/
void vinagre_cmd_view_show_toolbar (GtkAction *action,
VinagreWindow *window);
void vinagre_cmd_view_show_statusbar (GtkAction *action,
diff --git a/vinagre/vinagre-ui.h b/vinagre/vinagre-ui.h
index 2317a11..58e7a11 100644
--- a/vinagre/vinagre-ui.h
+++ b/vinagre/vinagre-ui.h
@@ -47,9 +47,11 @@ static const GtkActionEntry vinagre_always_sensitive_entries[] =
/* Edit menu */
{ "EditPreferences", GTK_STOCK_PREFERENCES, NULL, NULL,
N_("Edit the application preferences"), G_CALLBACK (vinagre_cmd_edit_preferences) },
+/*FIXME: Study this dialog for next release
{ "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL,
N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) },
-
+*/
+
/* Bookmarks menu */
{ "BookmarksOpen", GTK_STOCK_CONNECT, N_("_Open bookmark"), NULL,
N_("Connect to this machine"), G_CALLBACK (vinagre_cmd_bookmarks_open) },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]