diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-05 17:43:50 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-05 17:48:12 +0800 |
| commit | ddcb104dfa874375ea17cac4de2f273af7327fc4 (patch) | |
| tree | 7e825a21332c56d456c866de3dc23983eb83ebfb /libempathy-gtk | |
| parent | 6294f9870191ddc0f8a357907d17ac776ef511ca (diff) | |
| download | gsoc2013-empathy-ddcb104dfa874375ea17cac4de2f273af7327fc4.tar gsoc2013-empathy-ddcb104dfa874375ea17cac4de2f273af7327fc4.tar.gz gsoc2013-empathy-ddcb104dfa874375ea17cac4de2f273af7327fc4.tar.bz2 gsoc2013-empathy-ddcb104dfa874375ea17cac4de2f273af7327fc4.tar.lz gsoc2013-empathy-ddcb104dfa874375ea17cac4de2f273af7327fc4.tar.xz gsoc2013-empathy-ddcb104dfa874375ea17cac4de2f273af7327fc4.tar.zst gsoc2013-empathy-ddcb104dfa874375ea17cac4de2f273af7327fc4.zip | |
Get the icon name from the account object directly
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-chooser.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 10 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.h | 1 |
4 files changed, 2 insertions, 13 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 7dccb2179..719cc76c2 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -610,7 +610,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser, COL_ACCOUNT_POINTER, &account, -1); - icon_name = empathy_icon_name_from_account (account); + icon_name = empathy_account_get_icon_name (account); if (priv->filter) { is_enabled = priv->filter (account, priv->filter_data); } diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index f05017c9c..7add30136 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -419,7 +419,7 @@ log_window_find_populate (EmpathyLogWindow *window, date_readable = empathy_log_manager_get_date_readable (hit->date); account_name = empathy_account_get_display_name (hit->account); - account_icon = empathy_icon_name_from_account (hit->account); + account_icon = empathy_account_get_icon_name (hit->account); gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 3c8c52746..00e6a0cb2 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -183,16 +183,6 @@ empathy_builder_unref_and_keep_widget (GtkBuilder *gui, } const gchar * -empathy_icon_name_from_account (EmpathyAccount *account) -{ - McProfile *profile; - - profile = empathy_account_get_profile (account); - - return mc_profile_get_icon_name (profile); -} - -const gchar * empathy_icon_name_for_presence (TpConnectionPresenceType presence) { switch (presence) { diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 10f889b0c..fe676b135 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -59,7 +59,6 @@ GtkWidget *empathy_builder_unref_and_keep_widget (GtkBuilder *gui, GtkWidget *root); /* Pixbufs */ -const gchar * empathy_icon_name_from_account (EmpathyAccount *account); const gchar * empathy_icon_name_for_presence (TpConnectionPresenceType presence); const gchar * empathy_icon_name_for_contact (EmpathyContact *contact); GdkPixbuf * empathy_pixbuf_from_data (gchar *data, |