Déjà Dup

Merge lp:~vej/deja-dup/fixes_gschema_xml_in into lp:deja-dup/34

  1. fixes_gschema_xml_in
  2. Merge into 34
Proposed by Vej
Status: Merged
Merged at revision: 1570
Proposed branch: lp:~vej/deja-dup/fixes_gschema_xml_in
Merge into: lp:deja-dup/34
Diff against target: 18 lines (+2/-2)
1 file modified
data/org.gnome.DejaDup.gschema.xml.in (+2/-2)
To merge this branch: bzr merge lp:~vej/deja-dup/fixes_gschema_xml_in
Reviewer Review Type Date Requested Status
Michael Terry Approve
Review via email: mp+313394@code.launchpad.net

Description of the change

Fixes bug #1551945 by changing the description from $VIDEO to $VIDEOS to match with the supported keys inside of the method parse_keywords in DirHandling.vala.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

LGTM, thanks Vej!

review: Approve
lp:~vej/deja-dup/fixes_gschema_xml_in updated
1570. By Michael Terry

Fixes bug #1551945 by changing the description from $VIDEO to $VIDEOS to match with the supported keys inside of the method parse_keywords in DirHandling.vala.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/org.gnome.DejaDup.gschema.xml.in'
--- data/org.gnome.DejaDup.gschema.xml.in 2015-11-29 15:53:51 +0000
+++ data/org.gnome.DejaDup.gschema.xml.in 2016-12-15 19:29:42 +0000
@@ -4,12 +4,12 @@
4 <key name="include-list" type="as">4 <key name="include-list" type="as">
5 <default>[ '$HOME' ]</default>5 <default>[ '$HOME' ]</default>
6 <_summary>Folders to save</_summary>6 <_summary>Folders to save</_summary>
7 <_description>This list of directories will be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEO are recognized as the user’s special directories. Relative entries are relative to the user’s home directory.</_description>7 <_description>This list of directories will be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEOS are recognized as the user’s special directories. Relative entries are relative to the user’s home directory.</_description>
8 </key>8 </key>
9 <key name="exclude-list" type="as">9 <key name="exclude-list" type="as">
10 <default>[ '$TRASH', '$DOWNLOAD' ]</default>10 <default>[ '$TRASH', '$DOWNLOAD' ]</default>
11 <_summary>Folders to ignore</_summary>11 <_summary>Folders to ignore</_summary>
12 <_description>This list of directories will not be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEO are recognized as the user’s special directories. Relative entries are relative to the user’s home directory.</_description>12 <_description>This list of directories will not be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEOS are recognized as the user’s special directories. Relative entries are relative to the user’s home directory.</_description>
13 </key>13 </key>
14 <key name="root-prompt" type="b">14 <key name="root-prompt" type="b">
15 <default>true</default>15 <default>true</default>

Subscribers

People subscribed via source and target branches