diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-03 06:38:02 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-03 06:38:02 +0800 |
| commit | 7bf5562a19ecac3c59dc23ebe507112e2745b635 (patch) | |
| tree | 9fccd6613f968d0fc40b518399d7858cb3c609fe /libempathy-gtk/empathy-account-chooser.c | |
| parent | d54baf1615b3d019878f7dac66303de77737a6f0 (diff) | |
| download | gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.gz gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.bz2 gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.lz gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.xz gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.zst gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.zip | |
Conflicts:
ChangeLog
svn path=/trunk/; revision=455
Diffstat (limited to 'libempathy-gtk/empathy-account-chooser.c')
| -rw-r--r-- | libempathy-gtk/empathy-account-chooser.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index c9cfbed59..8c9674177 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -64,41 +64,41 @@ enum { COL_ACCOUNT_COUNT }; -static void account_chooser_finalize (GObject *object); -static void account_chooser_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec); -static void account_chooser_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec); -static void account_chooser_setup (EmpathyAccountChooser *chooser); -static void account_chooser_account_created_cb (McAccountMonitor *monitor, - const gchar *unique_name, - EmpathyAccountChooser *chooser); -static void account_chooser_account_add_foreach (McAccount *account, - EmpathyAccountChooser *chooser); -static void account_chooser_account_deleted_cb (McAccountMonitor *monitor, - const gchar *unique_name, - EmpathyAccountChooser *chooser); -static void account_chooser_account_remove_foreach (McAccount *account, - EmpathyAccountChooser *chooser); -static void account_chooser_update_iter (EmpathyAccountChooser *chooser, - GtkTreeIter *iter); -static void account_chooser_status_changed_cb (MissionControl *mc, - TelepathyConnectionStatus status, - McPresence presence, - TelepathyConnectionStatusReason reason, - const gchar *unique_name, - EmpathyAccountChooser *chooser); -static gboolean account_chooser_separator_func (GtkTreeModel *model, - GtkTreeIter *iter, - EmpathyAccountChooser *chooser); -static gboolean account_chooser_set_account_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - SetAccountData *data); +static void account_chooser_finalize (GObject *object); +static void account_chooser_get_property (GObject *object, + guint param_id, + GValue *value, + GParamSpec *pspec); +static void account_chooser_set_property (GObject *object, + guint param_id, + const GValue *value, + GParamSpec *pspec); +static void account_chooser_setup (EmpathyAccountChooser *chooser); +static void account_chooser_account_created_cb (McAccountMonitor *monitor, + const gchar *unique_name, + EmpathyAccountChooser *chooser); +static void account_chooser_account_add_foreach (McAccount *account, + EmpathyAccountChooser *chooser); +static void account_chooser_account_deleted_cb (McAccountMonitor *monitor, + const gchar *unique_name, + EmpathyAccountChooser *chooser); +static void account_chooser_account_remove_foreach (McAccount *account, + EmpathyAccountChooser *chooser); +static void account_chooser_update_iter (EmpathyAccountChooser *chooser, + GtkTreeIter *iter); +static void account_chooser_status_changed_cb (MissionControl *mc, + TpConnectionStatus status, + McPresence presence, + TpConnectionStatusReason reason, + const gchar *unique_name, + EmpathyAccountChooser *chooser); +static gboolean account_chooser_separator_func (GtkTreeModel *model, + GtkTreeIter *iter, + EmpathyAccountChooser *chooser); +static gboolean account_chooser_set_account_foreach (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + SetAccountData *data); enum { PROP_0, @@ -555,12 +555,12 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser, } static void -account_chooser_status_changed_cb (MissionControl *mc, - TelepathyConnectionStatus status, - McPresence presence, - TelepathyConnectionStatusReason reason, - const gchar *unique_name, - EmpathyAccountChooser *chooser) +account_chooser_status_changed_cb (MissionControl *mc, + TpConnectionStatus status, + McPresence presence, + TpConnectionStatusReason reason, + const gchar *unique_name, + EmpathyAccountChooser *chooser) { McAccount *account; GtkTreeIter iter; @@ -663,8 +663,8 @@ gboolean empathy_account_chooser_filter_is_connected (McAccount *account, gpointer user_data) { - MissionControl *mc; - TelepathyConnectionStatus status; + MissionControl *mc; + TpConnectionStatus status; g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE); @@ -672,6 +672,6 @@ empathy_account_chooser_filter_is_connected (McAccount *account, status = mission_control_get_connection_status (mc, account, NULL); g_object_unref (mc); - return status == TP_CONN_STATUS_CONNECTED; + return status == TP_CONNECTION_STATUS_CONNECTED; } |