diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-05 20:37:47 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-05 20:37:47 +0800 |
commit | e6188730e17ae1e60bdc61034f0c31e015c6ccb9 (patch) | |
tree | 09c8372e064fe50c0c4da63b3baf9b8848947ee2 | |
parent | 4f1c664ee53ae1579be089d936371b22a06f123b (diff) | |
parent | a6e2a62fbd49bd25f87ed3862e4c33b6f35b838b (diff) | |
download | gsoc2013-empathy-e6188730e17ae1e60bdc61034f0c31e015c6ccb9.tar gsoc2013-empathy-e6188730e17ae1e60bdc61034f0c31e015c6ccb9.tar.gz gsoc2013-empathy-e6188730e17ae1e60bdc61034f0c31e015c6ccb9.tar.bz2 gsoc2013-empathy-e6188730e17ae1e60bdc61034f0c31e015c6ccb9.tar.lz gsoc2013-empathy-e6188730e17ae1e60bdc61034f0c31e015c6ccb9.tar.xz gsoc2013-empathy-e6188730e17ae1e60bdc61034f0c31e015c6ccb9.tar.zst gsoc2013-empathy-e6188730e17ae1e60bdc61034f0c31e015c6ccb9.zip |
Merge branch 'fix-headers-597293'
-rw-r--r-- | libempathy/empathy-account-manager.h | 3 | ||||
-rw-r--r-- | libempathy/empathy-tp-contact-list.h | 1 | ||||
-rw-r--r-- | python/pyempathy/pyempathy.defs | 15 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libempathy/empathy-account-manager.h b/libempathy/empathy-account-manager.h index 25adfdbeb..7b4ebd9bb 100644 --- a/libempathy/empathy-account-manager.h +++ b/libempathy/empathy-account-manager.h @@ -79,9 +79,6 @@ GList * empathy_account_manager_dup_accounts (EmpathyAccountManager *manager); GList * empathy_account_manager_dup_connections (EmpathyAccountManager *manager); -void empathy_account_manager_remove ( - EmpathyAccountManager *manager, - EmpathyAccount *account); void empathy_account_manager_request_global_presence ( EmpathyAccountManager *manager, diff --git a/libempathy/empathy-tp-contact-list.h b/libempathy/empathy-tp-contact-list.h index 0167b6a69..071fc0b91 100644 --- a/libempathy/empathy-tp-contact-list.h +++ b/libempathy/empathy-tp-contact-list.h @@ -51,7 +51,6 @@ struct _EmpathyTpContactListClass { GType empathy_tp_contact_list_get_type (void) G_GNUC_CONST; EmpathyTpContactList * empathy_tp_contact_list_new (TpConnection *connection); TpConnection * empathy_tp_contact_list_get_connection (EmpathyTpContactList *list); -gboolean empathy_tp_contact_list_can_add (EmpathyTpContactList *list); void empathy_tp_contact_list_remove_all (EmpathyTpContactList *list); G_END_DECLS diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index a6d5db8bb..37586841b 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -927,15 +927,6 @@ (return-type "GList*") ) -(define-method remove - (of-object "EmpathyAccountManager") - (c-name "empathy_account_manager_remove") - (return-type "none") - (parameters - '("EmpathyAccount*" "account") - ) -) - (define-method request_global_presence (of-object "EmpathyAccountManager") (c-name "empathy_account_manager_request_global_presence") @@ -3464,12 +3455,6 @@ (return-type "TpConnection*") ) -(define-method can_add - (of-object "EmpathyTpContactList") - (c-name "empathy_tp_contact_list_can_add") - (return-type "gboolean") -) - (define-method remove_all (of-object "EmpathyTpContactList") (c-name "empathy_tp_contact_list_remove_all") |