summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--doc/reference/libmcclient/libmcclient-sections.txt2
-rw-r--r--doc/reference/libmcclient/tmpl/libmcclient-unused.sgml13
-rw-r--r--doc/reference/libmcclient/tmpl/mc-account.sgml2
-rw-r--r--libmcclient/mc-account-conditions.c2
-rw-r--r--libmcclient/mc-account.h2
6 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5411d89f..c5c7cba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-07-11 Alberto Mardegan <alberto.mardegan@nokia.com>
+ * libmcclient/mc-account-conditions.c, libmcclient/mc-account.h:
+ Rename mc_account_set_conditions() to mc_account_conditions_set(), as
+ it should have been since the beginning.
+
* libmcclient/mc-account-compat.c,
libmcclient/mc-account-conditions.c:
Add missing documentation.
diff --git a/doc/reference/libmcclient/libmcclient-sections.txt b/doc/reference/libmcclient/libmcclient-sections.txt
index 451abbc0..3370a573 100644
--- a/doc/reference/libmcclient/libmcclient-sections.txt
+++ b/doc/reference/libmcclient/libmcclient-sections.txt
@@ -40,7 +40,7 @@ mc_account_compat_set_profile
mc_account_compat_set_secondary_vcard_fields
mc_account_conditions_call_when_ready
mc_account_conditions_get
-mc_account_set_conditions
+mc_account_conditions_set
<SUBSECTION Standard>
MC_ACCOUNT
MC_IS_ACCOUNT
diff --git a/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml b/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml
index c5968dd1..4297ebc6 100644
--- a/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml
+++ b/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml
@@ -94,6 +94,19 @@ cli-account-manager
cli-account
+<!-- ##### FUNCTION mc_account_set_conditions ##### -->
+<para>
+
+</para>
+
+@account:
+@conditions:
+@callback:
+@user_data:
+@destroy:
+@weak_object:
+@Returns:
+
<!-- ##### FUNCTION mc_account_set_current_presence ##### -->
<para>
diff --git a/doc/reference/libmcclient/tmpl/mc-account.sgml b/doc/reference/libmcclient/tmpl/mc-account.sgml
index f69ba4ac..7b1afde1 100644
--- a/doc/reference/libmcclient/tmpl/mc-account.sgml
+++ b/doc/reference/libmcclient/tmpl/mc-account.sgml
@@ -502,7 +502,7 @@ mc-account
@Returns:
-<!-- ##### FUNCTION mc_account_set_conditions ##### -->
+<!-- ##### FUNCTION mc_account_conditions_set ##### -->
<para>
</para>
diff --git a/libmcclient/mc-account-conditions.c b/libmcclient/mc-account-conditions.c
index 93a4b8fe..ccfcb145 100644
--- a/libmcclient/mc-account-conditions.c
+++ b/libmcclient/mc-account-conditions.c
@@ -147,7 +147,7 @@ mc_account_conditions_get (McAccount *account)
* Returns: a #TpProxyPendingCall for the underlying D-Bus call.
*/
TpProxyPendingCall *
-mc_account_set_conditions (McAccount *account,
+mc_account_conditions_set (McAccount *account,
const GHashTable *conditions,
tp_cli_dbus_properties_callback_for_set callback,
gpointer user_data,
diff --git a/libmcclient/mc-account.h b/libmcclient/mc-account.h
index 1ba82b50..4f63071d 100644
--- a/libmcclient/mc-account.h
+++ b/libmcclient/mc-account.h
@@ -202,7 +202,7 @@ void mc_account_conditions_call_when_ready (McAccount *account,
const GHashTable *mc_account_conditions_get (McAccount *account);
TpProxyPendingCall *
-mc_account_set_conditions (McAccount *account,
+mc_account_conditions_set (McAccount *account,
const GHashTable *conditions,
tp_cli_dbus_properties_callback_for_set callback,
gpointer user_data,