← Back to branch summary

~ubuntu-branches/ubuntu/raring/banshee/raring

« back to all changes in this revision

Viewing changes to src/Libraries/Mtp/Mtp/Folder.cs

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2012-01-23 23:16:49 UTC
  • mfrom: (6.3.22 experimental)
  • Revision ID: package-import@ubuntu.com-20120123231649-safm1f8eycltcgsf
Tags: 2.3.4.ds-1ubuntu1
https://launchpad.net/bugs/766303
* Merge from Debian Experimental, remaining changes:
  + Enable and recommend SoundMenu and Disable NotificationArea by default
  + Disable boo and karma extensions
  + Enable and suggest u1ms
  + Move desktop file for Meego UI to /usr/share/une/applications
  + Change the url for the Amazon store redirector
  + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
* [b617fe0] Convert Ubuntu-specific patches to gbp-pq patches
* Also fixes Launchpad bugs:
  - Fixes race condition while starting (LP: #766303)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Libraries/Mtp/Mtp/Folder.cs
134
134
 
135
135
        internal static uint CreateFolder (MtpDeviceHandle handle, string name, uint parentId)
136
136
        {
137
 
#if LIBMTP8
138
137
            uint result = LIBMTP_Create_Folder (handle, name, parentId, 0);
139
 
#else
140
 
            uint result = LIBMTP_Create_Folder (handle, name, parentId);
141
 
#endif
142
138
            if (result == 0)
143
139
            {
144
140
                LibMtpException.CheckErrorStack(handle);
176
172
        [DllImport("libmtp.dll")]
177
173
        private static extern IntPtr LIBMTP_Find_Folder (IntPtr folderList, uint folderId); // LIBMTP_folder_t*
178
174
 
179
 
#if LIBMTP8
180
175
        [DllImport("libmtp.dll")]
181
176
        private static extern uint LIBMTP_Create_Folder (MtpDeviceHandle handle, string name, uint parentId, uint storageId);
182
 
#else
183
 
        [DllImport("libmtp.dll")]
184
 
        private static extern uint LIBMTP_Create_Folder (MtpDeviceHandle handle, string name, uint parentId);
185
 
#endif
186
177
    }
187
178
 
188
179
    [StructLayout(LayoutKind.Sequential)]
190
181
    {
191
182
        public uint folder_id;
192
183
        public uint parent_id;
193
 
#if LIBMTP8
194
184
        public uint storage_id;
195
 
#endif
 
185
 
196
186
        [MarshalAs(UnmanagedType.LPStr)] public string name;
197
187
        public IntPtr sibling; // LIBMTP_folder_t*
198
188
        public IntPtr child;   // LIBMTP_folder_t*