Commit 6ad39a7b authored by Jonh Wendell's avatar Jonh Wendell
Browse files

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.
parent 9a63ec85
......@@ -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}"
......
......@@ -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">
......
......@@ -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
......
......@@ -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,
......
......@@ -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) },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment