Merge lp:~sschuhmann/maya/fix1452859 into lp:~elementary-apps/maya/trunk

Proposed by Steffen Schuhmann
Status: Merged
Approved by: Corentin Noël
Approved revision: 806
Merged at revision: 810
Proposed branch: lp:~sschuhmann/maya/fix1452859
Merge into: lp:~elementary-apps/maya/trunk
Diff against target: 29 lines (+3/-3)
1 file modified
src/EventEdition/InfoPanel.vala (+3/-3)
To merge this branch: bzr merge lp:~sschuhmann/maya/fix1452859
Reviewer Review Type Date Requested Status
Corentin Noël Pending
elementary Apps team Pending
Review via email: mp+264973@code.launchpad.net

Commit message

Changed ical COMMENT field to DESCRIPTION, which seems to be used in most of the web uis

Description of the change

Changed the COMMENT to DESCRIPTION field, which seems to be commonly used

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/EventEdition/InfoPanel.vala'
2--- src/EventEdition/InfoPanel.vala 2014-12-31 14:26:52 +0000
3+++ src/EventEdition/InfoPanel.vala 2015-07-16 09:32:15 +0000
4@@ -145,14 +145,14 @@
5 }
6
7 // First, clear the comments
8- int count = comp.count_properties (iCal.PropertyKind.COMMENT);
9+ int count = comp.count_properties (iCal.PropertyKind.DESCRIPTION);
10 for (int i = 0; i < count; i++) {
11 unowned iCal.Property remove_prop = comp.get_first_property (iCal.PropertyKind.COMMENT);
12 comp.remove_property (remove_prop);
13 }
14
15 // Add the comment
16- var property = new iCal.Property (iCal.PropertyKind.COMMENT);
17+ var property = new iCal.Property (iCal.PropertyKind.DESCRIPTION);
18 property.set_comment (comment_textview.get_buffer ().text);
19 comp.add_property (property);
20
21@@ -207,7 +207,7 @@
22 }
23 }
24
25- unowned iCal.Property property = comp.get_first_property (iCal.PropertyKind.COMMENT);
26+ unowned iCal.Property property = comp.get_first_property (iCal.PropertyKind.DESCRIPTION);
27 if (property != null) {
28 Gtk.TextBuffer buffer = new Gtk.TextBuffer (null);
29 buffer.text = property.get_comment ();

Subscribers

People subscribed via source and target branches