enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

E notification: Added a way to allow e to send markup notifications. 

SVN revision: 66236
This commit is contained in:
Tom Hacohen 2011-12-15 08:13:39 +00:00
parent 98d985c29f
commit ecdd149227
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/notification/e_mod_main.c
View File

@ -227,7 +227,7 @@ _notification_show_presentation(Eina_Bool enabled)
"power saving settings will be restored.");
}
_notification_show_common(summary, body, 0);
_notification_show_common(summary, body, -1);
}
static void
@ -250,7 +250,7 @@ _notification_show_offline(Eina_Bool enabled)
"resume regular tasks.");
}
_notification_show_common(summary, body, 0);
_notification_show_common(summary, body, -1);
}
static Eina_Bool

14
src/modules/notification/e_mod_popup.c
View File

@ -178,10 +178,14 @@ _notification_popup_merge(E_Notification *n)
len = strlen(body_old);
len += strlen(body_new);
len += 3; /* \xE2\x80\xA9 - PS */
len += 4; /* \xE2\x80\xA9 or <PS> */
if (len < 65536) body_final = alloca(len + 1);
else body_final = malloc(len + 1);
snprintf(body_final, len + 1, "%s\xE2\x80\xA9%s", body_old, body_new);
/* Hack to allow e to include markup */
if (e_notification_replaces_id_get(n) == -1)
snprintf(body_final, len + 1, "%s<ps>%s", body_old, body_new);
else
snprintf(body_final, len + 1, "%s\xE2\x80\xA9%s", body_old, body_new);
/* printf("set body %s\n", body_final); */
e_notification_body_set(n, body_final);
@ -580,6 +584,12 @@ _notification_format_message(Popup_Data *popup)
const char *title = e_notification_summary_get(popup->notif);
const char *b = e_notification_body_get(popup->notif);
edje_object_part_text_set(o, "notification.text.title", title);
/* Hack to allow e to include markup */
if (e_notification_replaces_id_get(popup->notif) == -1)
{
edje_object_part_text_set(o, "notification.textblock.message", b);
}
else
{
char *tmp;
tmp = evas_textblock_text_utf8_to_markup(NULL, b);