Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/banshee/files: banshee-1.2.1-libmtp-0.3.0-API.patch banshee-1.2.1-notification-crash.patch
Date: Wed, 10 Sep 2008 13:51:51
Message-Id: E1KdQ6n-000643-0q@stork.gentoo.org
1 loki_val 08/09/10 13:51:49
2
3 Modified: banshee-1.2.1-libmtp-0.3.0-API.patch
4 Added: banshee-1.2.1-notification-crash.patch
5 Log:
6 Probably definitely fix bug #233869, thanks again to Salah Colonya. Also fix bug #236886 with fix from upstream.
7 (Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)
8
9 Revision Changes Path
10 1.2 media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch?r1=1.1&r2=1.2
15
16 Index: banshee-1.2.1-libmtp-0.3.0-API.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-sound/banshee/files/banshee-1.2.1-libmtp-0.3.0-API.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- banshee-1.2.1-libmtp-0.3.0-API.patch 3 Sep 2008 10:13:53 -0000 1.1
23 +++ banshee-1.2.1-libmtp-0.3.0-API.patch 10 Sep 2008 13:51:48 -0000 1.2
24 @@ -1,6 +1,6 @@
25 diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs
26 --- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs 2008-05-21 09:17:47.000000000 -0500
27 -+++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs 2008-09-03 00:57:00.000000000 -0500
28 ++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Album.cs 2008-09-09 22:30:48.000000000 -0500
29 @@ -131,7 +131,7 @@
30 if (saved) {
31 saved = LIBMTP_Update_Album (device.Handle, ref album) == 0;
32 @@ -10,21 +10,8 @@
33 }
34
35 if (album.tracks != IntPtr.Zero) {
36 -@@ -190,7 +190,7 @@
37 -
38 - public static Album GetById (MtpDevice device, uint id)
39 - {
40 -- IntPtr ptr = Album.LIBMTP_Get_Album (device.Handle, id);
41 -+ IntPtr ptr = Album.LIBMTP_Get_Album (device.Handle);
42 - if (ptr == IntPtr.Zero) {
43 - return null;
44 - } else {
45 -@@ -208,10 +208,10 @@
46 - internal static extern IntPtr LIBMTP_Get_Album_List (MtpDeviceHandle handle); // LIBMTP_album_t*
47 -
48 - [DllImport("libmtp.dll")]
49 -- internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t*
50 -+ internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle); // LIBMTP_album_t*
51 +@@ -211,7 +211,7 @@
52 + internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t*
53
54 [DllImport("libmtp.dll")]
55 - internal static extern int LIBMTP_Create_New_Album (MtpDeviceHandle handle, ref AlbumStruct album, uint parentId);
56 @@ -43,7 +30,7 @@
57 public string name;
58 diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs
59 --- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs 2008-04-07 22:59:11.000000000 -0500
60 -+++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs 2008-09-03 00:11:53.000000000 -0500
61 ++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Folder.cs 2008-09-09 22:30:48.000000000 -0500
62 @@ -210,6 +210,7 @@
63 {
64 public uint folder_id;
65 @@ -54,8 +41,20 @@
66 public IntPtr child; // LIBMTP_folder_t*
67 diff -u -r banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs
68 --- banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs 2008-04-23 14:20:58.000000000 -0500
69 -+++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs 2008-09-03 00:14:10.000000000 -0500
70 -@@ -195,7 +195,7 @@
71 ++++ banshee-1-1.2.1/src/Libraries/Mtp/Mtp/Track.cs 2008-09-09 22:44:13.000000000 -0500
72 +@@ -129,6 +129,11 @@
73 + set { trackStruct.usecount = value; }
74 + }
75 +
76 ++ public string Composer {
77 ++ get { return trackStruct.composer; }
78 ++ set { trackStruct.composer = value; }
79 ++ }
80 ++
81 + public Track (string filename, ulong filesize) : this (new TrackStruct (), null)
82 + {
83 + this.trackStruct.filename = filename;
84 +@@ -195,7 +200,7 @@
85
86 internal static void SendTrack (MtpDeviceHandle handle, string path, ref TrackStruct metadata, ProgressFunction callback, IntPtr data, uint parent)
87 {
88 @@ -64,7 +63,7 @@
89 {
90 LibMtpException.CheckErrorStack (handle);
91 throw new LibMtpException (ErrorCode.General, "Could not upload the track");
92 -@@ -227,7 +227,7 @@
93 +@@ -227,7 +232,7 @@
94 private static extern int LIBMTP_Get_Track_To_File (MtpDeviceHandle handle, uint trackId, string path, ProgressFunction callback, IntPtr data);
95
96 [DllImport("libmtp.dll")]
97 @@ -73,7 +72,7 @@
98
99 [DllImport("libmtp.dll")]
100 private static extern int LIBMTP_Update_Track_Metadata (MtpDeviceHandle handle, ref TrackStruct metadata);
101 -@@ -244,7 +244,8 @@
102 +@@ -244,9 +249,11 @@
103 {
104 public uint item_id;
105 public uint parent_id;
106 @@ -82,4 +81,7 @@
107 +
108 [MarshalAs(UnmanagedType.LPStr)] public string title;
109 [MarshalAs(UnmanagedType.LPStr)] public string artist;
110 ++ [MarshalAs(UnmanagedType.LPStr)] public string composer;
111 [MarshalAs(UnmanagedType.LPStr)] public string genre;
112 + [MarshalAs(UnmanagedType.LPStr)] public string album;
113 + [MarshalAs(UnmanagedType.LPStr)] public string date;
114
115
116
117 1.1 media-sound/banshee/files/banshee-1.2.1-notification-crash.patch
118
119 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch?rev=1.1&view=markup
120 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/banshee/files/banshee-1.2.1-notification-crash.patch?rev=1.1&content-type=text/plain
121
122 Index: banshee-1.2.1-notification-crash.patch
123 ===================================================================
124 Index: src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
125 ===================================================================
126 --- src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs (revision 4464)
127 +++ src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs (working copy)
128 @@ -276,10 +276,12 @@
129 {
130 if (rating_menu_item.Visible) {
131 TrackInfo track = ServiceManager.PlayerEngine.CurrentTrack;
132 - if (track is DatabaseTrackInfo) {
133 - (track as DatabaseTrackInfo).Refresh ();
134 + if (track != null) {
135 + if (track is DatabaseTrackInfo) {
136 + (track as DatabaseTrackInfo).Refresh ();
137 + }
138 + rating_menu_item.Reset (track.Rating);
139 }
140 - rating_menu_item.Reset (track.Rating);
141 }
142 menu.Popup (null, null, notif_area.PositionMenu, 3, Gtk.Global.CurrentEventTime);
143 }
Report Message
Find on MARC Find on Google Groups