aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-notify-manager.c10
-rw-r--r--libempathy-gtk/empathy-notify-manager.h36
-rw-r--r--src/empathy-status-icon.c2
3 files changed, 24 insertions, 24 deletions
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index 6a9ee3971..b87bb4965 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -101,11 +101,11 @@ empathy_notify_manager_init (EmpathyNotifyManager *self)
list = notify_get_server_caps ();
for (l = list; l != NULL; l = g_list_next (l))
{
- gchar *capa = l->data;
+ gchar *cap = l->data;
- DEBUG ("add capability: %s", capa);
+ DEBUG ("add capability: %s", cap);
/* owernship of the string is transfered to the hash table */
- g_hash_table_insert (priv->capabilities, capa, GUINT_TO_POINTER (TRUE));
+ g_hash_table_insert (priv->capabilities, cap, GUINT_TO_POINTER (TRUE));
}
g_list_free (list);
}
@@ -118,11 +118,11 @@ empathy_notify_manager_dup_singleton (void)
gboolean
empathy_notify_manager_has_capability (EmpathyNotifyManager *self,
- const gchar *capa)
+ const gchar *cap)
{
EmpathyNotifyManagerPriv *priv = GET_PRIV (self);
- return g_hash_table_lookup (priv->capabilities, capa) != NULL;
+ return g_hash_table_lookup (priv->capabilities, cap) != NULL;
}
GdkPixbuf *
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index 4faa13b35..70acd7887 100644
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -25,24 +25,24 @@
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_APPEND "append"
+#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_PRIVATE_ICON_ONLY "private-icon-only"
+#define EMPATHY_NOTIFY_MANAGER_CAP_PRIVATE_SYNCHRONOUS "private-synchronous"
+#define EMPATHY_NOTIFY_MANAGER_CAP_SOUND "sound"
+#define EMPATHY_NOTIFY_MANAGER_CAP_TRUNCATION "truncation"
/* 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,7 +80,7 @@ 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_notify_manager_notification_is_enabled (
EmpathyNotifyManager *self);
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 0993762ee..08024edf6 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -174,7 +174,7 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
NOTIFY_EXPIRES_DEFAULT);
if (empathy_notify_manager_has_capability (priv->notify_mgr,
- EMPATHY_NOTIFY_MANAGER_CAPA_ACTIONS)) {
+ EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS)) {
notify_notification_add_action (priv->notification,
"respond",
_("Respond"),