Merge branch 'people-nearby-fake-group-613558'

[empathy.git] / libempathy-gtk / empathy-notify-manager.h

diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index d56e508529c8a6a4918175237087576ed9b33aa7..ff62a872a484ad44d3c2bedc30cf115d2c03c1d5 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -25,24 +25,20 @@
 
 G_BEGIN_DECLS
 
-#define EMPATHY_NOTIFY_MANAGER_CAPA_ACTIONS             "actions"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_APPEND              "append"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_BODY                "body"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_BODY_HYPERLINKS     "body-hyperlinks"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_BODY_IMAGES         "body-images"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_BODY_MARKUP         "body-markup"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_ICON_MULTI          "icon-multi"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_ICON_STATIC         "icon-static"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_IMAGE_SVG_XML       "image/svg+xml"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_PRIVATE_ICON_ONLY   "private-icon-only"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_PRIVATE_SYNCHRONOUS "private-synchronous"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_SOUND                "sound"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_TRUNCATION           "truncation"
+#define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS             "actions"
+#define EMPATHY_NOTIFY_MANAGER_CAP_BODY                "body"
+#define EMPATHY_NOTIFY_MANAGER_CAP_BODY_HYPERLINKS     "body-hyperlinks"
+#define EMPATHY_NOTIFY_MANAGER_CAP_BODY_IMAGES         "body-images"
+#define EMPATHY_NOTIFY_MANAGER_CAP_BODY_MARKUP         "body-markup"
+#define EMPATHY_NOTIFY_MANAGER_CAP_ICON_MULTI          "icon-multi"
+#define EMPATHY_NOTIFY_MANAGER_CAP_ICON_STATIC         "icon-static"
+#define EMPATHY_NOTIFY_MANAGER_CAP_IMAGE_SVG_XML       "image/svg+xml"
+#define EMPATHY_NOTIFY_MANAGER_CAP_SOUND                "sound"
 /* notify-osd specific */
-#define EMPATHY_NOTIFY_MANAGER_CAPA_X_CANONICAL_APPEND              "x-canonical-append"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_X_CANONICAL_PRIVATE_ICON_ONLY   "x-canonical-private-icon-only"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_X_CANONICAL_PRIVATE_SYNCHRONOUS "x-canonical-private-synchronous"
-#define EMPATHY_NOTIFY_MANAGER_CAPA_X_CANONICAL_TRUNCATION          "x-canonical-truncation"
+#define EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND              "x-canonical-append"
+#define EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_PRIVATE_ICON_ONLY   "x-canonical-private-icon-only"
+#define EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_PRIVATE_SYNCHRONOUS "x-canonical-private-synchronous"
+#define EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_TRUNCATION          "x-canonical-truncation"
 
 #define EMPATHY_TYPE_NOTIFY_MANAGER         (empathy_notify_manager_get_type ())
 #define EMPATHY_NOTIFY_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_NOTIFY_MANAGER, EmpathyNotifyManager))
@@ -80,12 +76,15 @@ GType empathy_notify_manager_get_type (void) G_GNUC_CONST;
 EmpathyNotifyManager * empathy_notify_manager_dup_singleton (void);
 
 gboolean empathy_notify_manager_has_capability (EmpathyNotifyManager *self,
-    const gchar *capa);
+    const gchar *cap);
 
-gboolean empathy_notification_is_enabled  (void);
-GdkPixbuf * empathy_misc_get_pixbuf_for_notification (EmpathyContact *contact,
-    const char *icon_name);
+gboolean empathy_notify_manager_notification_is_enabled  (
+    EmpathyNotifyManager *self);
 
+GdkPixbuf * empathy_notify_manager_get_pixbuf_for_notification (
+    EmpathyNotifyManager *self,
+    EmpathyContact *contact,
+    const char *icon_name);
 
 G_END_DECLS