From b458bf95eb2554b110e5ed299a72c34827ef423d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 5 Mar 2013 11:52:07 +0100 Subject: [PATCH] merge patch fixing gnome notifications --- gtk/main.c | 8 ++++---- po/de.po | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/main.c b/gtk/main.c index dab29bda..242b7f0b 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1118,13 +1118,13 @@ void linphone_gtk_notify(LinphoneCall *call, const char *msg){ NotifyNotification *n; switch(linphone_call_get_state(call)){ case LinphoneCallError: - make_notification(_("Call error"),body=g_markup_printf_escaped("%s\n%s",msg,remote)); + make_notification(_("Call error"),body=g_markup_printf_escaped("%s\n%s",msg,remote)); break; case LinphoneCallEnd: - make_notification(_("Call ended"),body=g_markup_printf_escaped("%s",remote)); + make_notification(_("Call ended"),body=g_markup_printf_escaped("%s",remote)); break; case LinphoneCallIncomingReceived: - n=build_notification(_("Incoming call"),body=g_markup_printf_escaped("%s",remote)); + n=build_notification(_("Incoming call"),body=g_markup_printf_escaped("%s",remote)); if (notify_actions_supported()) { notify_notification_add_action (n,"answer", _("Answer"), NOTIFY_ACTION_CALLBACK(linphone_gtk_answer_clicked),NULL,NULL); @@ -1134,7 +1134,7 @@ void linphone_gtk_notify(LinphoneCall *call, const char *msg){ show_notification(n); break; case LinphoneCallPausedByRemote: - make_notification(_("Call paused"),body=g_markup_printf_escaped(_("by %s"),remote)); + make_notification(_("Call paused"),body=g_markup_printf_escaped(_("by %s"),remote)); break; default: break; diff --git a/po/de.po b/po/de.po index 6a0b322f..bb68557f 100644 --- a/po/de.po +++ b/po/de.po @@ -163,8 +163,8 @@ msgstr "Anruf wird gehalten" #: ../gtk/main.c:1067 #, c-format -msgid "by %s" -msgstr "von %s" +msgid "by %s" +msgstr "von %s" #: ../gtk/main.c:1116 #, c-format -- 2.39.2