Get rid of the :can-set-data property

5 files changed, 9 insertions, 144 deletions

diff --git a/data/org.freedesktop.Hostname1.xml b/data/org.freedesktop.Hostname1.xml
index f3e4f2e..ea19b7a 100644
--- a/data/org.freedesktop.Hostname1.xml
+++ b/data/org.freedesktop.Hostname1.xml
@@ -561,28 +561,5 @@
 
     <!-- ******************************************************************************** -->
 
-    <property name="can-set-data" type="b" access="read">
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Whether any of the configured data (e.g. the properties
-            <doc:ref type="property" to="Hostname1:configured-display-hostname">configured-display-hostname</doc:ref>,
-            <doc:ref type="property" to="Hostname1:configured-hostname">configured-hostname</doc:ref>,
-            <doc:ref type="property" to="Hostname1:configured-icon-name">configured-icon-name</doc:ref>,
-            <doc:ref type="property" to="Hostname1:use-transient-data">use-transient-data</doc:ref>)
-            can actually be changed (e.g. using the methods
-            <doc:ref type="method" to="Hostname1.SetDisplayHostname">SetDisplayHostname()</doc:ref>,
-            <doc:ref type="method" to="Hostname1.SetHostname">SetHostname()</doc:ref>,
-            <doc:ref type="method" to="Hostname1.SetIconName">SetIconName()</doc:ref>,
-            <doc:ref type="method" to="Hostname1.SetUseTransientData">SetUseTransientData()</doc:ref>).
-            Note that even if this property has the value <doc:tt>TRUE</doc:tt>, authorization checks may
-            prevent any random client from changing data, see the PolicyKit documentation for details.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-
-    <!-- ******************************************************************************** -->
-
   </interface>
 </node>
diff --git a/docs/xdg-hostname-docs.xml b/docs/xdg-hostname-docs.xml
index c9170bf..8857b4f 100644
--- a/docs/xdg-hostname-docs.xml
+++ b/docs/xdg-hostname-docs.xml
@@ -230,10 +230,6 @@
         <link linkend="Hostname1:configured-icon-name">configured-icon-name</link> and
         <link linkend="Hostname1:use-transient-data">use-transient-data</link>
         properties to initialize the user interface with currently configured values.
-        The
-        <link linkend="Hostname1:can-set-data">can-set-data</link>
-        property can be used to determine if the user interface is sensitive e.g
-        whether data can be changed.
       </para>
       <para>
         As an example, one user interface could look like this
diff --git a/src/daemon/xdg-hostname-daemon.c b/src/daemon/xdg-hostname-daemon.c
index f10ef2d..304a4c2 100644
--- a/src/daemon/xdg-hostname-daemon.c
+++ b/src/daemon/xdg-hostname-daemon.c
@@ -57,12 +57,6 @@ struct _XdgHostnameDaemon
         char *transient_hostname;
         char *transient_icon_name;
 
-        gboolean can_set_display_hostname;
-        gboolean can_set_hostname;
-        gboolean can_set_icon_name;
-        gboolean can_set_use_transient_data;
-
-
         gboolean inhibit_reading;
 
         DBusConnection *system_bus_connection;
@@ -95,12 +89,6 @@ enum {
         PROP_TRANSIENT_DISPLAY_HOSTNAME,
         PROP_TRANSIENT_HOSTNAME,
         PROP_TRANSIENT_ICON_NAME,
-
-        PROP_CAN_SET_DISPLAY_HOSTNAME,
-        PROP_CAN_SET_HOSTNAME,
-        PROP_CAN_SET_ICON_NAME,
-        PROP_CAN_SET_USE_TRANSIENT_DATA,
-        PROP_CAN_SET_DATA,
 };
 
 
@@ -177,12 +165,6 @@ xdg_hostname_daemon_constructed (GObject *object)
 
         daemon = XDG_HOSTNAME_DAEMON (object);
 
-        /* we don't support any lock down other than polkit for now (or ever) */
-        daemon->can_set_display_hostname = TRUE;
-        daemon->can_set_hostname = TRUE;
-        daemon->can_set_icon_name = TRUE;
-        daemon->can_set_use_transient_data = TRUE;
-
         error = NULL;
         if (!update_data (daemon, FALSE, &error)) {
                 g_warning ("Error updating data: %s", error->message);
@@ -285,29 +267,6 @@ xdg_hostname_daemon_get_property (GObject         *object,
                 g_value_set_string (value, daemon->transient_icon_name);
                 break;
 
-        case PROP_CAN_SET_DISPLAY_HOSTNAME:
-                g_value_set_boolean (value, daemon->can_set_display_hostname);
-                break;
-
-        case PROP_CAN_SET_HOSTNAME:
-                g_value_set_boolean (value, daemon->can_set_hostname);
-                break;
-
-        case PROP_CAN_SET_ICON_NAME:
-                g_value_set_boolean (value, daemon->can_set_icon_name);
-                break;
-
-        case PROP_CAN_SET_USE_TRANSIENT_DATA:
-                g_value_set_boolean (value, daemon->can_set_use_transient_data);
-                break;
-
-	case PROP_CAN_SET_DATA:
-		g_value_set_boolean (value, daemon->can_set_display_hostname ||
-				            daemon->can_set_hostname ||
-				            daemon->can_set_icon_name ||
-				            daemon->can_set_use_transient_data);
-		break;
-
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                 break;
@@ -419,46 +378,6 @@ xdg_hostname_daemon_class_init (XdgHostnameDaemonClass *klass)
                                                               NULL,
                                                               G_PARAM_READABLE));
 
-        g_object_class_install_property (object_class,
-                                         PROP_CAN_SET_DISPLAY_HOSTNAME,
-                                         g_param_spec_boolean ("can-set-display-hostname",
-                                                               NULL,
-                                                               NULL,
-                                                               TRUE,
-                                                               G_PARAM_READABLE));
-
-        g_object_class_install_property (object_class,
-                                         PROP_CAN_SET_HOSTNAME,
-                                         g_param_spec_boolean ("can-set-hostname",
-                                                               NULL,
-                                                               NULL,
-                                                               TRUE,
-                                                               G_PARAM_READABLE));
-
-        g_object_class_install_property (object_class,
-                                         PROP_CAN_SET_ICON_NAME,
-                                         g_param_spec_boolean ("can-set-icon-name",
-                                                               NULL,
-                                                               NULL,
-                                                               TRUE,
-                                                               G_PARAM_READABLE));
-
-        g_object_class_install_property (object_class,
-                                         PROP_CAN_SET_USE_TRANSIENT_DATA,
-                                         g_param_spec_boolean ("can-set-use-transient-data",
-                                                               NULL,
-                                                               NULL,
-                                                               TRUE,
-                                                               G_PARAM_READABLE));
-
-        g_object_class_install_property (object_class,
-                                         PROP_CAN_SET_DATA,
-                                         g_param_spec_boolean ("can-set-data",
-                                                               NULL,
-                                                               NULL,
-                                                               TRUE,
-                                                               G_PARAM_READABLE));
-
         dbus_g_error_domain_register (XDG_HOSTNAME_ERROR,
                                       "org.freedesktop.Hostname1.Error",
                                       XDG_HOSTNAME_TYPE_ERROR);
@@ -578,11 +497,6 @@ compute_val (XdgHostnameDaemon  *daemon)
         else
                 g_string_append_c (s, ' ');
 
-        g_string_append_c (s, daemon->can_set_display_hostname ? '1' : '0');
-        g_string_append_c (s, daemon->can_set_hostname ? '1' : '0');
-        g_string_append_c (s, daemon->can_set_icon_name ? '1' : '0');
-        g_string_append_c (s, daemon->can_set_use_transient_data ? '1' : '0');
-
         return g_string_free (s, FALSE);
 }
 
diff --git a/src/programs/xdg-hostname.c b/src/programs/xdg-hostname.c
index 893c0d0..3c04ad8 100644
--- a/src/programs/xdg-hostname.c
+++ b/src/programs/xdg-hostname.c
@@ -59,7 +59,6 @@ show_hostname_data (XdgHostnameMonitor *h)
         char *transient_display_hostname;
         char *transient_hostname;
         char *transient_icon_name;
-        gboolean can_set_data;
 
         g_object_get (h,
                       "display-hostname", &display_hostname,
@@ -72,20 +71,18 @@ show_hostname_data (XdgHostnameMonitor *h)
                       "transient-display-hostname", &transient_display_hostname,
                       "transient-hostname", &transient_hostname,
                       "transient-icon-name", &transient_icon_name,
-                      "can-set-data", &can_set_data,
                       NULL);
 
-        g_print ("display-hostname:            %s\n", display_hostname);
-        g_print ("hostname:                    %s\n", hostname);
-        g_print ("icon_name:                   %s\n", icon_name);
-        g_print ("configured-hostname:         %s\n", configured_hostname);
-        g_print ("configured-display_hostname: %s\n", configured_display_hostname);
-        g_print ("configured-icon_name:        %s\n", configured_icon_name);
         g_print ("use-transient-data:          %s\n", use_transient_data ? "true" : "false");
-        g_print ("transient-hostname:          %s\n", transient_hostname);
-        g_print ("transient-display-hostname:  %s\n", transient_display_hostname);
-        g_print ("transient-icon-name:         %s\n", transient_icon_name);
-        g_print ("can-set-data:                %s\n", can_set_data ? "true" : "false");
+        g_print ("display-hostname:            `%s'\n", display_hostname);
+        g_print ("hostname:                    `%s'\n", hostname);
+        g_print ("icon_name:                   `%s'\n", icon_name);
+        g_print ("configured-hostname:         `%s'\n", configured_hostname);
+        g_print ("configured-display_hostname: `%s'\n", configured_display_hostname);
+        g_print ("configured-icon_name:        `%s'\n", configured_icon_name);
+        g_print ("transient-hostname:          `%s'\n", transient_hostname);
+        g_print ("transient-display-hostname:  `%s'\n", transient_display_hostname);
+        g_print ("transient-icon-name:         `%s'\n", transient_icon_name);
 
         g_free (display_hostname);
         g_free (hostname);
diff --git a/src/xdg-hostname/xdg-hostname-monitor.c b/src/xdg-hostname/xdg-hostname-monitor.c
index 3a461cb..1900510 100644
--- a/src/xdg-hostname/xdg-hostname-monitor.c
+++ b/src/xdg-hostname/xdg-hostname-monitor.c
@@ -57,8 +57,6 @@ struct _XdgHostnameMonitor
         char *transient_hostname;
         char *transient_icon_name;
 
-        gboolean can_set_data;
-
         DBusGProxy *proxy;
         DBusGProxy *prop_proxy;
 };
@@ -85,8 +83,6 @@ enum {
         PROP_TRANSIENT_DISPLAY_HOSTNAME,
         PROP_TRANSIENT_HOSTNAME,
         PROP_TRANSIENT_ICON_NAME,
-
-        PROP_CAN_SET_DATA,
 };
 
 enum {
@@ -195,10 +191,6 @@ xdg_hostname_monitor_get_property (GObject         *object,
                 g_value_set_string (value, hostname_monitor->transient_icon_name);
                 break;
 
-        case PROP_CAN_SET_DATA:
-                g_value_set_boolean (value, hostname_monitor->can_set_data);
-                break;
-
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                 break;
@@ -309,14 +301,6 @@ xdg_hostname_monitor_class_init (XdgHostnameMonitorClass *klass)
                                                               NULL,
                                                               NULL,
                                                               G_PARAM_READABLE));
-
-        g_object_class_install_property (gobject_class,
-                                         PROP_CAN_SET_DATA,
-                                         g_param_spec_boolean ("can-set-data",
-                                                               NULL,
-                                                               NULL,
-                                                               TRUE,
-                                                               G_PARAM_READABLE));
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -375,9 +359,6 @@ collect_props (const char *key, const GValue *value, XdgHostnameMonitor *h)
         } else if (strcmp (key, "transient-icon-name") == 0) {
                 SET_STRING (transient_icon_name, "transient-icon-name");
 
-        } else if (strcmp (key, "can-set-data") == 0) {
-                SET_BOOL (can_set_data, "can-set-data");
-
         } else {
                 handled = FALSE;
         }