Merge lp:~robert-ancell/unity-control-center/screen-sharing into lp:unity-control-center

[Robert Ancell]

Add screen sharing panel to replace vino-preferences which is not available in Vino >= 3.10

[Robert Ancell (robert-ancell)]

Matthew - can you review for design? This adds a new panel "Screen Sharing" into the personal category.

Upsides:
- Feature is now more discoverable - previously you'd have to search in the dash for it

Downsides:
- Another panel
- Panel shows even if Vino is uninstalled - does this matter?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12786
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/103/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks Robert, is that code copied from vino or is that the one used in newer g-c-c for their privacy controls?

I've no reviewed the changeset yet, but having it listed even when vino is not installed seems suboptimal. We could make u-c-c depends on vino but it could be that some corporate installations want to uninstall vnc...

[Robert Ancell (robert-ancell)]

It's the code copied from Vino. The new g-c-c panel combines a number of sharing options that aren't applicable for us as well as the modern g-c-c style that doesn't really fit into u-c-c.

Agreed always showing is suboptimal. If Vino is not installed it just displays "Screen sharing support not installed". I tried to make it hide the panel if Vino is not available but that doesn't seem possible. I also considered adding an install button that would install the packages (first waiting to see if others think this direction is the right one).

The other option is to keep the panel in the Vino package as a big patch, but I think that will be more work over putting it in u-c-c.

[Sebastien Bacher (seb128)]

The code changes look fine to me, I'm unsure the feature is important enough to justify it's own settings panel like that though ... let's wait for mpt to comment on that before merging it in

review: Approve

[Matthew Paul Thomas (mpt)]

Is it possible to review this change on Ubuntu 14.04? autogen.sh gives me errors "No package 'gsettings-desktop-schemas' found | No package 'libnotify' found", although "gsettings-desktop-schemas is already the newest version" and "E: Unable to locate package libnotify".

(If you link screenshots, please show the variations for when Vino both is and isn't installed.)

review: Needs Information (design)

[Robert Ancell (robert-ancell)]

Currently the system settings does not show any desktop sharing options [1]. Instead, you need to run the settings application [2] from the dash [3].

The proposal is to add a new panel to the system settings [4] [5]. If vino is no installed then this panel describes that [6].

[1] https://launchpadlibrarian.net/181103095/u-c-c-original.png
[2] https://launchpadlibrarian.net/181103152/vino-preferences.png
[3] https://launchpadlibrarian.net/181103119/dash-original.png
[4] https://launchpadlibrarian.net/181103180/u-c-c-sharing.png
[5] https://launchpadlibrarian.net/181103194/u-c-c-sharing-panel.png
[6] https://launchpadlibrarian.net/181103203/u-c-c-sharing-panel-uninstalled.png

[Robert Ancell (robert-ancell)]

We really should land this to unblock the vino update.

[Sebastien Bacher (seb128)]

is there anything in the vino update that makes us want to update? when I looked previously it was basically bringing nothing more that the simplifcation

[Robert Ancell (robert-ancell)]

It's a version that's supported upstream.
It has build fixes and removes old API usages which are likely to get harder to build against in the future.
It means we can drop a lot of patches we are carrying.
It means we are in sync with Debian.
It means it is easier to update when newer versions come out.
It means we're not blocking other users of Vino (e.g. Ubuntu GNOME).

What reason do we have not to update?

[Iain Lane (laney)]

The work's done, this MP is approved - why don't you get it in?

[Sebastien Bacher (seb128)]

Well, the main motivation to not update is that we don't need to atm, the current version builds&works fine and there is no much work/cool new features we/GNOME remix are missing, and that the panel feels like a regression compared to the standalone preferences

I guess we could decide the advantages you listed outweight the cost of the user experience regression though, if that's how you feel I can you can go ahead and land the changes

I would still appreciate a review from mpt there before we land it, having a "sharing" panel the way GNOME has it would be ok since it wouldn't be as specific, having a panel only for "screen sharing" feels like putting that feature a bit much in front to me...

[Matthew Paul Thomas (mpt)]

The Gnome System Settings designers seem to be in a period of confusion about whether to copy OS X or to copy iOS. The "Sharing" settings panel is the worst of both: combining settings for sharing wildly unrelated things in a single panel apparently because OS X does, and presenting them using a needlessly modal navigation list apparently because iOS does. I think it would be an extremely poor design to introduce to Ubuntu.

Sebastien is right that having a "Desktop Sharing" panel would be making that feature unusually prominent. Ideally I think it would be a tab of the "Displays" panel. But if the choice is between "Desktop Sharing" and the Gnome "Sharing" panel, I would strongly prefer the "Desktop Sharing" panel, renamed to "Screen Sharing" since it will eventually work on phones and tablets too.

"Desktop sharing support not installed" is an unhelpful message. I suggest instead something like "You need to install extra software to share your screen.", followed by a centered "Install Software…" button that invokes SessionInstaller to actually install it.

review: Needs Fixing (design)

[lp:~robert-ancell/unity-control-center/screen-sharing]

12787. By Robert Ancell on 2015-07-05

Merge with trunk

[Amr Ibrahim (amribrahim1987)]

Is this done for xenial?

[Jeremy Bícha (jbicha)]

This is merged now

https://launchpad.net/ubuntu/+source/unity-control-center/15.04.0+17.10.20171225-0ubuntu1

=== modified file 'configure.ac'
--- configure.ac	2015-02-12 14:09:23 +0000
+++ configure.ac	2015-07-05 22:39:29 +0000
@@ -160,6 +160,7 @@
                   $FCITX_MODULE
                   x11)
 PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
+PKG_CHECK_MODULES(SCREEN_SHARING_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
                   libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
                   libpulse >= $PA_REQUIRED_VERSION
@@ -460,6 +461,8 @@
 panels/sound/data/icons/scalable/devices/Makefile
 panels/screen/Makefile
 panels/screen/unity-screen-panel.desktop.in
+panels/screen-sharing/Makefile
+panels/screen-sharing/unity-screen-sharing-panel.desktop.in
 panels/info/Makefile
 panels/info/unity-info-panel.desktop.in
 panels/power/Makefile

=== modified file 'panels/Makefile.am'
--- panels/Makefile.am	2014-02-10 22:19:33 +0000
+++ panels/Makefile.am	2015-07-05 22:39:29 +0000
@@ -12,7 +12,8 @@
 	sound \
 	keyboard \
 	universal-access \
-	user-accounts
+	user-accounts \
+	screen-sharing
 
 if BUILD_WACOM
 SUBDIRS += wacom

=== added directory 'panels/screen-sharing'
=== added file 'panels/screen-sharing/Makefile.am'
--- panels/screen-sharing/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/Makefile.am	2015-07-05 22:39:29 +0000
@@ -0,0 +1,39 @@
+# This is used in PANEL_CFLAGS
+cappletname = screen-sharing
+
+uidir = $(pkgdatadir)/ui/screen-sharing
+dist_ui_DATA = \
+	screen-sharing-panel.ui
+
+INCLUDES =						\
+	$(PANEL_CFLAGS)					\
+	$(SCREEN_SHARING_PANEL_CFLAGS) \
+	-DG_LOG_DOMAIN="\"$(PACKAGE)\"" \
+	-DGNOMECC_UI_DIR="\"$(uidir)\""			\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	$(NULL)
+
+ccpanelsdir = $(PANELS_DIR)
+ccpanels_LTLIBRARIES = libscreen-sharing.la
+
+libscreen_sharing_la_SOURCES = \
+	screen-sharing-module.c \
+	vino-message-box.c \
+	vino-message-box.h \
+	cc-screen-sharing-panel.c \
+	cc-screen-sharing-panel.h \
+	vino-radio-button.c \
+	vino-radio-button.h
+
+libscreen_sharing_la_LIBADD = $(PANEL_LIBS) $(SCREEN_SHARING_PANEL_LIBS)
+libscreen_sharing_la_LDFLAGS = $(PANEL_LDFLAGS)
+
+@INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = unity-screen-sharing-panel.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+CLEANFILES = $(desktop_in_files) $(desktop_DATA)
+
+-include $(top_srcdir)/git.mk

=== added file 'panels/screen-sharing/cc-screen-sharing-panel.c'
--- panels/screen-sharing/cc-screen-sharing-panel.c	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/cc-screen-sharing-panel.c	2015-07-05 22:39:29 +0000
@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2003 Sun Microsystems, Inc.
+ * Copyright (C) 2006 Jonh Wendell <[e-mail]> 
+ * Copyright © 2010 Codethink Limited
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Authors:
+ *      Mark McLoughlin <[e-mail]>
+ *      Jonh Wendell <[e-mail]>
+ *      Ryan Lortie <[e-mail]>
+ */
+
+#include "config.h"
+
+#include "cc-screen-sharing-panel.h"
+#include "vino-radio-button.h"
+#include "vino-message-box.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <shell/cc-panel.h>
+
+typedef struct
+{
+  CcPanel parent;
+} CcScreenSharingPanel;
+
+typedef struct
+{
+  CcPanelClass parent_class;
+} CcScreenSharingPanelClass;
+
+static GType cc_screen_sharing_panel_get_type (void);
+
+CC_PANEL_REGISTER (CcScreenSharingPanel, cc_screen_sharing_panel)
+
+#define VINO_SCHEMA_ID "org.gnome.Vino"
+
+/* We define three GSettings mappings here:
+ *
+ * First, a relatively boring boolean inversion mapping.
+ */
+static gboolean
+get_inverted (GValue   *value,
+              GVariant *variant,
+              gpointer  user_data)
+{
+  g_value_set_boolean (value, !g_variant_get_boolean (variant));
+  return TRUE;
+}
+
+static GVariant *
+set_inverted (const GValue       *value,
+              const GVariantType *type,
+              gpointer            user_data)
+{
+  return g_variant_new_boolean (!g_value_get_boolean (value));
+}
+
+/* Next, one that maps between the array-of-strings list of
+ * authentication mechanisms and a boolean that is FALSE if the 'none'
+ * and TRUE otherwise (ie: for 'vnc' in the list).
+ */
+static gboolean
+get_authtype (GValue   *value,
+              GVariant *variant,
+              gpointer  user_data)
+{
+  GVariantIter iter;
+  const gchar *type;
+
+  g_variant_iter_init (&iter, variant);
+  g_value_set_boolean (value, TRUE);
+
+  while (g_variant_iter_next (&iter, "s", &type))
+    if (strcmp (type, "none") == 0)
+      g_value_set_boolean (value, FALSE);
+
+  return TRUE;
+}
+
+static GVariant *
+set_authtype (const GValue       *value,
+              const GVariantType *type,
+              gpointer            user_data)
+{
+  const gchar *authtype;
+
+  if (g_value_get_boolean (value))
+    authtype = "vnc";
+  else
+    authtype = "none";
+
+  return g_variant_new_strv (&authtype, 1);
+}
+
+
+/* Finally, a somewhat evil mapping for the password setting:
+ *
+ * If the setting is 'keyring' then we load the password from the
+ * keyring.  Else, it is assumed to be a base64-encoded string which is
+ * the actual password.
+ *
+ * On setting the password, we always first try to use the keyring.  If
+ * that is successful we write 'keyring' to the settings.  If it fails
+ * then we base64-encode the password and write it to the settings.
+ *
+ * Doing it this way ensures that there is no ambiguity about what the
+ * password is in the event that gnome-keyring becomes available then
+ * unavailable again.
+ */
+static gboolean
+get_password (GValue   *value,
+              GVariant *variant,
+              gpointer  user_data)
+{
+  const gchar *setting;
+
+  setting = g_variant_get_string (variant, NULL);
+
+  if (strcmp (setting, "keyring") == 0)
+    {
+      /* "keyring" is the default value, even though vino doesn't support it at the moment */
+      g_value_set_static_string (value, "");
+      return TRUE;
+    }
+  else
+    {
+      gchar *decoded;
+      gsize length;
+      gboolean ok;
+
+      decoded = (gchar *) g_base64_decode (setting, &length);
+
+      if ((ok = g_utf8_validate (decoded, length, NULL)))
+        g_value_take_string (value, g_strndup (decoded, length));
+
+      return ok;
+    }
+}
+
+static GVariant *
+set_password (const GValue       *value,
+              const GVariantType *type,
+              gpointer            user_data)
+{
+  const gchar *string;
+  gchar *base64;
+
+  string = g_value_get_string (value);
+
+  /* if that failed, store it in GSettings, base64 */
+  base64 = g_base64_encode ((guchar *) string, strlen (string));
+  return g_variant_new_from_data (G_VARIANT_TYPE_STRING,
+                                  base64, strlen (base64) + 1,
+                                  TRUE, g_free, base64);
+}
+
+typedef enum
+{
+  VINO_ICON_VISIBILITY_NEVER,
+  VINO_ICON_VISIBILITY_ALWAYS,
+  VINO_ICON_VISIBILITY_CLIENT
+} VinoIconVisibility;
+
+static gboolean
+get_icon_visibility (GValue   *value,
+                     GVariant *variant,
+                     gpointer  user_data)
+{
+  const char *setting;
+  char *name;
+
+  setting = g_variant_get_string (variant, NULL);
+
+  g_object_get (user_data, "name", &name, NULL);
+
+  /* If the button name matches the setting, it should be active. */
+  if (g_strcmp0 (name, setting) == 0)
+    g_value_set_boolean (value, TRUE);
+
+  g_free (name);
+
+  return TRUE;
+}
+
+static GVariant *
+set_icon_visibility (const GValue       *value,
+                     const GVariantType *type,
+                     gpointer            user_data)
+{
+  GVariant *variant = NULL;
+  char *name;
+
+  /* Don't act unless the button has been activated (turned ON). */
+  if (!g_value_get_boolean (value))
+    return NULL;
+
+  /* GtkToggleButton *button = GTK_TOGGLE_BUTTON(user_data); */
+  g_object_get (user_data, "name", &name, NULL);
+  variant = g_variant_new_string (name);
+
+  g_free (name);
+
+  return variant;
+}
+
+static void
+cc_screen_sharing_panel_init (CcScreenSharingPanel *panel)
+{
+  struct {
+    const gchar             *setting;
+    const gchar             *name;
+    const gchar             *property;
+    GSettingsBindFlags       flags;
+    GSettingsBindGetMapping  get_mapping;
+    GSettingsBindSetMapping  set_mapping;
+  } bindings[] = {
+    { "enabled",                "allowed_toggle",        "active",    G_SETTINGS_BIND_DEFAULT, NULL,                NULL                },
+
+    { "enabled",                "control_settings",      "sensitive", G_SETTINGS_BIND_GET,     NULL,                NULL                },
+    { "view-only",              "view_only_toggle",      "active",    G_SETTINGS_BIND_DEFAULT, get_inverted,        set_inverted        },
+
+    { "enabled",                "security_settings",     "sensitive", G_SETTINGS_BIND_GET,     NULL,                NULL                },
+    { "prompt-enabled",         "prompt_enabled_toggle", "active",    G_SETTINGS_BIND_DEFAULT, NULL,                NULL                },
+    { "authentication-methods", "password_toggle",       "active",    G_SETTINGS_BIND_DEFAULT, get_authtype,        set_authtype        },
+    { "authentication-methods", "password_box",          "sensitive", G_SETTINGS_BIND_GET,     get_authtype,        NULL                },
+    { "vnc-password",           "password_entry",        "text",      G_SETTINGS_BIND_DEFAULT, get_password,        set_password        },
+    { "use-upnp",               "use_upnp_toggle",       "active",    G_SETTINGS_BIND_DEFAULT, NULL,                NULL                },
+
+    { "enabled",                "notification_settings", "sensitive", G_SETTINGS_BIND_GET,     NULL,                NULL                },
+
+    { "icon-visibility",        "icon_always_radio",     "active",    G_SETTINGS_BIND_DEFAULT, get_icon_visibility, set_icon_visibility },
+    { "icon-visibility",        "icon_client_radio",     "active",    G_SETTINGS_BIND_DEFAULT, get_icon_visibility, set_icon_visibility },
+    { "icon-visibility",        "icon_never_radio",      "active",    G_SETTINGS_BIND_DEFAULT, get_icon_visibility, set_icon_visibility }
+  };
+  GSettingsSchemaSource *source;
+
+  source = g_settings_schema_source_get_default ();
+  if (source && g_settings_schema_source_lookup (source, VINO_SCHEMA_ID, TRUE))
+    {
+      GError     *error = NULL;
+      GtkBuilder *builder;
+      GSettings *settings;
+      gint i;
+
+      vino_radio_button_get_type ();
+      vino_message_box_get_type ();
+
+      builder = gtk_builder_new ();
+      if (!gtk_builder_add_from_file (builder, GNOMECC_UI_DIR "/screen-sharing-panel.ui", &error))
+        {
+          g_warning ("Unable to load interface file: %s", error->message);
+          g_error_free (error);
+        }
+      gtk_widget_reparent (GTK_WIDGET (gtk_builder_get_object (builder, "screen_sharing_vbox")), GTK_WIDGET (panel));
+
+      settings = g_settings_new (VINO_SCHEMA_ID);
+
+      for (i = 0; i < G_N_ELEMENTS (bindings); i++)
+        {
+          GObject *object =  gtk_builder_get_object (builder, bindings[i].name);
+          g_settings_bind_with_mapping (settings, bindings[i].setting,
+                                        object,
+                                        bindings[i].property,
+                                        bindings[i].flags,
+                                        bindings[i].get_mapping,
+                                        bindings[i].set_mapping,
+                                        object, NULL);
+        }
+
+      g_object_unref (settings);
+      g_object_unref (builder);
+    }
+  else
+    {
+      GtkWidget *label;
+      gchar *text;
+
+      label = gtk_label_new (NULL);
+      text = g_strdup_printf ("<big>%s</big>", _("Desktop sharing support not installed"));
+      gtk_label_set_markup (GTK_LABEL (label), text);
+      g_free (text);
+      gtk_widget_show (label);
+      gtk_container_add (GTK_CONTAINER (panel), label);
+    }
+}
+
+static void
+cc_screen_sharing_panel_class_init (CcScreenSharingPanelClass *class)
+{
+}
+
+void
+cc_screen_sharing_panel_register (GIOModule *module)
+{
+  cc_screen_sharing_panel_register_type (G_TYPE_MODULE (module));
+  g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+                                  cc_screen_sharing_panel_get_type (),
+                                  "screen-sharing", 0);
+}

=== added file 'panels/screen-sharing/cc-screen-sharing-panel.h'
--- panels/screen-sharing/cc-screen-sharing-panel.h	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/cc-screen-sharing-panel.h	2015-07-05 22:39:29 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2010 Codethink Limited
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Ryan Lortie <[e-mail]>
+ */
+
+#ifndef __vino_preferences_h__
+#define __vino_preferences_h__
+
+#include <shell/cc-panel.h>
+
+void cc_screen_sharing_panel_register (GIOModule *module);
+
+#endif /* __vino_preferences_h__ */

=== added file 'panels/screen-sharing/screen-sharing-module.c'
--- panels/screen-sharing/screen-sharing-module.c	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/screen-sharing-module.c	2015-07-05 22:39:29 +0000
@@ -0,0 +1,41 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ */
+
+#include <config.h>
+
+#include "cc-screen-sharing-panel.h"
+
+#include <glib/gi18n-lib.h>
+
+void
+g_io_module_load (GIOModule *module)
+{
+  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+  /* register the panel */
+  cc_screen_sharing_panel_register (module);
+}
+
+void
+g_io_module_unload (GIOModule *module)
+{
+}

=== added file 'panels/screen-sharing/screen-sharing-panel.ui'
--- panels/screen-sharing/screen-sharing-panel.ui	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/screen-sharing-panel.ui	2015-07-05 22:39:29 +0000
@@ -0,0 +1,400 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="window1">
+    <child>
+      <object class="GtkBox" id="screen_sharing_vbox">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="border_width">6</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkBox" id="sharing_box">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Sharing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="writability_warning">
+                    <property name="orientation">horizontal</property>
+                    <property name="no_show_all">True</property>
+                    <property name="border_width">3</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="label"> </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="image1">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-dialog-warning</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Some of these preferences are locked down</property>
+                        <attributes>
+                          <attribute name="style" value="italic"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="label">   </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="allowed_toggle">
+                        <property name="label" translatable="yes">Allow other users to _view your desktop</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">Your desktop will be shared</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="control_settings">
+                    <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="label">       </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="view_only_toggle">
+                        <property name="label" translatable="yes">_Allow other users to control your desktop</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_text" translatable="yes">Remote users are able to control your mouse and keyboard</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+		    <!--
+                <child>
+                  <object class="GtkBox" id="message_box">
+                    <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
+                    <child>
+                      <object class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="label">       </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="VinoMessageBox" id="message">
+                        <property name="visible">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+		    -->
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="security_box">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Security</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox3">
+                    <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
+                    <child>
+                      <object class="GtkBox" id="security_settings">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="prompt_enabled_toggle">
+                            <property name="label" translatable="yes">_You must confirm each access to this machine</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox4">
+                            <property name="visible">True</property>
+                            <property name="orientation">horizontal</property>
+			    <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkCheckButton" id="password_toggle">
+                                <property name="label" translatable="yes">_Require the user to enter this password:</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="password_box">
+                                <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
+                                <child>
+                                  <object class="GtkEntry" id="password_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="max_length">8</property>
+                                    <property name="visibility">False</property>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="use_upnp_toggle">
+                            <property name="label" translatable="yes">Automatically _configure UPnP router to open and forward ports</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">The router must have the UPnP feature enabled</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">12</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="notification_box">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label12">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Show Notification Area Icon</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox8">
+                    <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
+                    <child>
+                      <object class="GtkBox" id="notification_settings">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <object class="VinoRadioButton" id="icon_always_radio">
+                            <property name='name'>always</property>
+                            <property name="label" translatable="yes">Al_ways</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="VinoRadioButton" id="icon_client_radio">
+                            <property name='name'>client</property>
+                            <property name="label" translatable="yes">_Only when someone is connected</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">icon_always_radio</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="VinoRadioButton" id="icon_never_radio">
+                            <property name='name'>never</property>
+                            <property name="label" translatable="yes">_Never</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">icon_always_radio</property>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">12</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

=== added file 'panels/screen-sharing/unity-screen-sharing-panel.desktop.in.in'
--- panels/screen-sharing/unity-screen-sharing-panel.desktop.in.in	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/unity-screen-sharing-panel.desktop.in.in	2015-07-05 22:39:29 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+_Name=Desktop Sharing
+_Comment=Choose how other users can remotely view your desktop
+Exec=unity-control-center screen-sharing
+Icon=preferences-desktop-remote-desktop
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
+OnlyShowIn=Unity;
+X-Unity-Settings-Panel=screen-sharing
+# Translators: those are keywords for the screen sharing control-center panel
+_Keywords=Screen;Sharing;Remote;Desktop;VNC

=== added file 'panels/screen-sharing/vino-message-box.c'
--- panels/screen-sharing/vino-message-box.c	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/vino-message-box.c	2015-07-05 22:39:29 +0000
@@ -0,0 +1,156 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * vino-message-box.c
+ * Copyright (C) Jonh Wendell 2009 <[e-mail]>
+ * 
+ * vino-message-box.c is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * vino-message-box.c is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <glib/gi18n.h>
+#include "vino-message-box.h"
+
+struct _VinoMessageBoxPrivate
+{
+  GtkWidget *main_hbox;
+  GtkWidget *label;
+  GtkWidget *image;
+};
+
+G_DEFINE_TYPE (VinoMessageBox, vino_message_box, GTK_TYPE_INFO_BAR);
+
+static void
+url_activated_cb(GtkWidget *url_label, const gchar *url)
+{
+  GError *error;
+  GdkScreen *screen;
+  gchar *mailto;
+
+  error   = NULL;
+  screen  = gtk_widget_get_screen (url_label);
+  mailto  = g_strdup_printf ("mailto:?Body=%s", url);
+
+  if (!gtk_show_uri (screen, mailto, GDK_CURRENT_TIME, &error))
+    {
+      GtkWidget *message_dialog, *parent;
+
+      parent = gtk_widget_get_toplevel (GTK_WIDGET (url_label));
+      if (!GTK_IS_WINDOW (parent))
+        parent = NULL;
+      message_dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
+					       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+					       GTK_MESSAGE_ERROR,
+					       GTK_BUTTONS_CLOSE,
+					       _("There was an error showing the URL \"%s\""),
+					       url);
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
+						"%s",
+						error->message);
+
+      gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE);
+
+      g_signal_connect (message_dialog, "response",
+			G_CALLBACK (gtk_widget_destroy),
+			NULL);
+
+      gtk_widget_show (message_dialog);
+      g_error_free (error);
+    }
+
+  g_free (mailto);
+}
+
+static void
+vino_message_box_init (VinoMessageBox *box)
+{
+  box->priv = G_TYPE_INSTANCE_GET_PRIVATE (box, VINO_TYPE_MESSAGE_BOX, VinoMessageBoxPrivate);
+
+  box->priv->main_hbox = gtk_info_bar_get_content_area (GTK_INFO_BAR (box));
+  box->priv->image = NULL;
+
+  box->priv->label = gtk_label_new (NULL);
+  gtk_misc_set_alignment (GTK_MISC (box->priv->label), 0.0, 0.0);
+  gtk_label_set_line_wrap (GTK_LABEL (box->priv->label), TRUE);
+  gtk_label_set_selectable (GTK_LABEL (box->priv->label), TRUE);
+  g_signal_connect (box->priv->label,
+                    "activate-link",
+                    G_CALLBACK (url_activated_cb),
+                    NULL);
+
+  gtk_widget_show (box->priv->label);
+  gtk_info_bar_set_message_type (GTK_INFO_BAR (box), GTK_MESSAGE_INFO);
+  gtk_container_add (GTK_CONTAINER (box->priv->main_hbox), box->priv->label);
+}
+
+static void
+vino_message_box_finalize (GObject *object)
+{
+	/* TODO: Add deinitalization code here */
+
+	G_OBJECT_CLASS (vino_message_box_parent_class)->finalize (object);
+}
+
+static void
+vino_message_box_class_init (VinoMessageBoxClass *klass)
+{
+	GObjectClass* object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = vino_message_box_finalize;
+	g_type_class_add_private (object_class, sizeof(VinoMessageBoxPrivate));
+}
+
+GtkWidget *
+vino_message_box_new (void)
+{
+	return GTK_WIDGET (g_object_new (VINO_TYPE_MESSAGE_BOX, NULL));
+}
+
+void
+vino_message_box_set_label (VinoMessageBox *box, const gchar *label)
+{
+  g_return_if_fail (VINO_IS_MESSAGE_BOX (box));
+
+  gtk_label_set_markup (GTK_LABEL (box->priv->label), label);
+}
+
+void
+vino_message_box_show_image (VinoMessageBox *box)
+{
+  g_return_if_fail (VINO_IS_MESSAGE_BOX (box));
+
+  if (box->priv->image)
+    {
+      gtk_widget_destroy (box->priv->image);
+      box->priv->image = NULL;
+    }
+
+
+  box->priv->image = gtk_spinner_new ();
+  gtk_spinner_start (GTK_SPINNER (box->priv->image));
+
+  gtk_box_pack_start (GTK_BOX (box->priv->main_hbox), box->priv->image, FALSE, FALSE, 2);
+  gtk_box_reorder_child (GTK_BOX (box->priv->main_hbox), box->priv->image, 0);
+  gtk_widget_show (box->priv->image);
+}
+
+void
+vino_message_box_hide_image (VinoMessageBox *box)
+{
+  g_return_if_fail (VINO_IS_MESSAGE_BOX (box));
+
+  if (box->priv->image)
+    gtk_widget_destroy (box->priv->image);
+  box->priv->image = NULL;
+}
+

=== added file 'panels/screen-sharing/vino-message-box.h'
--- panels/screen-sharing/vino-message-box.h	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/vino-message-box.h	2015-07-05 22:39:29 +0000
@@ -0,0 +1,59 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * vino-message-box.c
+ * Copyright (C) Jonh Wendell 2009 <[e-mail]>
+ * 
+ * vino-message-box.c is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * vino-message-box.c is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _VINO_MESSAGE_BOX_H_
+#define _VINO_MESSAGE_BOX_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define VINO_TYPE_MESSAGE_BOX             (vino_message_box_get_type ())
+#define VINO_MESSAGE_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINO_TYPE_MESSAGE_BOX, VinoMessageBox))
+#define VINO_MESSAGE_BOX_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), VINO_TYPE_MESSAGE_BOX, VinoMessageBoxClass))
+#define VINO_IS_MESSAGE_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINO_TYPE_MESSAGE_BOX))
+#define VINO_IS_MESSAGE_BOX_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), VINO_TYPE_MESSAGE_BOX))
+#define VINO_MESSAGE_BOX_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), VINO_TYPE_MESSAGE_BOX, VinoMessageBoxClass))
+
+typedef struct _VinoMessageBoxClass VinoMessageBoxClass;
+typedef struct _VinoMessageBox VinoMessageBox;
+typedef struct _VinoMessageBoxPrivate VinoMessageBoxPrivate;
+
+struct _VinoMessageBoxClass
+{
+  GtkInfoBarClass parent_class;
+};
+
+struct _VinoMessageBox
+{
+  GtkInfoBar parent_instance;
+  VinoMessageBoxPrivate *priv;
+};
+
+GType vino_message_box_get_type (void);
+
+GtkWidget	*vino_message_box_new (void);
+
+void		vino_message_box_set_label  (VinoMessageBox *box, const gchar *label);
+void		vino_message_box_show_image (VinoMessageBox *box);
+void		vino_message_box_hide_image (VinoMessageBox *box);
+
+G_END_DECLS
+
+#endif /* _VINO_MESSAGE_BOX_H_ */

=== added file 'panels/screen-sharing/vino-radio-button.c'
--- panels/screen-sharing/vino-radio-button.c	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/vino-radio-button.c	2015-07-05 22:39:29 +0000
@@ -0,0 +1,181 @@
+/*
+ * Copyright © 2010 Codethink Limited
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Ryan Lortie <[e-mail]>
+ */
+
+#include "vino-radio-button.h"
+
+#include <gtk/gtk.h>
+
+typedef struct
+{
+  GtkRadioButton parent_instance;
+  gchar *name;
+} VinoRadioButton;
+
+typedef GtkRadioButtonClass VinoRadioButtonClass;
+
+G_DEFINE_TYPE (VinoRadioButton, vino_radio_button, GTK_TYPE_RADIO_BUTTON)
+
+enum
+{
+  PROP_0,
+  PROP_SETTINGS_NAME,
+  PROP_SETTINGS_ACTIVE
+};
+
+static void
+vino_radio_button_get_property (GObject *object, guint prop_id,
+                                GValue *value, GParamSpec *pspec)
+{
+  VinoRadioButton *vrb = (VinoRadioButton *) object;
+
+  switch (prop_id)
+    {
+    case PROP_SETTINGS_ACTIVE:
+      {
+        const GSList *list;
+
+        list = gtk_radio_button_get_group (&vrb->parent_instance);
+        while (list)
+          {
+            VinoRadioButton *this = list->data;
+
+            if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (this)))
+              {
+                g_value_set_string (value, this->name);
+                return;
+              }
+
+            list = list->next;
+          }
+      }
+
+      g_warning ("No active radio buttons");
+      g_value_set_string (value, "");
+      return;
+
+    default:
+      g_assert_not_reached ();
+    }
+}
+
+static void
+vino_radio_button_set_property (GObject *object, guint prop_id,
+                                const GValue *value, GParamSpec *pspec)
+{
+  VinoRadioButton *vrb = (VinoRadioButton *) object;
+
+  switch (prop_id)
+    {
+    case PROP_SETTINGS_NAME:
+      g_assert (vrb->name == NULL);
+      vrb->name = g_value_dup_string (value);
+      return;
+
+    case PROP_SETTINGS_ACTIVE:
+      {
+        const GSList *list;
+        const gchar *name;
+
+        list = gtk_radio_button_get_group (&vrb->parent_instance);
+        name = g_value_get_string (value);
+
+        while (list)
+          {
+            VinoRadioButton *this = list->data;
+
+            if (g_strcmp0 (this->name, name))
+              {
+                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (this),
+                                              TRUE);
+                return;
+              }
+
+            list = list->next;
+          }
+
+        g_warning ("No such radio button named `%s'", name);
+      }
+      return;
+
+    default:
+      g_assert_not_reached ();
+    }
+}
+
+static void
+vino_radio_button_toggled (GtkToggleButton *button)
+{
+  VinoRadioButton *vrb = (VinoRadioButton *) button;
+
+  /* As it is, we get the notification of the old button becoming inactivity
+   * followed by the notification of the new button becoming active.  Only run
+   * when the new button becomes active in order to avoid unnecessary
+   * notifications.
+   */
+  if (gtk_toggle_button_get_active (button))
+    {
+      const GSList *list;
+
+      list = gtk_radio_button_get_group (&vrb->parent_instance);
+      while (list)
+        {
+          g_object_notify (list->data, "settings-active");
+          list = list->next;
+        }
+    }
+}
+
+static void
+vino_radio_button_finalize (GObject *object)
+{
+  VinoRadioButton *vrb = (VinoRadioButton *) object;
+
+  g_free (vrb->name);
+
+  G_OBJECT_CLASS (vino_radio_button_parent_class)
+    ->finalize (object);
+}
+
+static void
+vino_radio_button_init (VinoRadioButton *button)
+{
+}
+
+static void
+vino_radio_button_class_init (GtkRadioButtonClass *class)
+{
+  GtkToggleButtonClass *tb_class = GTK_TOGGLE_BUTTON_CLASS (class);
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  tb_class->toggled = vino_radio_button_toggled;
+  object_class->get_property = vino_radio_button_get_property;
+  object_class->set_property = vino_radio_button_set_property;
+  object_class->finalize = vino_radio_button_finalize;
+
+  g_object_class_install_property (object_class, PROP_SETTINGS_NAME,
+    g_param_spec_string ("settings-name", "name", "name", NULL,
+                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE |
+                         G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_SETTINGS_ACTIVE,
+    g_param_spec_string ("settings-active", "active", "active", NULL,
+                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}

=== added file 'panels/screen-sharing/vino-radio-button.h'
--- panels/screen-sharing/vino-radio-button.h	1970-01-01 00:00:00 +0000
+++ panels/screen-sharing/vino-radio-button.h	2015-07-05 22:39:29 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2010 Codethink Limited
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Ryan Lortie <[e-mail]>
+ */
+
+#ifndef __vino_radio_button_h__
+#define __vino_radio_button_h__
+
+#include <glib-object.h>
+
+GType vino_radio_button_get_type (void);
+
+#endif /* __vino_radio_button_h__ */

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-09-15 21:09:13 +0000
+++ po/POTFILES.in	2015-07-05 22:39:29 +0000
@@ -84,6 +84,10 @@
 panels/region/gtkentryaccel.c
 panels/screen/unity-screen-panel.desktop.in.in
 [type: gettext/glade]panels/screen/screen.ui
+panels/screen-sharing/vino-message-box.c
+panels/screen-sharing/cc-screen-sharing-panel.c
+panels/screen-sharing/unity-screen-sharing-panel.desktop.in.in
+[type: gettext/glade]panels/screen-sharing/cc-screen-sharing-panel.ui
 panels/sound/cc-sound-panel.c
 panels/sound/gvc-balance-bar.c
 panels/sound/gvc-channel-bar.c