[vino] Remove server reachability message from the UI
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vino] Remove server reachability message from the UI
- Date: Mon, 21 Mar 2011 16:35:42 +0000 (UTC)
commit cca92054ddb3bef8fb6486666fcb52603683b5b4
Author: David King <amigadave amigadave com>
Date: Mon Mar 21 17:03:11 2011 +0100
Remove server reachability message from the UI
As there is not enough time to fix bug 596190 before a release, disable
the server reachability test by not connecting the 'changed' signal on
the VinoConnectivityInfo object. Comment the UI objects in the
GtkBuilder XML description. This addresses CVE-2011-1164 until a fix for
the reachability test is available.
capplet/vino-preferences.c | 5 +++++
capplet/vino-preferences.ui | 2 ++
2 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/capplet/vino-preferences.c b/capplet/vino-preferences.c
index c6bf19e..e9d3f0b 100644
--- a/capplet/vino-preferences.c
+++ b/capplet/vino-preferences.c
@@ -383,11 +383,16 @@ vino_preferences_connect_ui (VinoPreferences *app,
G_CALLBACK (vino_preferences_dialog_response), NULL);
app->info = vino_connectivity_info_new (gdk_screen_get_number (gtk_window_get_screen (window)));
+/* Remove reporting of reachability from network to workaround GNOME bug
+ * 596190.
+ * TODO: Fix the bug and remove this workaround. */
+#if 0
g_signal_connect (app->info, "changed",
G_CALLBACK (vino_preferences_info_changed),
gtk_builder_get_object (builder, "message"));
vino_preferences_info_changed (app->info,
gtk_builder_get_object (builder, "message"));
+#endif
g_object_unref (settings);
g_object_unref (builder);
diff --git a/capplet/vino-preferences.ui b/capplet/vino-preferences.ui
index 470e940..c8ac3e6 100644
--- a/capplet/vino-preferences.ui
+++ b/capplet/vino-preferences.ui
@@ -149,6 +149,7 @@
<property name="position">3</property>
</packing>
</child>
+ <!--
<child>
<object class="GtkHBox" id="message_box">
<property name="visible">True</property>
@@ -176,6 +177,7 @@
<property name="position">4</property>
</packing>
</child>
+ -->
</object>
<packing>
<property name="position">0</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]