Author: juha
Date: 2006-11-04 23:37:19 +0000 (Sat, 04 Nov 2006)
New Revision: 23705
Modified:
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/reminder.h
Log:
Fixing Bug 2497: & in heading causes corrupted display in alarm window heading.
Added missing escape for markup text.
Modified: xfcalendar/trunk/src/reminder.c
===================================================================
--- xfcalendar/trunk/src/reminder.c 2006-11-04 22:36:42 UTC (rev 23704)
+++ xfcalendar/trunk/src/reminder.c 2006-11-04 23:37:19 UTC (rev 23705)
@@ -224,6 +224,7 @@
GtkWidget *swReminder;
GtkWidget *hdReminder;
char heading[200];
+ gchar *head2;
xfce_audio_alarm_type *audio_alarm;
gchar *alarm_uid;
@@ -240,7 +241,9 @@
gtk_widget_show(vbReminder);
strncat(heading, alarm->title->str, 50);
- hdReminder = xfce_create_header(NULL, heading);
+ head2 = g_markup_escape_text(heading, -1);
+ hdReminder = xfce_create_header(NULL, head2);
+ g_free(head2);
gtk_widget_show(hdReminder);
gtk_box_pack_start(GTK_BOX(vbReminder), hdReminder, FALSE, TRUE, 0);
Modified: xfcalendar/trunk/src/reminder.h
===================================================================
--- xfcalendar/trunk/src/reminder.h 2006-11-04 22:36:42 UTC (rev 23704)
+++ xfcalendar/trunk/src/reminder.h 2006-11-04 23:37:19 UTC (rev 23705)
@@ -1,7 +1,7 @@
/* reminder.h
*
- * (C) 2004-2005 Mickaël Graf
- * (C) 2005 Juha Kautto
+ * (C) 2004-2006 Mickaël Graf <[EMAIL PROTECTED]>
+ * (C) 2005-2006 Juha Kautto <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +19,9 @@
*
*/
+#ifndef __REMINDER_H__
+#define __REMINDER_H__
+
typedef struct
{
GString *uid;
@@ -47,3 +50,5 @@
gboolean orage_alarm_clock(gpointer user_data);
void set_play_command(gchar *cmd);
+
+#endif /* !__REMINDER_H__ */
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
