*/
#include "config.h"
+#include "empathy-notify-manager.h"
#include <libnotify/notify.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
-
+#include "empathy-gsettings.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-
-#include "empathy-notify-manager.h"
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager)
pixbuf = empathy_pixbuf_avatar_from_contact_scaled (contact, 48, 48);
if (pixbuf == NULL)
- pixbuf = empathy_pixbuf_from_icon_name_sized (icon_name, 48);
+ pixbuf = tpaw_pixbuf_from_icon_name_sized (icon_name, 48);
return pixbuf;
}
EMPATHY_PREFS_NOTIFICATIONS_ENABLED))
return FALSE;
- if (!tp_account_manager_is_prepared (priv->account_manager,
+ if (!tp_proxy_is_prepared (priv->account_manager,
TP_ACCOUNT_MANAGER_FEATURE_CORE))
{
DEBUG ("account manager is not ready yet; display the notification");