TpBaseProtocol: Rename Get/get to Dup/dup on callbacks to retrieve the supported vcard fields/uri schemes.

4 files changed, 18 insertions, 18 deletions

diff --git a/glib/docs/reference/telepathy-glib-sections.txt b/glib/docs/reference/telepathy-glib-sections.txt
index 65d0704f2..456276b9f 100644
--- a/glib/docs/reference/telepathy-glib-sections.txt
+++ b/glib/docs/reference/telepathy-glib-sections.txt
@@ -5293,8 +5293,8 @@ TP_IS_PROTOCOL_ADDRESSING
 TP_PROTOCOL_ADDRESSING_GET_INTERFACE
 <SUBSECTION>
 TpProtocolAddressingInterface
-TpBaseProtocolGetSupportedVCardFields
-TpBaseProtocolGetSupportedURISchemes
+TpBaseProtocolDupSupportedVCardFields
+TpBaseProtocolDupSupportedURISchemes
 TpBaseProtocolNormalizeVCardAddressFunc
 TpBaseProtocolNormalizeURIFunc
 <SUBSECTION Private>
diff --git a/glib/examples/cm/echo-message-parts/protocol.c b/glib/examples/cm/echo-message-parts/protocol.c
index e18a78e31..11a22269c 100644
--- a/glib/examples/cm/echo-message-parts/protocol.c
+++ b/glib/examples/cm/echo-message-parts/protocol.c
@@ -212,13 +212,13 @@ get_avatar_details (TpBaseProtocol *self,
 }
 
 static GStrv
-get_supported_uri_schemes (TpBaseProtocol *self)
+dup_supported_uri_schemes (TpBaseProtocol *self)
 {
   return g_strdupv ((GStrv) addressing_uri_schemes);
 }
 
 static GStrv
-get_supported_vcard_fields (TpBaseProtocol *self)
+dup_supported_vcard_fields (TpBaseProtocol *self)
 {
   return g_strdupv ((GStrv) addressing_vcard_fields);
 }
@@ -243,6 +243,6 @@ example_echo_2_protocol_class_init (
 static void
 addressing_iface_init (TpProtocolAddressingInterface *iface)
 {
-  iface->get_supported_vcard_fields = get_supported_vcard_fields;
-  iface->get_supported_uri_schemes = get_supported_uri_schemes;
+  iface->dup_supported_vcard_fields = dup_supported_vcard_fields;
+  iface->dup_supported_uri_schemes = dup_supported_uri_schemes;
 }
diff --git a/glib/telepathy-glib/base-protocol.c b/glib/telepathy-glib/base-protocol.c
index 695d24756..3fcaced96 100644
--- a/glib/telepathy-glib/base-protocol.c
+++ b/glib/telepathy-glib/base-protocol.c
@@ -423,9 +423,9 @@ tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec,
 /**
  * TpProtocolAddressingInterface:
  * @parent: the parent interface
- * @get_supported_uri_schemes: provides the supported URI schemes. Must always
+ * @dup_supported_uri_schemes: provides the supported URI schemes. Must always
  * be implemented.
- * @get_supported_vcard_fields: provides the supported vCard fields. Must
+ * @dup_supported_vcard_fields: provides the supported vCard fields. Must
  * always be implemented.
  * @normalize_vcard_address: protocol-specific implementation for normalizing
  * vCard addresses.
@@ -437,7 +437,7 @@ tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec,
  */
 
 /**
- * TpBaseProtocolGetSupportedVCardFields:
+ * TpBaseProtocolDupSupportedVCardFields:
  * @self: a protocol
  *
  * Signature of a virtual method to get the supported vCard fields supported by
@@ -450,7 +450,7 @@ tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec,
  */
 
 /**
- * TpBaseProtocolGetSupportedURISchemes:
+ * TpBaseProtocolDupSupportedURISchemes:
  * @self: a protocol
  *
  * Signature of a virtual method to get the supported URI schemes supported by
@@ -1034,15 +1034,15 @@ protocol_prop_addressing_getter (GObject *object,
   switch (GPOINTER_TO_INT (getter_data))
     {
       case PADP_ADDRESSABLE_VCARD_FIELDS:
-        g_assert (addr_iface->get_supported_vcard_fields != NULL);
+        g_assert (addr_iface->dup_supported_vcard_fields != NULL);
         g_value_take_boxed (value,
-            addr_iface->get_supported_vcard_fields (self));
+            addr_iface->dup_supported_vcard_fields (self));
         break;
 
       case PADP_ADDRESSABLE_URI_SCHEMES:
-        g_assert (addr_iface->get_supported_uri_schemes != NULL);
+        g_assert (addr_iface->dup_supported_uri_schemes != NULL);
         g_value_take_boxed (value,
-            addr_iface->get_supported_uri_schemes (self));
+            addr_iface->dup_supported_uri_schemes (self));
         break;
 
       default:
diff --git a/glib/telepathy-glib/base-protocol.h b/glib/telepathy-glib/base-protocol.h
index 133eee9cd..094340c1b 100644
--- a/glib/telepathy-glib/base-protocol.h
+++ b/glib/telepathy-glib/base-protocol.h
@@ -197,9 +197,9 @@ TpBaseConnection *tp_base_protocol_new_connection (TpBaseProtocol *self,
 
 typedef struct _TpProtocolAddressingInterface TpProtocolAddressingInterface;
 
-typedef GStrv (*TpBaseProtocolGetSupportedVCardFields) (TpBaseProtocol *self);
+typedef GStrv (*TpBaseProtocolDupSupportedVCardFields) (TpBaseProtocol *self);
 
-typedef GStrv (*TpBaseProtocolGetSupportedURISchemes) (TpBaseProtocol *self);
+typedef GStrv (*TpBaseProtocolDupSupportedURISchemes) (TpBaseProtocol *self);
 
 typedef gchar *(*TpBaseProtocolNormalizeVCardAddressFunc) (
     TpBaseProtocol *self,
@@ -215,9 +215,9 @@ typedef gchar *(*TpBaseProtocolNormalizeURIFunc) (
 struct _TpProtocolAddressingInterface {
   GTypeInterface parent;
 
-  TpBaseProtocolGetSupportedVCardFields get_supported_vcard_fields;
+  TpBaseProtocolDupSupportedVCardFields dup_supported_vcard_fields;
 
-  TpBaseProtocolGetSupportedURISchemes get_supported_uri_schemes;
+  TpBaseProtocolDupSupportedURISchemes dup_supported_uri_schemes;
 
   TpBaseProtocolNormalizeVCardAddressFunc normalize_vcard_address;