|
 |
1efd99 |
From c972841191070e1cabb646e30f06a174ffecf5ec Mon Sep 17 00:00:00 2001
|
|
|
1efd99 |
From: Pavel Grunt <pgrunt@redhat.com>
|
|
|
1efd99 |
Date: Mon, 27 Feb 2017 13:47:39 +0100
|
|
|
1efd99 |
Subject: [PATCH virt-viewer] Comment out folder sharing menus
|
|
|
1efd99 |
To: virt-tools-list@redhat.com
|
|
|
1efd99 |
|
|
|
1efd99 |
Folder sharing requires phodav which is not available in el7
|
|
|
1efd99 |
Do not display menu items related to it.
|
|
|
1efd99 |
|
|
|
1efd99 |
Related: rhbz#1413982
|
|
|
1efd99 |
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
|
1efd99 |
---
|
|
|
1efd99 |
src/resources/ui/virt-viewer.ui | 9 ---------
|
|
|
1efd99 |
src/virt-viewer-window.c | 13 -------------
|
|
|
1efd99 |
2 files changed, 22 deletions(-)
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
|
|
|
1efd99 |
index e9609ec..a1070c8 100644
|
|
|
1efd99 |
--- a/src/resources/ui/virt-viewer.ui
|
|
|
1efd99 |
+++ b/src/resources/ui/virt-viewer.ui
|
|
|
1efd99 |
@@ -82,15 +82,6 @@
|
|
|
1efd99 |
</object>
|
|
|
1efd99 |
</child>
|
|
|
1efd99 |
<child>
|
|
|
1efd99 |
- <object class="GtkMenuItem" id="menu-preferences">
|
|
|
1efd99 |
- <property name="visible">True</property>
|
|
|
1efd99 |
- <property name="can_focus">False</property>
|
|
|
1efd99 |
- <property name="label" translatable="yes">_Preferences</property>
|
|
|
1efd99 |
- <property name="use_underline">True</property>
|
|
|
1efd99 |
- <signal name="activate" handler="virt_viewer_window_menu_preferences_cb" swapped="no"/>
|
|
|
1efd99 |
- </object>
|
|
|
1efd99 |
- </child>
|
|
|
1efd99 |
- <child>
|
|
|
1efd99 |
<object class="GtkSeparatorMenuItem" id="separatormenuitem1">
|
|
|
1efd99 |
<property name="visible">True</property>
|
|
|
1efd99 |
<property name="can_focus">False</property>
|
|
|
1efd99 |
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
|
|
|
1efd99 |
index 867a7b0..5997a37 100644
|
|
|
1efd99 |
--- a/src/virt-viewer-window.c
|
|
|
1efd99 |
+++ b/src/virt-viewer-window.c
|
|
|
1efd99 |
@@ -63,7 +63,6 @@ void virt_viewer_window_menu_file_usb_device_selection(GtkWidget *menu, VirtView
|
|
|
1efd99 |
void virt_viewer_window_menu_file_smartcard_insert(GtkWidget *menu, VirtViewerWindow *self);
|
|
|
1efd99 |
void virt_viewer_window_menu_file_smartcard_remove(GtkWidget *menu, VirtViewerWindow *self);
|
|
|
1efd99 |
void virt_viewer_window_menu_view_release_cursor(GtkWidget *menu, VirtViewerWindow *self);
|
|
|
1efd99 |
-void virt_viewer_window_menu_preferences_cb(GtkWidget *menu, VirtViewerWindow *self);
|
|
|
1efd99 |
void virt_viewer_window_menu_change_cd_activate(GtkWidget *menu, VirtViewerWindow *self);
|
|
|
1efd99 |
|
|
|
1efd99 |
|
|
|
1efd99 |
@@ -316,7 +315,6 @@ virt_viewer_window_init (VirtViewerWindow *self)
|
|
|
1efd99 |
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-send")), FALSE);
|
|
|
1efd99 |
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-view-zoom")), FALSE);
|
|
|
1efd99 |
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-file-screenshot")), FALSE);
|
|
|
1efd99 |
- gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-preferences")), FALSE);
|
|
|
1efd99 |
|
|
|
1efd99 |
gtk_builder_connect_signals(priv->builder, self);
|
|
|
1efd99 |
|
|
|
1efd99 |
@@ -967,13 +965,6 @@ virt_viewer_window_menu_file_smartcard_remove(GtkWidget *menu G_GNUC_UNUSED,
|
|
|
1efd99 |
}
|
|
|
1efd99 |
|
|
|
1efd99 |
G_MODULE_EXPORT void
|
|
|
1efd99 |
-virt_viewer_window_menu_preferences_cb(GtkWidget *menu G_GNUC_UNUSED,
|
|
|
1efd99 |
- VirtViewerWindow *self)
|
|
|
1efd99 |
-{
|
|
|
1efd99 |
- virt_viewer_app_show_preferences(self->priv->app, self->priv->window);
|
|
|
1efd99 |
-}
|
|
|
1efd99 |
-
|
|
|
1efd99 |
-G_MODULE_EXPORT void
|
|
|
1efd99 |
virt_viewer_window_menu_view_release_cursor(GtkWidget *menu G_GNUC_UNUSED,
|
|
|
1efd99 |
VirtViewerWindow *self)
|
|
|
1efd99 |
{
|
|
|
1efd99 |
@@ -1282,9 +1273,6 @@ virt_viewer_window_set_menus_sensitive(VirtViewerWindow *self, gboolean sensitiv
|
|
|
1efd99 |
|
|
|
1efd99 |
priv = self->priv;
|
|
|
1efd99 |
|
|
|
1efd99 |
- menu = GTK_WIDGET(gtk_builder_get_object(priv->builder, "menu-preferences"));
|
|
|
1efd99 |
- gtk_widget_set_sensitive(menu, sensitive);
|
|
|
1efd99 |
-
|
|
|
1efd99 |
menu = GTK_WIDGET(gtk_builder_get_object(priv->builder, "menu-file-screenshot"));
|
|
|
1efd99 |
gtk_widget_set_sensitive(menu, sensitive);
|
|
|
1efd99 |
|
|
|
1efd99 |
@@ -1373,7 +1361,6 @@ virt_viewer_window_set_display(VirtViewerWindow *self, VirtViewerDisplay *displa
|
|
|
1efd99 |
if (virt_viewer_display_get_enabled(display))
|
|
|
1efd99 |
virt_viewer_window_desktop_resize(display, self);
|
|
|
1efd99 |
|
|
|
1efd99 |
- gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-preferences")), TRUE);
|
|
|
1efd99 |
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-view-zoom")), TRUE);
|
|
|
1efd99 |
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-send")), TRUE);
|
|
|
1efd99 |
gtk_widget_set_sensitive(self->priv->toolbar_send_key, TRUE);
|
|
|
1efd99 |
--
|
|
|
1efd99 |
2.12.0
|
|
|
1efd99 |
|