[empathy] move pre-defined filter at the end of the files
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] move pre-defined filter at the end of the files
- Date: Thu, 27 Oct 2011 11:45:41 +0000 (UTC)
commit e220eb6b5dceb755e7858e465e78a46d555555f2
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Oct 24 14:27:15 2011 +0200
move pre-defined filter at the end of the files
https://bugzilla.gnome.org/show_bug.cgi?id=662609
libempathy-gtk/empathy-account-chooser.c | 54 +++++++++++++++--------------
libempathy-gtk/empathy-account-chooser.h | 6 ++-
2 files changed, 32 insertions(+), 28 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 8b03592..289170d 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -945,6 +945,34 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser *self,
* Return value: whether the account indicated by @account is visible.
*/
+gboolean
+empathy_account_chooser_is_ready (EmpathyAccountChooser *self)
+{
+ return self->priv->ready;
+}
+
+TpAccount *
+empathy_account_chooser_get_account (EmpathyAccountChooser *self)
+{
+ TpAccount *account;
+
+ account = empathy_account_chooser_dup_account (self);
+ if (account == NULL)
+ return NULL;
+
+ g_object_unref (account);
+
+ return account;
+}
+
+TpAccountManager *
+empathy_account_chooser_get_account_manager (EmpathyAccountChooser *self)
+{
+ return self->priv->manager;
+}
+
+/* Pre-defined filters */
+
/**
* empathy_account_chooser_filter_is_connected:
* @account: a #TpAccount
@@ -1007,29 +1035,3 @@ empathy_account_chooser_filter_supports_chatrooms (TpAccount *account,
out:
callback (supported, callback_data);
}
-
-gboolean
-empathy_account_chooser_is_ready (EmpathyAccountChooser *self)
-{
- return self->priv->ready;
-}
-
-TpAccount *
-empathy_account_chooser_get_account (EmpathyAccountChooser *self)
-{
- TpAccount *account;
-
- account = empathy_account_chooser_dup_account (self);
- if (account == NULL)
- return NULL;
-
- g_object_unref (account);
-
- return account;
-}
-
-TpAccountManager *
-empathy_account_chooser_get_account_manager (EmpathyAccountChooser *self)
-{
- return self->priv->manager;
-}
diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index 9459b29..ac67a28 100644
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -106,6 +106,10 @@ void empathy_account_chooser_set_filter (EmpathyAccountChooser *self,
EmpathyAccountChooserFilterFunc filter,
gpointer user_data);
+gboolean empathy_account_chooser_is_ready (EmpathyAccountChooser *self);
+
+/* Pre-defined filters */
+
void empathy_account_chooser_filter_is_connected (TpAccount *account,
EmpathyAccountChooserFilterResultCallback callback,
gpointer callback_data,
@@ -116,8 +120,6 @@ void empathy_account_chooser_filter_supports_chatrooms (TpAccount *account,
gpointer callback_data,
gpointer user_data);
-gboolean empathy_account_chooser_is_ready (EmpathyAccountChooser *self);
-
G_END_DECLS
#endif /* __EMPATHY_ACCOUNT_CHOOSER_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]