[next] telepathy-haze: Change terminology from handle type to entity type

[Simon McVittie]

Module: telepathy-haze
Branch: next
Commit: 847323be0ed998d981f6425f079316f76cc6f029
URL:    http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=847323be0ed998d981f6425f079316f76cc6f029

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Apr  7 13:52:10 2014 +0100

Change terminology from handle type to entity type

In the process, pick up a new constants.py from MC.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77139

---

 src/connection.c           |    4 ++--
 src/connection.h           |    2 +-
 tests/twisted/constants.py |    8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 6415635..fccfd8a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -981,12 +981,12 @@ haze_get_connection_ui_ops ()
 
 const gchar *
 haze_connection_handle_inspect (HazeConnection *conn,
-                                TpEntityType handle_type,
+                                TpEntityType entity_type,
                                 TpHandle handle)
 {
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
     TpHandleRepoIface *handle_repo =
-        tp_base_connection_get_handles (base_conn, handle_type);
+        tp_base_connection_get_handles (base_conn, entity_type);
     g_assert (tp_handle_is_valid (handle_repo, handle, NULL));
     return tp_handle_inspect (handle_repo, handle);
 }
diff --git a/src/connection.h b/src/connection.h
index 9720429..97ba309 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -70,7 +70,7 @@ PurpleConnectionUiOps *haze_get_connection_ui_ops (void);
 
 const gchar *
 haze_connection_handle_inspect (HazeConnection *conn,
-                                TpEntityType handle_type,
+                                TpEntityType entity_type,
                                 TpHandle handle);
 
 gboolean haze_connection_create_account (HazeConnection *self, GError **error);
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 9c12bd1..8272a67 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -63,6 +63,8 @@ CHANNEL_TYPE_SERVER_TLS_CONNECTION = \
     CHANNEL + ".Type.ServerTLSConnection1"
 
 CHANNEL_TYPE = CHANNEL + '.ChannelType'
+TARGET_ENTITY_TYPE = CHANNEL + '.TargetEntityType'
+# let's leave this as a synonym to reduce tests' diff churn in CMs
 TARGET_HANDLE_TYPE = CHANNEL + '.TargetEntityType'
 TARGET_HANDLE = CHANNEL + '.TargetHandle'
 TARGET_ID = CHANNEL + '.TargetID'
@@ -590,3 +592,9 @@ TEST_DBUS_ACCOUNT_SERVICE_IFACE = TEST_DBUS_ACCOUNT_SERVICE
 
 TEST_DBUS_ACCOUNT_PLUGIN_PATH = TESTSLASH + "DBusAccountPlugin"
 TEST_DBUS_ACCOUNT_PLUGIN_IFACE = TESTDOT + "DBusAccountPlugin"
+
+class StorageRestrictionFlags(object):
+    CANNOT_SET_PARAMETERS = 1
+    CANNOT_SET_ENABLED = 2
+    CANNOT_SET_PRESENCE = 4
+    CANNOT_SET_SERVICE = 8