~dobey/ubuntu/natty/banshee/fix-and-amz

« back to all changes in this revision

Viewing changes to src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs

  • Committer: Bazaar Package Importer
  • Author(s): Chow Loong Jin
  • Date: 2011-01-24 22:17:31 UTC
  • mfrom: (6.3.14 experimental)
  • Revision ID: james.westby@ubuntu.com-20110124221731-qdqootsggfidrsjz
Tags: 1.9.2-1ubuntu1
* Merge from Debian Experimental, remaining changes:
  + Enable SoundMenu and Disable NotificationArea by default
  + Disable boo and karma extensions
  + Enable and recommnd u1ms and soundmenu extensions
  + Move desktop file for Meego UI to /usr/share/une/applications
* [0c8acd9] Enable u1ms by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
120
120
                        if (!relevant_fields.Contains (term.Field))
121
121
                            relevant_fields.Add (term.Field);
122
122
                    }
 
123
                } else {
 
124
                    condition_sql = null;
 
125
                    condition_xml = null;
123
126
                }
124
127
            }
125
128
        }
151
154
            get { return query_order; }
152
155
            set {
153
156
                query_order = value;
154
 
                if (value != null) {
 
157
                if (value != null && value.Field != null) {
155
158
                    Properties.Set<string> ("TrackListSortField", value.Field.Name);
156
159
                    Properties.Set<bool> ("TrackListSortAscending", value.Ascending);
157
160
                } else {