[telepathy-mission-control/master] McdMaster: remove obsolete default-presence property

[Simon McVittie]

---
 .../libmissioncontrol-server/tmpl/mcd-master.sgml  |   14 ------------
 src/mcd-master.c                                   |   23 --------------------
 src/mcd-master.h                                   |    3 --
 3 files changed, 0 insertions(+), 40 deletions(-)

diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml
index 207ebb8..612d05c 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml
@@ -38,22 +38,8 @@ McdMaster
 
 </para>
 
-<!-- ##### ARG McdMaster:default-presence ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG McdMaster:dispatcher ##### -->
 <para>
 
 </para>
 
-<!-- ##### FUNCTION mcd_master_set_default_presence_setting ##### -->
-<para>
-
-</para>
-
- at master: 
- at presence: 
-
-
diff --git a/src/mcd-master.c b/src/mcd-master.c
index 9762029..97a3377 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -86,7 +86,6 @@ typedef struct _McdMasterPrivate
     McdProxy *proxy;
     TpConnectionPresenceType awake_presence;
     gchar *awake_presence_message;
-    TpConnectionPresenceType default_presence;
 
     /* We create this for our member objects */
     TpDBusDaemon *dbus_daemon;
@@ -109,7 +108,6 @@ enum
     PROP_DBUS_CONNECTION,
     PROP_DBUS_DAEMON,
     PROP_DISPATCHER,
-    PROP_DEFAULT_PRESENCE,
     PROP_ACCOUNT_MANAGER,
 };
 
@@ -389,9 +387,6 @@ _mcd_master_get_property (GObject * obj, guint prop_id,
 	g_value_set_pointer (val,
 			     TP_PROXY (priv->dbus_daemon)->dbus_connection);
 	break;
-    case PROP_DEFAULT_PRESENCE:
-	g_value_set_uint (val, priv->default_presence);
-	break;
     case PROP_ACCOUNT_MANAGER:
 	g_value_set_object (val, priv->account_manager);
 	break;
@@ -413,9 +408,6 @@ _mcd_master_set_property (GObject *obj, guint prop_id,
 	g_assert (priv->dbus_daemon == NULL);
 	priv->dbus_daemon = g_value_dup_object (val);
 	break;
-    case PROP_DEFAULT_PRESENCE:
-	priv->default_presence = g_value_get_uint (val);
-	break;
     case PROP_ACCOUNT_MANAGER:
 	g_assert (priv->account_manager == NULL);
 	priv->account_manager = g_value_dup_object (val);
@@ -634,13 +626,6 @@ mcd_master_class_init (McdMasterClass * klass)
                                "D-Bus Connection",
                                "D-Bus Connection",
                                G_PARAM_READABLE));
-    g_object_class_install_property
-        (object_class, PROP_DEFAULT_PRESENCE,
-         g_param_spec_uint ("default-presence",
-                            "Default presence",
-                            "Default presence",
-                            0, TP_CONNECTION_PRESENCE_TYPE_UNSET, 0,
-                            G_PARAM_READWRITE));
 
     g_object_class_install_property
         (object_class, PROP_ACCOUNT_MANAGER,
@@ -680,14 +665,6 @@ mcd_master_get_default (void)
     return default_master;
 }
 
-void
-mcd_master_set_default_presence_setting (McdMaster *master,
-					 TpConnectionPresenceType presence)
-{
-    McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
-    priv->default_presence = presence;
-}
-
 /**
  * mcd_master_add_connection_parameter:
  * @master: the #McdMaster.
diff --git a/src/mcd-master.h b/src/mcd-master.h
index 9c2621d..e6da0ad 100644
--- a/src/mcd-master.h
+++ b/src/mcd-master.h
@@ -71,9 +71,6 @@ McdManager *mcd_master_lookup_manager (McdMaster *master,
 McdDispatcher *mcd_master_get_dispatcher (McdMaster *master);
 TpDBusDaemon *mcd_master_get_dbus_daemon (McdMaster *master);
 
-void mcd_master_set_default_presence_setting (McdMaster *master,
-					      TpConnectionPresenceType presence);
-
 void mcd_master_add_connection_parameter (McdMaster *master, const gchar *name,
 					  const GValue *value);
 
-- 
1.5.6.5