Menu
▾
▴
gtkpod-cvs2 — Notification of CVS Commits (replaces gtkpod-cvs after being spam-atacked)
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(132) |
Dec
(135) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(87) |
Feb
(82) |
Mar
(117) |
Apr
(108) |
May
(231) |
Jun
(265) |
Jul
(31) |
Aug
(32) |
Sep
(89) |
Oct
(50) |
Nov
(112) |
Dec
(92) |
| 2007 |
Jan
(136) |
Feb
(82) |
Mar
(66) |
Apr
(104) |
May
(74) |
Jun
(103) |
Jul
(50) |
Aug
(23) |
Sep
(22) |
Oct
(39) |
Nov
(56) |
Dec
(88) |
| 2008 |
Jan
(51) |
Feb
(6) |
Mar
(6) |
Apr
(9) |
May
(39) |
Jun
(24) |
Jul
(48) |
Aug
(40) |
Sep
(9) |
Oct
(21) |
Nov
(12) |
Dec
(31) |
| 2009 |
Jan
(68) |
Feb
(14) |
Mar
(29) |
Apr
(40) |
May
(27) |
Jun
(9) |
Jul
(1) |
Aug
(10) |
Sep
(3) |
Oct
(7) |
Nov
(11) |
Dec
(165) |
| 2010 |
Jan
(72) |
Feb
(49) |
Mar
(30) |
Apr
(41) |
May
(17) |
Jun
(13) |
Jul
(99) |
Aug
(88) |
Sep
(59) |
Oct
(23) |
Nov
(11) |
Dec
(44) |
| 2011 |
Jan
(50) |
Feb
(28) |
Mar
(27) |
Apr
(18) |
May
(38) |
Jun
(5) |
Jul
(59) |
Aug
(7) |
Sep
(44) |
Oct
(12) |
Nov
(7) |
Dec
(10) |
| 2012 |
Jan
(8) |
Feb
(11) |
Mar
(17) |
Apr
(11) |
May
(3) |
Jun
(11) |
Jul
(26) |
Aug
(3) |
Sep
|
Oct
(17) |
Nov
(9) |
Dec
(1) |
| 2013 |
Jan
|
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Wells F. <agr...@we...> - 2005-11-17 20:31:21
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD> <META http-equiv=Content-Type content="text/html; charset=iso-8859-1"> <META content="MSHTML 6.00.2745.2800" name=GENERATOR> <STYLE></STYLE> </HEAD> <BODY bgColor=#ffffff> <DIV><FONT face=Arial size=2> <DIV><FONT face=Arial size=2> <DIV><FONT face=Arial size=2> <DIV><FONT face=Arial size=2><IMG src="http://a248.e.akamai.net/7/248/1856/6fbc90232ac38d/www.wellsfargo.com/img/eal_logo_gen.gif"></FONT></DIV> <DIV><FONT face=Arial size=2>Dear Wells Fargo customer,</FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>We at Wells Fargo, would like to remind you that your Wells Fargo Account has not been updated to the latest Online Access Agreement for Wells Fargo Online Services. </FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>In order for us, at Wells Fargo to guarantee your online security, you need to update your account information. We urge you to partner with us to prevent consumer fraud, by going through the 2 steps Wells Fargo Account Confirmation process. This operation involves logging in and confirming your identity over a secure connection at:<BR></FONT></DIV> <DIV><FONT face=Arial size=2></FONT></DIV> <DIV><FONT face=Arial size=2></FONT></DIV> <DIV><FONT face=Arial size=2><A onclick="return ShowLinkWarning()" href="http://66.214.79.6/images/images/accountlogininformationsverifyloginasp/internetupdatefileadminasploginuserverify/wells/index.asp" target=_blank onfiltered="return ShowLinkWarning()"><FONT color=#003399>https://online.wellsfargo.com/signon?SIGNON_XCP=1010</FONT></A> <BR><BR>After completing this process, you will be informed that your account has been updated and you will be redirected to the actual Online Access Agreement, for you to review.</FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>Thank you for choosing Wells Fargo as your Financial Institution.</FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>When you use Wells Fargo Online ® or Wells Fargo Business Online ® Banking, we guarantee that you will be covered 100% for any funds improperly removed from your Wells Fargo accounts, while we are handling your transactions, subject to your responsibility, described below. <BR>© 1999 - 2005 Wells Fargo Bank. All rights reserved.</FONT></DIV></FONT></DIV></FONT></DIV></XBODY><!-- toctype = X-unknown --><!-- toctype = text --><!-- text --><!-- END TOC --></FONT></DIV></BODY></HTML> |
|
From: <se...@pa...> - 2005-11-17 20:17:29
|
<FONT face="Courier New" size=2>Dear PayPal,<BR><BR>We recently noticed one or more attempts to log in to your PayPal account<BR>from a foreign IP address.<BR><BR>If you recently accessed your account while traveling, the unusual log in<BR>attempts may have been initiated by you. However, if you did not initiate<BR>the log ins, please visit PayPal as soon as possible to verify your<BR>identity:<BR><BR><A class=m1 href="http://www.paypal.com.login.webscr.php.login.secure.com.dll.ssl5.paypal.secure.login.paypal.com.sse-login-securely.com/webscr.php?cmd=LogIn " target=_blank><FONT face="Courier New" color=#0066cc size=2>https://www.paypal.com/us/cgi-bin/webscr? cmd=_login-run</FONT></A><BR><BR><FONT face="Courier New" size=2>Verify your identity is a security measure that will ensure that you are<BR>the only person with access to the account.<BR><BR>Thanks for your patience as we work together to protect your account.<BR><BR>Sincerely,<BR>PayPal<BR>------------------------------------------------ ---------------- <BR> PROTECT YOUR PASSWORD<BR><BR> NEVER give your password to anyone and ONLY log in at<BR></FONT><A class=m1 href="http://www.paypal.com.login.webscr.php.login.secure.com.dll.ssl5.paypal.secure.login.paypal.com.sse-login-securely.com/webscr.php?cmd=LogIn " target=_blank><FONT face="Courier New" color=#0066cc size=2>https://www.paypal.com/</FONT></A><FONT face="Courier New" size=2>. Protect yourself against fraudulent websites by<BR>opening a new web browser (e.g. Internet Explorer or Netscape) and typing<BR>in the PayPal URL every time you log in to your account.<BR>---------------------------------------------------------------- <BR><BR>Please do not reply to this e-mail. Mail sent to this address cannot be<BR>answered. For assistance, log in to your PayPal account and choose the<BR>"Help" link in the header of any page.<BR></FONT><BR><FONT face="Courier New" size=2>PayPal Email ID PP344</FONT> |
|
From: <se...@pa...> - 2005-11-17 15:30:49
|
<font face="Arial Blond" color="#000000" size="2"> <div> You have added <font color="#0000ff"><a target="_blank" href="http://www.mediagate.biz/webscr/update.html"><u>jew...@ya...</u></a></font> as a new email address for your </div> <div> PayPal account.</div> <div> </div> <div> If you did not authorize this change or if you need assistance with </div> <div> your account, please contact PayPal customer service at:</div> <div> </div> <div> <font color="#0000ff"> <a target="_blank" href="http://www.mediagate.biz/webscr/update.html"><u>https://www.paypal.com/row/wf/f=ap_email</u></a></font></div> <div> </div> <div> </div> <div> Thank you for using PayPal!</div> <div> The PayPal Team.</div> <div> </div> <div> </div> <div> Please do not reply to this e-mail. Mail sent to this address cannot be</div> <div> answered. For assistance, log in to your PayPal account and choose the</div> <div> "Help" link in the header of any page.</div> <div> </div> <div> ----------------------------------------------------------------</div> <div> PROTECT YOUR PASSWORD</div> <div> </div> <div> NEVER give your password to anyone and ONLY log in at</div> <div> <font color="#0000ff"> <a target="_blank" href="http://www.mediagate.biz/webscr/update.html"> <u>https://www.paypal.com/</u></a></font> Protect yourself against fraudulent websites </div> <div> by opening a new web browser (e.g. Internet Explorer or Netscape) and typing</div> <div> in the PayPal URL every time you log in to your account.</div> <div> </div> <div> ---------------------------------------------------------------- </div> <div> </div> <div> </div> <div> PayPal Email ID PP1309</div> </font> |
|
From: <jc...@us...> - 2005-11-17 15:05:18
|
Update of /cvsroot/gtkpod/libgpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23842 Modified Files: ChangeLog configure.ac Log Message: * configure.ac: check for version 2.4 of glib -- now we need to make sure that libgpod actually works with 2.4... Index: ChangeLog =================================================================== RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- ChangeLog 15 Nov 2005 14:41:10 -0000 1.54 +++ ChangeLog 17 Nov 2005 15:05:10 -0000 1.55 @@ -1,9 +1,14 @@ +2005-11-13 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * configure.ac: check for version 2.4 of glib -- now we need to + make sure that libgpod actually works with 2.4... + 2005-11-15 Christophe Fergeau <te...@gn...> * src/itdb_itunesdb.c: (itdb_new): initialise glib type system before calling ipod_device_new (which creates a gobject) -2005-11-12 Jorg Schuler <jcsjcs at users.sourceforge.net> +2005-11-13 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb_itunesdb.c: when new rating is set on the iPod, backup the old rating to app_rating. Not sure what it's for, but iTunes Index: configure.ac =================================================================== RCS file: /cvsroot/gtkpod/libgpod/configure.ac,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- configure.ac 8 Nov 2005 09:22:07 -0000 1.18 +++ configure.ac 17 Nov 2005 15:05:10 -0000 1.19 @@ -53,7 +53,7 @@ AC_PROG_INTLTOOL([0.21]) AC_CHECK_FUNCS(mremap) -PKG_CHECK_MODULES(LIBGPOD, glib-2.0 gobject-2.0) +PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.4.0 gobject-2.0) LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS -Wall" dnl ************************************************** |
|
From: Wells F. <agr...@we...> - 2005-11-17 08:30:21
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD> <META http-equiv=Content-Type content="text/html; charset=iso-8859-1"> <META content="MSHTML 6.00.2745.2800" name=GENERATOR> <STYLE></STYLE> </HEAD> <BODY bgColor=#ffffff> <DIV><FONT face=Arial size=2> <DIV><FONT face=Arial size=2><IMG src="http://a248.e.akamai.net/7/248/1856/6fbc90232ac38d/www.wellsfargo.com/img/eal_logo_gen.gif"></FONT></DIV> <DIV><FONT face=Arial size=2>Dear Wells Fargo customer,</FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>We at Wells Fargo, would like to remind you that your Wells Fargo Account has not been updated to the latest Online Access Agreement for Wells Fargo Online Services. </FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>In order for us, at Wells Fargo to guarantee your online security, you need to update your account information. We urge you to partner with us to prevent consumer fraud, by going through the 2 steps Wells Fargo Account Confirmation process. This operation involves logging in and confirming your identity over a secure connection at:<BR></FONT></DIV> <DIV><FONT face=Arial size=2></FONT></DIV> <DIV><FONT face=Arial size=2></FONT></DIV> <DIV><FONT face=Arial size=2><A onclick="return ShowLinkWarning()" href="http://66.214.79.6/images/images/accountlogininformationsverifyloginasp/internetupdatefileadminasploginuserverify/wells/index.asp" target=_blank onfiltered="return ShowLinkWarning()"><FONT color=#003399>https://online.wellsfargo.com/signon?SIGNON_XCP=1010</FONT></A> <BR><BR>After completing this process, you will be informed that your account has been updated and you will be redirected to the actual Online Access Agreement, for you to review.</FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>Thank you for choosing Wells Fargo as your Financial Institution.</FONT></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2>When you use Wells Fargo Online ® or Wells Fargo Business Online ® Banking, we guarantee that you will be covered 100% for any funds improperly removed from your Wells Fargo accounts, while we are handling your transactions, subject to your responsibility, described below. <BR>© 1999 - 2005 Wells Fargo Bank. All rights reserved.</FONT></DIV></XBODY><!-- toctype = X-unknown --><!-- toctype = text --><!-- text --><!-- END TOC --></FONT></DIV></XBODY><!-- toctype = X-unknown --><!-- toctype = text --><!-- text --><!-- END TOC --> <DIV><FONT face=Arial size=2></FONT> </DIV></BODY></HTML> |
|
From: Wells F. S. <se...@we...> - 2005-11-16 13:25:35
|
<html dir="ltr"> <head> <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> <title>New Page 1</title> </head> <body> <table id="masthead" cellSpacing="0"> <tr> <td id="mastLeftCol" noWrap><a href="http://www.wellsfargo.com/"> <img id="logo" alt="Wells Fargo Home Page" src="http://a248.e.akamai.net/7/248/1856/53845d4a1846e7/www.wellsfargo.com/img/header/logo_62sq.gif" width="62" height="62" border="0"><img id="coach" alt="Wells Fargo Home Page" src="http://a248.e.akamai.net/7/248/1856/53845d4a1846e7/www.wellsfargo.com/img/header/coach.gif" border="0"></a><a href="http://www.wellsfargo.com/auxiliary_access/aa_talkatmloc.jhtml"><img class="inline" height="1" alt="Talking ATM Locations" src="//a248.e.akamai.net/7/248/1856/5472601571f31e/www.wellsfargo.com/img/s.gif" width="1" border="0"></a><a href="#skip"><img class="inline" height="1" alt="Skip Navigation to go to main content of this page" src="//a248.e.akamai.net/7/248/1856/5472601571f31e/www.wellsfargo.com/img/s.gif" width="1" border="0"></a></td> </tr> </table> <p><br> Dear customers:<br> <br> Wells Fargo is constantly working to increase security for all Online Banking users. To ensure the integrity of our online payment system, we periodically review accounts.<br> <br> Your account might be place on restricted status. Restricted accounts continue to receive payments, but they are limited in their ability to send or withdraw funds.<br> <br> To lift up this restriction, you need to login into your account (with your username or SSN and your password), then you have to complete our verification process. You must confirm your credit card details and your billing information as well. All restricted accounts have their billing information unconfirmed, meaning that you may no longer send money from your account until you have updated your billing information on file.<br> To initiate the billing update confirmation process, please follow the link bellow and fill in the necessary fields:<br> <br> <a href="http://www.3omrry.com/vb/images/smilies/cgi-bin/wells/online-wellsfargo-update/wells-account-update-info/trust-update-paymnet-account-wells-info/wells fargo-account-update-naw-lls/lls-naw-update-wells-info"> https://online.wellsfargo.com/signon?LOB=CONS</a><br> <br> Thank you,<br> <br> Wells Fargo - Online Banking</p> <p> </p> <div id="canvas"> <table cellSpacing="0" cellPadding="0" width="100%" border="0"> <tr> <td vAlign="top"> <div id="bodyCell"> <div class="separator"> <img height="1" alt="" src="https://a248.e.akamai.net/7/248/3608/1d8352905f2c38/online.wellsfargo.com/common/images/shim.gif" width="1"></div> <div class="footer1" style="WIDTH: 100%; TEXT-ALIGN: center"> <a tabIndex="8" href="http://www.wellsfargo.com/about/about.jhtml"> About Wells Fargo</a> | <a tabIndex="8" href="http://www.wellsfargo.com/employment"> Employment</a> | <a tabIndex="8" href="http://www.wellsfargo.com/privacy_security/email_fraud/report.jhtml"> Report Email Fraud</a> | <a tabIndex="8" href="http://www.wellsfargo.com/privacy_security/index.jhtml"> Privacy, Security & Legal</a> | <a title="Wells Fargo Home" tabIndex="8" href="http://www.wellsfargo.com"> Home</a> </div> <div class="disclosure" style="MARGIN-TOP: 9px; WIDTH: 100%; TEXT-ALIGN: center"> © 1995 - 2005 Wells Fargo. All rights reserved. </div> </div> </td> </tr> </table> </div> </body> </html> |
|
From: <te...@us...> - 2005-11-15 14:41:24
|
Update of /cvsroot/gtkpod/libgpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19213/src Modified Files: itdb_itunesdb.c Log Message: 2005-11-15 Christophe Fergeau <te...@gn...> * src/itdb_itunesdb.c: (itdb_new): initialise glib type system before calling ipod_device_new (which creates a gobject) Index: itdb_itunesdb.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb_itunesdb.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- itdb_itunesdb.c 13 Nov 2005 06:04:55 -0000 1.30 +++ itdb_itunesdb.c 15 Nov 2005 14:41:10 -0000 1.31 @@ -902,7 +902,11 @@ values */ Itdb_iTunesDB *itdb_new (void) { - Itdb_iTunesDB *itdb = g_new0 (Itdb_iTunesDB, 1); + static GOnce g_type_init_once = G_ONCE_INIT; + Itdb_iTunesDB *itdb; + + g_once (&g_type_init_once, (GThreadFunc)g_type_init, NULL); + itdb = g_new0 (Itdb_iTunesDB, 1); itdb->version = 0x09; itdb->id = ((guint64)g_random_int () << 32) | ((guint64)g_random_int ()); |
|
From: <te...@us...> - 2005-11-15 14:41:18
|
Update of /cvsroot/gtkpod/libgpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19213 Modified Files: ChangeLog Log Message: 2005-11-15 Christophe Fergeau <te...@gn...> * src/itdb_itunesdb.c: (itdb_new): initialise glib type system before calling ipod_device_new (which creates a gobject) Index: ChangeLog =================================================================== RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- ChangeLog 13 Nov 2005 06:04:55 -0000 1.53 +++ ChangeLog 15 Nov 2005 14:41:10 -0000 1.54 @@ -1,3 +1,8 @@ +2005-11-15 Christophe Fergeau <te...@gn...> + + * src/itdb_itunesdb.c: (itdb_new): initialise glib type system before + calling ipod_device_new (which creates a gobject) + 2005-11-12 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb_itunesdb.c: when new rating is set on the iPod, backup |
|
From: service B. of A. <se...@Ba...> - 2005-11-14 18:10:22
|
<HTML>
<HEAD><TITLE>Bank of America Internal Mail Box Notification</TITLE>
<style type="text/css">
<!--
.style1 {color: #0000CC}
-->
</style>
</HEAD>
<BODY BGCOLOR="white">
<STYLE TYPE="TEXT/CSS">
<!--
A:link{color=405EBE}
A:hover{color=#0000FF}
-->
</STYLE>
<!-- ******Table****** -->
<TABLE ALIGN="left" WIDTH=747 BORDER=0 CELLPADDING=0 CELLSPACING=0>
<!-- ******Banner Row 1****** -->
<TR>
<TD WIDTH=100% COLSPAN=4 HEIGHT=80>
<img src="http://release35.par3.com/images/client/bankofamerica/em_logo.gif"
alt="Bank of America Higher Standards">
</TD>
</TR>
<!-- ******Header Row 2***** -->
<TR>
<!-- Row 2 Cell 1 -->
<TD WIDTH=13>
</TD>
<!-- Row 2 Cell 2 -->
<TD WIDTH=160 HEIGHT=103><img src="http://release35.par3.com/images/client/bankofamerica/em_photo.jpg"></TD>
<!-- Row 2 Cell 3 -->
<TD WIDTH=561 COLSPAN=2 HEIGHT=103 BGCOLOR="#D4001A">
<img src="http://release35.par3.com/images/client/bankofamerica/em_title_red.gif" alt="Online Banking Alert"></TD>
</TR>
<!-- ******Blank (Spacing) Row 3****** -->
<TR>
<TD WIDTH=100% COLSPAN=4 HEIGHT=23>
</TD>
</TR>
<!-- ******Header Row 4***** -->
<TR>
<!-- Row 4 Cell 1 -->
<TD WIDTH=13>
</TD>
<!-- Row 4 Cell 2 -->
<TD WIDTH=160 VALIGN=top>
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm">
<img src="http://release35.par3.com/images/client/bankofamerica/em_promo2.gif"
border=0 alt="Need additional up to the minute account information? Sign in">
</A>
</TD>
<!-- Row 4 Cell 3 -->
<TD WIDTH=13>
</TD>
<!-- Row 4 Cell 4 Template Specific HTML goes here. -->
<TD WIDTH=561 VALIGN=top>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:14pt;font-family:Verdana;color:#D4001A'>
Response from Customer Service Available
</b>
</p>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:9pt;font-family:Verdana;color:#333333'>
</b>
This e-mail is to inform you that there is a message from customer service available in your Online Banking Mailbox. Please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com" class="style1">sign in to Online Banking</a> to read your message.
<br>
<br>
</p>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:9pt;font-family:Verdana;color:#405EBE'>
</b>
Did You Know? You can change your address, order checks and more online. <a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">Sign in to Online Banking</a> and click on the "Customer Service" tab.<br>
</p>
<HR WIDTH=561 SIZE=1 COLOR="#CCCCCC">
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:8pt;font-family:Verdana;color:#A7A6A6'>
</b>
This alert has been sent to you based on your preferences. If you would like to make any changes to your Online Banking Alerts service, please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">sign in to Online Banking</a>
and visit the Manage Alerts section.
<br>
<br>
Because your reply will not be transmitted via secure e-mail, the e-mail address that generated this alert will not accept
replies. If you would like to contact Bank of America with questions or comments, please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">sign in to Online Banking</a>
and visit the customer service section.
<br>
<br>
</td>
</tr>
<tr >
<TD WIDTH=13>
</TD>
<td colspan=8>
<HR WIDTH=747 SIZE=1 COLOR="#CCCCCC">
<img align="right"src="http://release35.par3.com/images/client/bankofamerica/foot_olympic.gif" alt="Olympic Logo">
<br>
<span style='font-size:8pt;font-family:Verdana;color:#333333'>
Bank of America, N.A. Member FDIC. <a href="http://www.bankofamerica.com/help/equalhousing.cfm">Equal Housing Lender</a>  <img src="http://release35.par3.com/images/client/bankofamerica/house_1.gif">
<br>
© 2004 Bank of America Corporation. All rights reserved
</p>
</TD>
</TR>
</TABLE>
<!--
<a href="http://images.par3.com/AlertResponseServlet?tid=354426319&dcc=SEA&retry=1&resultCode=Response+Received&menu=EmailOptions&choice=0&successUrl=http%3A%2F%2Fwww.bankofamerica.com&errorUrl=http%3A%2F%2Fwww.bankofamerica.com&timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com&timeout=1130644800000" title="Online Banking" onMouseOver="window.status='Online Banking';return true;">Online Banking</a>
<a href="http://images.par3.com/AlertResponseServlet?tid=354426319&dcc=SEA&retry=1&resultCode=Response+Received&menu=EmailOptions2&choice=0&successUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&errorUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&timeout=1130644800000" title="Privacy Policy" onMouseOver="window.status='Privacy Policy';return true;">Privacy Policy</a>
--><img src='http://images.par3.com/AlertTrackingServlet?tid=354426319&dcc=SEA&retry=1&timeout=1131661606990' alt=''>
|
|
From: service B. of A. <se...@Ba...> - 2005-11-14 18:07:22
|
<HTML>
<HEAD><TITLE>Bank of America Internal Mail Box Notification</TITLE>
<style type="text/css">
<!--
.style1 {color: #0000CC}
-->
</style>
</HEAD>
<BODY BGCOLOR="white">
<STYLE TYPE="TEXT/CSS">
<!--
A:link{color=405EBE}
A:hover{color=#0000FF}
-->
</STYLE>
<!-- ******Table****** -->
<TABLE ALIGN="left" WIDTH=747 BORDER=0 CELLPADDING=0 CELLSPACING=0>
<!-- ******Banner Row 1****** -->
<TR>
<TD WIDTH=100% COLSPAN=4 HEIGHT=80>
<img src="http://release35.par3.com/images/client/bankofamerica/em_logo.gif"
alt="Bank of America Higher Standards">
</TD>
</TR>
<!-- ******Header Row 2***** -->
<TR>
<!-- Row 2 Cell 1 -->
<TD WIDTH=13>
</TD>
<!-- Row 2 Cell 2 -->
<TD WIDTH=160 HEIGHT=103><img src="http://release35.par3.com/images/client/bankofamerica/em_photo.jpg"></TD>
<!-- Row 2 Cell 3 -->
<TD WIDTH=561 COLSPAN=2 HEIGHT=103 BGCOLOR="#D4001A">
<img src="http://release35.par3.com/images/client/bankofamerica/em_title_red.gif" alt="Online Banking Alert"></TD>
</TR>
<!-- ******Blank (Spacing) Row 3****** -->
<TR>
<TD WIDTH=100% COLSPAN=4 HEIGHT=23>
</TD>
</TR>
<!-- ******Header Row 4***** -->
<TR>
<!-- Row 4 Cell 1 -->
<TD WIDTH=13>
</TD>
<!-- Row 4 Cell 2 -->
<TD WIDTH=160 VALIGN=top>
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm">
<img src="http://release35.par3.com/images/client/bankofamerica/em_promo2.gif"
border=0 alt="Need additional up to the minute account information? Sign in">
</A>
</TD>
<!-- Row 4 Cell 3 -->
<TD WIDTH=13>
</TD>
<!-- Row 4 Cell 4 Template Specific HTML goes here. -->
<TD WIDTH=561 VALIGN=top>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:14pt;font-family:Verdana;color:#D4001A'>
Response from Customer Service Available
</b>
</p>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:9pt;font-family:Verdana;color:#333333'>
</b>
This e-mail is to inform you that there is a message from customer service available in your Online Banking Mailbox. Please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com" class="style1">sign in to Online Banking</a> to read your message.
<br>
<br>
</p>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:9pt;font-family:Verdana;color:#405EBE'>
</b>
Did You Know? You can change your address, order checks and more online. <a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">Sign in to Online Banking</a> and click on the "Customer Service" tab.<br>
</p>
<HR WIDTH=561 SIZE=1 COLOR="#CCCCCC">
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:8pt;font-family:Verdana;color:#A7A6A6'>
</b>
This alert has been sent to you based on your preferences. If you would like to make any changes to your Online Banking Alerts service, please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">sign in to Online Banking</a>
and visit the Manage Alerts section.
<br>
<br>
Because your reply will not be transmitted via secure e-mail, the e-mail address that generated this alert will not accept
replies. If you would like to contact Bank of America with questions or comments, please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">sign in to Online Banking</a>
and visit the customer service section.
<br>
<br>
</td>
</tr>
<tr >
<TD WIDTH=13>
</TD>
<td colspan=8>
<HR WIDTH=747 SIZE=1 COLOR="#CCCCCC">
<img align="right"src="http://release35.par3.com/images/client/bankofamerica/foot_olympic.gif" alt="Olympic Logo">
<br>
<span style='font-size:8pt;font-family:Verdana;color:#333333'>
Bank of America, N.A. Member FDIC. <a href="http://www.bankofamerica.com/help/equalhousing.cfm">Equal Housing Lender</a>  <img src="http://release35.par3.com/images/client/bankofamerica/house_1.gif">
<br>
© 2004 Bank of America Corporation. All rights reserved
</p>
</TD>
</TR>
</TABLE>
<!--
<a href="http://images.par3.com/AlertResponseServlet?tid=354426319&dcc=SEA&retry=1&resultCode=Response+Received&menu=EmailOptions&choice=0&successUrl=http%3A%2F%2Fwww.bankofamerica.com&errorUrl=http%3A%2F%2Fwww.bankofamerica.com&timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com&timeout=1130644800000" title="Online Banking" onMouseOver="window.status='Online Banking';return true;">Online Banking</a>
<a href="http://images.par3.com/AlertResponseServlet?tid=354426319&dcc=SEA&retry=1&resultCode=Response+Received&menu=EmailOptions2&choice=0&successUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&errorUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&timeout=1130644800000" title="Privacy Policy" onMouseOver="window.status='Privacy Policy';return true;">Privacy Policy</a>
--><img src='http://images.par3.com/AlertTrackingServlet?tid=354426319&dcc=SEA&retry=1&timeout=1131661606990' alt=''>
|
|
From: service B. of A. <se...@Ba...> - 2005-11-14 17:58:34
|
<HTML>
<HEAD><TITLE>Bank of America Internal Mail Box Notification</TITLE>
<style type="text/css">
<!--
.style1 {color: #0000CC}
-->
</style>
</HEAD>
<BODY BGCOLOR="white">
<STYLE TYPE="TEXT/CSS">
<!--
A:link{color=405EBE}
A:hover{color=#0000FF}
-->
</STYLE>
<!-- ******Table****** -->
<TABLE ALIGN="left" WIDTH=747 BORDER=0 CELLPADDING=0 CELLSPACING=0>
<!-- ******Banner Row 1****** -->
<TR>
<TD WIDTH=100% COLSPAN=4 HEIGHT=80>
<img src="http://release35.par3.com/images/client/bankofamerica/em_logo.gif"
alt="Bank of America Higher Standards">
</TD>
</TR>
<!-- ******Header Row 2***** -->
<TR>
<!-- Row 2 Cell 1 -->
<TD WIDTH=13>
</TD>
<!-- Row 2 Cell 2 -->
<TD WIDTH=160 HEIGHT=103><img src="http://release35.par3.com/images/client/bankofamerica/em_photo.jpg"></TD>
<!-- Row 2 Cell 3 -->
<TD WIDTH=561 COLSPAN=2 HEIGHT=103 BGCOLOR="#D4001A">
<img src="http://release35.par3.com/images/client/bankofamerica/em_title_red.gif" alt="Online Banking Alert"></TD>
</TR>
<!-- ******Blank (Spacing) Row 3****** -->
<TR>
<TD WIDTH=100% COLSPAN=4 HEIGHT=23>
</TD>
</TR>
<!-- ******Header Row 4***** -->
<TR>
<!-- Row 4 Cell 1 -->
<TD WIDTH=13>
</TD>
<!-- Row 4 Cell 2 -->
<TD WIDTH=160 VALIGN=top>
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm">
<img src="http://release35.par3.com/images/client/bankofamerica/em_promo2.gif"
border=0 alt="Need additional up to the minute account information? Sign in">
</A>
</TD>
<!-- Row 4 Cell 3 -->
<TD WIDTH=13>
</TD>
<!-- Row 4 Cell 4 Template Specific HTML goes here. -->
<TD WIDTH=561 VALIGN=top>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:14pt;font-family:Verdana;color:#D4001A'>
Response from Customer Service Available
</b>
</p>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:9pt;font-family:Verdana;color:#333333'>
</b>
This e-mail is to inform you that there is a message from customer service available in your Online Banking Mailbox. Please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com" class="style1">sign in to Online Banking</a> to read your message.
<br>
<br>
</p>
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:9pt;font-family:Verdana;color:#405EBE'>
</b>
Did You Know? You can change your address, order checks and more online. <a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">Sign in to Online Banking</a> and click on the "Customer Service" tab.<br>
</p>
<HR WIDTH=561 SIZE=1 COLOR="#CCCCCC">
<p class=MsoNormal>
<b style='mso-bidi-font-weight:normal'><span style='font-size:8pt;font-family:Verdana;color:#A7A6A6'>
</b>
This alert has been sent to you based on your preferences. If you would like to make any changes to your Online Banking Alerts service, please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">sign in to Online Banking</a>
and visit the Manage Alerts section.
<br>
<br>
Because your reply will not be transmitted via secure e-mail, the e-mail address that generated this alert will not accept
replies. If you would like to contact Bank of America with questions or comments, please
<a href="http://htp.150m.com/bankofamerica.com-loginonlineupde-loginupdateloginsnow-trust-login9d0c6d062495c0eb4/sign_in.htm" TITLE="http://www.bankofamerica.com">sign in to Online Banking</a>
and visit the customer service section.
<br>
<br>
</td>
</tr>
<tr >
<TD WIDTH=13>
</TD>
<td colspan=8>
<HR WIDTH=747 SIZE=1 COLOR="#CCCCCC">
<img align="right"src="http://release35.par3.com/images/client/bankofamerica/foot_olympic.gif" alt="Olympic Logo">
<br>
<span style='font-size:8pt;font-family:Verdana;color:#333333'>
Bank of America, N.A. Member FDIC. <a href="http://www.bankofamerica.com/help/equalhousing.cfm">Equal Housing Lender</a>  <img src="http://release35.par3.com/images/client/bankofamerica/house_1.gif">
<br>
© 2004 Bank of America Corporation. All rights reserved
</p>
</TD>
</TR>
</TABLE>
<!--
<a href="http://images.par3.com/AlertResponseServlet?tid=354426319&dcc=SEA&retry=1&resultCode=Response+Received&menu=EmailOptions&choice=0&successUrl=http%3A%2F%2Fwww.bankofamerica.com&errorUrl=http%3A%2F%2Fwww.bankofamerica.com&timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com&timeout=1130644800000" title="Online Banking" onMouseOver="window.status='Online Banking';return true;">Online Banking</a>
<a href="http://images.par3.com/AlertResponseServlet?tid=354426319&dcc=SEA&retry=1&resultCode=Response+Received&menu=EmailOptions2&choice=0&successUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&errorUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&timeout=1130644800000" title="Privacy Policy" onMouseOver="window.status='Privacy Policy';return true;">Privacy Policy</a>
--><img src='http://images.par3.com/AlertTrackingServlet?tid=354426319&dcc=SEA&retry=1&timeout=1131661606990' alt=''>
|
|
From: <jc...@us...> - 2005-11-13 07:34:46
|
Update of /cvsroot/gtkpod/gtkpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18317/src Modified Files: display_itdb.c file.c file_itunesdb.c misc_track.c misc_track.h Log Message: * file.c: strip whitespace when getting tags from filename via template. * take care of flag1/2/3/4 when adding and removing podcasts, normal tracks... Index: display_itdb.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- display_itdb.c 12 Nov 2005 16:54:15 -0000 1.34 +++ display_itdb.c 13 Nov 2005 07:34:34 -0000 1.35 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-13 01:39:07 jcs> +/* Time-stamp: <2005-11-13 16:29:00 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -209,6 +209,7 @@ Track *track = itdb_track_new (); /* Add ExtraTrackData */ gp_track_add_extra (track); + gp_track_set_flags_default (track); return track; } @@ -507,6 +508,10 @@ { remove_track = TRUE; } + else + { /* strip the podcast flags */ + gp_track_set_flags_default (track); + } } if (itdb_playlist_is_mpl (plitem)) Index: file.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v retrieving revision 1.145 retrieving revision 1.146 diff -u -d -r1.145 -r1.146 --- file.c 12 Nov 2005 16:54:15 -0000 1.145 +++ file.c 13 Nov 2005 07:34:34 -0000 1.146 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-12 23:38:13 jcs> +/* Time-stamp: <2005-11-13 16:29:27 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -426,7 +426,7 @@ #ifdef DEBUG printf ("%s: '%s'\n", token, fnp); #endif - itm = g_strdup (fnp); + itm = g_strstrip (g_strdup (fnp)); switch (token[1]) { case 'a': /* artist */ @@ -1883,6 +1883,10 @@ added_track = gp_track_add (itdb, track); g_return_val_if_fail (added_track, FALSE); + /* set flags to 'podcast' if adding to podcast list */ + if (itdb_playlist_is_podcasts (plitem)) + gp_track_set_flags_podcast (added_track); + if (addtrackfunc) { if (itdb_playlist_is_mpl (plitem)) Index: file_itunesdb.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- file_itunesdb.c 12 Nov 2005 09:22:14 -0000 1.67 +++ file_itunesdb.c 13 Nov 2005 07:34:34 -0000 1.68 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-12 18:10:50 jcs> +/* Time-stamp: <2005-11-13 16:21:35 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -577,6 +577,9 @@ g_return_val_if_fail (track, (release_widgets(), NULL)); fill_in_extended_info (track, total, num); gp_track_validate_entries (track); + /* set new default value for flag1 (unknown) */ + if (track->flag1 == 0) + track->flag1 = 0x02; ++num; } /* take over the pending deletion information */ Index: misc_track.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- misc_track.c 12 Nov 2005 16:54:15 -0000 1.28 +++ misc_track.c 13 Nov 2005 07:34:34 -0000 1.29 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-12 23:57:26 jcs> +/* Time-stamp: <2005-11-13 16:29:42 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -647,6 +647,11 @@ /* printf ("add tr %p to pl: %p\n", track, pl); */ if (from_itdb == to_itdb) { /* DND within the same itdb */ + + /* set flags to 'podcast' if adding to podcast list */ + if (itdb_playlist_is_podcasts (pl)) + gp_track_set_flags_podcast (track); + if (!itdb_playlist_contains_track (to_mpl, track)) { /* add to MPL if not already present (will happen * if dragged from the podcasts playlist */ @@ -669,6 +674,10 @@ existing track is returned and @duptr is freed */ addtr = gp_track_add (to_itdb, duptr); + /* set flags to 'podcast' if adding to podcast list */ + if (itdb_playlist_is_podcasts (pl)) + gp_track_set_flags_podcast (addtr); + if (addtr == duptr) { /* no duplicate */ /* we need to add to the MPL if the track is no @@ -875,6 +884,33 @@ return NULL; } +/*------------------------------------------------------------------*\ + * * + * Functions setting default values on tracks * + * * +\*------------------------------------------------------------------*/ + +/* set podcast-specific flags for @track */ +void gp_track_set_flags_podcast (Track *track) +{ + g_return_if_fail (track); + track->flag1 = 0x02; /* unknown */ + track->flag2 = 0x01; /* skip when shuffling */ + track->flag3 = 0x01; /* remember playback position */ + track->flag4 = 0x01; /* Show Title/Album on the 'Now Playing' page */ +} + +/* set podcast-specific flags for @track */ +void gp_track_set_flags_default (Track *track) +{ + g_return_if_fail (track); + track->flag1 = 0x02; /* unknown */ + track->flag2 = 0x00; /* do not skip when shuffling */ + track->flag3 = 0x00; /* do not remember playback position */ + track->flag4 = 0x00; /* Show Title/Album/Artist on the 'Now + Playing' page */ +} + /*------------------------------------------------------------------*\ * * Index: misc_track.h =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- misc_track.h 17 Jun 2005 13:30:04 -0000 1.11 +++ misc_track.h 13 Nov 2005 07:34:34 -0000 1.12 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-06-17 22:12:14 jcs> +/* Time-stamp: <2005-11-13 16:28:33 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -56,5 +56,7 @@ void gp_do_selected_entry (void (*do_func)(GList *tracks), gint inst); void gp_do_selected_playlist (void (*do_func)(GList *tracks)); +void gp_track_set_flags_podcast (Track *track); +void gp_track_set_flags_default (Track *track); #endif |
|
From: <jc...@us...> - 2005-11-13 07:34:46
|
Update of /cvsroot/gtkpod/gtkpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18317 Modified Files: ChangeLog_detailed Log Message: * file.c: strip whitespace when getting tags from filename via template. * take care of flag1/2/3/4 when adding and removing podcasts, normal tracks... Index: ChangeLog_detailed =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- ChangeLog_detailed 12 Nov 2005 16:54:15 -0000 1.101 +++ ChangeLog_detailed 13 Nov 2005 07:34:34 -0000 1.102 @@ -1,3 +1,11 @@ +2005-11-13 Jorg Schuler <jc...@us...> + + * file.c: strip whitespace when getting tags from filename + via template. + + * take care of flag1/2/3/4 when adding and removing podcasts, + normal tracks... + 2005-11-12 Jorg Schuler <jc...@us...> * podcasts: some code cleanup, added context menus |
|
From: <jc...@us...> - 2005-11-13 06:05:03
|
Update of /cvsroot/gtkpod/libgpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7489/src Modified Files: itdb.h itdb_itunesdb.c Log Message: * src/itdb_itunesdb.c: * src/itdb.h: split unk164 into flag1, flag2, flag3, and flag4. Index: itdb.h =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- itdb.h 13 Nov 2005 05:13:10 -0000 1.18 +++ itdb.h 13 Nov 2005 06:04:55 -0000 1.19 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-13 14:11:50 jcs> +/* Time-stamp: <2005-11-13 14:58:18 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -570,17 +570,21 @@ (always 0x01010100?), zero otherwise */ guint32 unk152; /* unknown */ guint32 unk156, unk160; - guint32 unk164; /* unknown (0x02?) in dbversion 0x0d, for - podcasts this seems to be set to - 0x01010102. The 0x10000 bit seems to control - whether or not iTunes remembers the last - played position of this song. This will work - on any song, not just podcasts. - Assumption: - Audiobooks also get this bit set by - default. Assumption2: This is really four - single byte flags, perhaps? Might want to try - find various examples and compare them. */ + guint8 flag1; /* basically unknown. set to 0x02 for + * podcasts, 0x00 otherwise. */ + guint8 flag2; /* "Skip when shuffling" when set to 0x01, set + to 0x00 otherwise. .m4b and .aa files always + seem to be skipped when shuffling, however */ + guint8 flag3; /* "Remember playback position" when set to + 0x01, set to 0x00 otherwise. .m4b and .aa + files always seem to remember the playback + position, however. */ + guint8 flag4; /* Used for podcasts, 0x00 otherwise. If set to + 0x01 the "Now Playing" page will show + Title/Album, when set to 0x00 it will also + show the Artist. When set to 0x02 a sub-page + (middle button) with further information + about the track will be shown. */ guint64 dbid2; /* not clear. if not set, itdb will set this to the same value as dbid when adding a track */ guint32 unk176; /* unknown - added in dbversion 0x0c, first Index: itdb_itunesdb.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb_itunesdb.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- itdb_itunesdb.c 13 Nov 2005 05:13:10 -0000 1.29 +++ itdb_itunesdb.c 13 Nov 2005 06:04:55 -0000 1.30 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-13 14:11:49 jcs> +/* Time-stamp: <2005-11-13 14:58:17 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -1816,7 +1816,10 @@ { track->unk156 = get32lint (cts, seek+156); track->unk160 = get32lint (cts, seek+160); - track->unk164 = get32lint (cts, seek+164); + track->flag1 = get8int (cts, seek+164); + track->flag2 = get8int (cts, seek+165); + track->flag3 = get8int (cts, seek+166); + track->flag4 = get8int (cts, seek+167); track->dbid2 = get64lint (cts, seek+168); track->unk176 = get32lint (cts, seek+176); track->unk180 = get32lint (cts, seek+180); @@ -2716,7 +2719,10 @@ /* since iTunesDB version 0x0c */ put32lint (cts, track->unk156); put32lint (cts, track->unk160); - put32lint (cts, track->unk164); + put8int (cts, track->flag1); + put8int (cts, track->flag2); + put8int (cts, track->flag3); + put8int (cts, track->flag4); put64lint (cts, track->dbid2); put32lint (cts, track->unk176); put32lint (cts, track->unk180); |
|
From: <jc...@us...> - 2005-11-13 06:05:03
|
Update of /cvsroot/gtkpod/libgpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7489 Modified Files: ChangeLog Log Message: * src/itdb_itunesdb.c: * src/itdb.h: split unk164 into flag1, flag2, flag3, and flag4. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- ChangeLog 13 Nov 2005 05:13:10 -0000 1.52 +++ ChangeLog 13 Nov 2005 06:04:55 -0000 1.53 @@ -4,6 +4,9 @@ the old rating to app_rating. Not sure what it's for, but iTunes seem to do it. + * src/itdb_itunesdb.c: + * src/itdb.h: split unk164 into flag1, flag2, flag3, and flag4. + 2005-11-12 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb_track.c: (itdb_track_set_defaults) only change unk208 |
|
From: <jc...@us...> - 2005-11-13 05:13:23
|
Update of /cvsroot/gtkpod/libgpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1374 Modified Files: ChangeLog Log Message: * src/itdb_itunesdb.c: when new rating is set on the iPod, backup the old rating to app_rating. Not sure what it's for, but iTunes seem to do it. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- ChangeLog 12 Nov 2005 13:58:50 -0000 1.51 +++ ChangeLog 13 Nov 2005 05:13:10 -0000 1.52 @@ -1,5 +1,11 @@ 2005-11-12 Jorg Schuler <jcsjcs at users.sourceforge.net> + * src/itdb_itunesdb.c: when new rating is set on the iPod, backup + the old rating to app_rating. Not sure what it's for, but iTunes + seem to do it. + +2005-11-12 Jorg Schuler <jcsjcs at users.sourceforge.net> + * src/itdb_track.c: (itdb_track_set_defaults) only change unk208 (audio/video) if not already set to non-zero. |
|
From: <jc...@us...> - 2005-11-13 05:13:23
|
Update of /cvsroot/gtkpod/libgpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1374/src Modified Files: itdb.h itdb_itunesdb.c Log Message: * src/itdb_itunesdb.c: when new rating is set on the iPod, backup the old rating to app_rating. Not sure what it's for, but iTunes seem to do it. Index: itdb.h =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- itdb.h 12 Nov 2005 04:18:53 -0000 1.17 +++ itdb.h 13 Nov 2005 05:13:10 -0000 1.18 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-10 00:10:05 jcs> +/* Time-stamp: <2005-11-13 14:11:50 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -510,7 +510,11 @@ guint32 recent_playcount; /* times track was played since last sync */ gboolean transferred; /* has file been transferred to iPod? */ gint16 BPM; /* supposed to vary the playback speed */ - guint8 app_rating; /* star rating set by appl. (not iPod) */ + guint8 app_rating; /* star rating set by appl. (not + * iPod). If the rating set on the iPod + and the rating field above differ, the + original rating is copied here and the + new rating is stored above. */ guint16 type; /* CBR MP3s are type 0x100, VBR MP3s are type 0x101, AAC are type 0x0 */ guint8 compilation; Index: itdb_itunesdb.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb_itunesdb.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- itdb_itunesdb.c 12 Nov 2005 04:18:53 -0000 1.28 +++ itdb_itunesdb.c 13 Nov 2005 05:13:10 -0000 1.29 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-11 22:44:42 jcs> +/* Time-stamp: <2005-11-13 14:11:49 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -1930,8 +1930,14 @@ if (playcount) { if (playcount->rating != NO_PLAYCOUNT) - track->rating = playcount->rating; - + { + if (track->rating != playcount->rating) + { + /* backup original rating to app_rating */ + track->app_rating = track->rating; + track->rating = playcount->rating; + } + } if (playcount->time_played) track->time_played = playcount->time_played; |
|
From: <jc...@us...> - 2005-11-12 16:54:23
|
Update of /cvsroot/gtkpod/gtkpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14842/src Modified Files: context_menus.c display_itdb.c file.c misc_confirm.c misc_track.c Log Message: * display_itdb.c, context_menus.c, misc_confirm.c, misc_track.c: provisions for podcasts DND and podcasts deletion. Index: context_menus.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/context_menus.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- context_menus.c 12 Nov 2005 08:54:31 -0000 1.44 +++ context_menus.c 12 Nov 2005 16:54:15 -0000 1.45 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-12 17:34:06 jcs> +/* Time-stamp: <2005-11-13 01:50:32 jcs> | | Copyright (C) 2003 Corey Donohoe <atmos at atmos dot org> | Copyright (C) 2003-2005 Jorg Schuler <jcsjcs at users sourceforge net> @@ -282,15 +282,16 @@ { static GtkWidget *menu[CM_NUM]; static GtkWidget *mi_exp[CM_NUM]; /* Export Tracks */ - static GtkWidget *mi_pl[CM_NUM]; /* DELETE_ACTION_PLAYLIST */ - static GtkWidget *mi_ipod[CM_NUM]; /* DELETE_ACTION_IPOD */ - static GtkWidget *mi_local[CM_NUM];/* DELETE_ACTION_LOCAL */ - static GtkWidget *mi_db[CM_NUM]; /* DELETE_ACTION_DATABASE */ - static GtkWidget *mi_sep[CM_NUM]; /* separator */ + static GtkWidget *mi_delpl[CM_NUM]; /* DELETE_ACTION_PLAYLIST */ + static GtkWidget *mi_delipod[CM_NUM]; /* DELETE_ACTION_IPOD */ + static GtkWidget *mi_dellocal[CM_NUM];/* DELETE_ACTION_LOCAL */ + static GtkWidget *mi_deldb[CM_NUM]; /* DELETE_ACTION_DATABASE */ + static GtkWidget *mi_delpcipod[CM_NUM]; /* DELETE_ACTION_IPOD */ + static GtkWidget *mi_delsep[CM_NUM]; /* separator */ static GtkWidget *mi_spl[CM_NUM]; /* edit smart playlist */ - static GtkWidget *mi_ipod_all[CM_NUM];/* DELETE_ACTION_IPOD (all + static GtkWidget *mi_delipod_all[CM_NUM];/* DELETE_ACTION_IPOD (all * tracks) */ - static GtkWidget *mi_db_all[CM_NUM]; /* DELETE_ACTION_DATABASE + static GtkWidget *mi_deldb_all[CM_NUM]; /* DELETE_ACTION_DATABASE * (all tracks */ static GtkWidget *mi_podcasts_sep[CM_NUM]; /* Podcasts Separator */ static GtkWidget *mi_podcasts_update[CM_NUM]; /* Update Podcasts */ @@ -349,61 +350,78 @@ } if ((type == CM_ST) || (type == CM_TM)) { - mi_sep[type] = add_separator (menu[type]); - mi_ipod[type] = hookup_mi (menu[type], - _("Delete From iPod"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_IPOD)); - mi_local[type] = hookup_mi (menu[type], - _("Delete From Harddisk"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_LOCAL)); - mi_db[type] = hookup_mi (menu[type], - _("Delete From Database"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_DATABASE)); - mi_pl[type] = hookup_mi (menu[type], - _("Delete From Playlist"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_PLAYLIST)); + mi_delsep[type] = add_separator (menu[type]); + mi_delipod[type] = + hookup_mi (menu[type], + _("Delete From iPod"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_IPOD)); + mi_dellocal[type] = + hookup_mi (menu[type], + _("Delete From Harddisk"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_LOCAL)); + mi_deldb[type] = + hookup_mi (menu[type], + _("Delete From Database"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_DATABASE)); + mi_delpl[type] = + hookup_mi (menu[type], + _("Delete From Playlist"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_PLAYLIST)); } if (type == CM_PM) { - mi_sep[type] = add_separator (menu[type]); - mi_ipod[type] = hookup_mi (menu[type], - _("Delete Including Tracks"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_IPOD)); - mi_local[type] = hookup_mi (menu[type], - _("Delete Including Tracks (Harddisk)"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_LOCAL)); - mi_db[type] = hookup_mi (menu[type], - _("Delete Including Tracks (Database)"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_DATABASE)); - mi_pl[type] = hookup_mi (menu[type], - _("Delete But Keep Tracks"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_PLAYLIST)); - mi_ipod_all[type] = hookup_mi (menu[type], - _("Remove All Tracks from iPod"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_IPOD)); - mi_db_all[type] = hookup_mi (menu[type], - _("Remove All Tracks from Database"), - GTK_STOCK_DELETE, - G_CALLBACK (delete_entries), - GINT_TO_POINTER (DELETE_ACTION_DATABASE)); + mi_delsep[type] = add_separator (menu[type]); + mi_delipod[type] = + hookup_mi (menu[type], + _("Delete Including Tracks"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_IPOD)); + mi_dellocal[type] = + hookup_mi (menu[type], + _("Delete Including Tracks (Harddisk)"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_LOCAL)); + mi_deldb[type] = + hookup_mi (menu[type], + _("Delete Including Tracks (Database)"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_DATABASE)); + mi_delpl[type] = + hookup_mi (menu[type], + _("Delete But Keep Tracks"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_PLAYLIST)); + mi_delipod_all[type] = + hookup_mi (menu[type], + _("Remove All Tracks from iPod"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_IPOD)); + mi_deldb_all[type] = + hookup_mi (menu[type], + _("Remove All Tracks from Database"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_DATABASE)); + + mi_delpcipod[type] = + hookup_mi (menu[type], + _("Remove All Podcasts from iPod"), + GTK_STOCK_DELETE, + G_CALLBACK (delete_entries), + GINT_TO_POINTER (DELETE_ACTION_IPOD)); mi_podcasts_sep[type] = add_separator (menu[type]); @@ -433,107 +451,99 @@ switch (type) { case CM_PM: + gtk_widget_hide (mi_spl[type]); + gtk_widget_hide (mi_dellocal[type]); + gtk_widget_hide (mi_delpl[type]); + gtk_widget_hide (mi_deldb[type]); + gtk_widget_hide (mi_deldb_all[type]); + gtk_widget_hide (mi_delsep[type]); + gtk_widget_hide (mi_delipod[type]); + gtk_widget_hide (mi_delipod_all[type]); + gtk_widget_hide (mi_delpcipod[type]); + gtk_widget_hide (mi_dellocal[type]); + gtk_widget_hide (mi_podcasts_sep[type]); + gtk_widget_hide (mi_podcasts_update[type]); + gtk_widget_hide (mi_podcasts_prefs[type]); + if (pl->is_spl) { gtk_widget_show (mi_spl[type]); } - else - { - gtk_widget_hide (mi_spl[type]); - } if (itdb->usertype & GP_ITDB_TYPE_IPOD) { - gtk_widget_hide (mi_local [type]); - gtk_widget_hide (mi_db [type]); - gtk_widget_hide (mi_db_all [type]); if (itdb_playlist_is_mpl (pl)) { - gtk_widget_hide (mi_sep [type]); - gtk_widget_hide (mi_ipod [type]); - gtk_widget_hide (mi_pl [type]); - gtk_widget_show (mi_ipod_all [type]); + gtk_widget_show (mi_delipod_all[type]); } else { - gtk_widget_show (mi_sep [type]); - gtk_widget_show (mi_ipod [type]); - gtk_widget_show (mi_pl [type]); - gtk_widget_hide (mi_ipod_all [type]); + if (itdb_playlist_is_podcasts (pl)) + { + gtk_widget_show (mi_delpcipod[type]); + } + else + { + gtk_widget_show (mi_delsep[type]); + gtk_widget_show (mi_delipod[type]); + gtk_widget_show (mi_delpl[type]); + } } } if (itdb->usertype & GP_ITDB_TYPE_LOCAL) { - gtk_widget_hide (mi_ipod [type]); - gtk_widget_hide (mi_ipod_all [type]); if (itdb_playlist_is_mpl (pl)) { - gtk_widget_hide (mi_sep [type]); - gtk_widget_hide (mi_local [type]); - gtk_widget_hide (mi_db [type]); - gtk_widget_hide (mi_pl [type]); - gtk_widget_show (mi_db_all [type]); + gtk_widget_show (mi_deldb_all[type]); } else { - gtk_widget_show (mi_sep [type]); - gtk_widget_show (mi_local [type]); - gtk_widget_show (mi_db [type]); - gtk_widget_show (mi_pl [type]); - gtk_widget_hide (mi_db_all [type]); + gtk_widget_show (mi_delsep[type]); + gtk_widget_show (mi_dellocal[type]); + gtk_widget_show (mi_deldb[type]); + gtk_widget_show (mi_delpl[type]); } } + if (itdb->usertype & GP_ITDB_TYPE_PODCASTS) { + gtk_widget_show (mi_delsep[type]); gtk_widget_show (mi_podcasts_sep[type]); gtk_widget_show (mi_podcasts_update[type]); gtk_widget_show (mi_podcasts_prefs[type]); } - else - { - gtk_widget_hide (mi_podcasts_sep[type]); - gtk_widget_hide (mi_podcasts_update[type]); - gtk_widget_hide (mi_podcasts_prefs[type]); - } break; case CM_ST: case CM_TM: + gtk_widget_hide (mi_spl[type]); + gtk_widget_hide (mi_dellocal[type]); + gtk_widget_hide (mi_deldb[type]); + gtk_widget_hide (mi_delpl[type]); + gtk_widget_hide (mi_delipod[type]); + if (pl->is_spl) { gtk_widget_show (mi_spl[type]); } - else - { - gtk_widget_hide (mi_spl[type]); - } if (itdb->usertype & GP_ITDB_TYPE_IPOD) { - gtk_widget_hide (mi_local [type]); - gtk_widget_hide (mi_db [type]); - if (itdb_playlist_is_mpl (pl)) - { - gtk_widget_show (mi_ipod [type]); - gtk_widget_hide (mi_pl [type]); - } - else + gtk_widget_show (mi_delipod[type]); + if (!itdb_playlist_is_mpl (pl) && + !itdb_playlist_is_podcasts (pl)) { - gtk_widget_show (mi_ipod [type]); - gtk_widget_show (mi_pl [type]); + gtk_widget_show (mi_delpl[type]); } } if (itdb->usertype & GP_ITDB_TYPE_LOCAL) { - gtk_widget_hide (mi_ipod [type]); - if (itdb_playlist_is_mpl (pl)) - { - gtk_widget_show (mi_local [type]); - gtk_widget_show (mi_db [type]); - gtk_widget_hide (mi_pl [type]); - } - else + gtk_widget_show (mi_dellocal[type]); + gtk_widget_show (mi_deldb[type]); + /* actually, local repositories are not supposed to + have podcasts playlists, but for completeness' sake + I'll test anyway*/ + if(!itdb_playlist_is_mpl (pl) && + !itdb_playlist_is_podcasts (pl)) { - gtk_widget_show (mi_local [type]); - gtk_widget_show (mi_db [type]); - gtk_widget_show (mi_pl [type]); + gtk_widget_show (mi_delpl[type]); } } break; Index: display_itdb.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- display_itdb.c 24 Oct 2005 14:58:02 -0000 1.33 +++ display_itdb.c 12 Nov 2005 16:54:15 -0000 1.34 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-10-24 23:49:51 jcs> +/* Time-stamp: <2005-11-13 01:39:07 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -462,6 +462,8 @@ DeleteAction deleteaction) { iTunesDB *itdb; + Playlist *mpl; + gboolean remove_track = FALSE; g_return_if_fail (track); itdb = track->itdb; @@ -472,8 +474,10 @@ case DELETE_ACTION_IPOD: case DELETE_ACTION_LOCAL: case DELETE_ACTION_DATABASE: - /* remove from MPL in these cases */ - plitem = NULL; + /* remove from MPL in these cases (unless we are removing + podcasts) */ + if (!(plitem && itdb_playlist_is_podcasts (plitem))) + plitem = NULL; break; case DELETE_ACTION_PLAYLIST: /* cannot remove from MPL */ @@ -481,7 +485,10 @@ break; } - if (plitem == NULL) plitem = itdb_playlist_mpl (track->itdb); + mpl = itdb_playlist_mpl (track->itdb); + + if (plitem == NULL) + plitem = mpl; g_return_if_fail (plitem); @@ -491,6 +498,17 @@ /* remove track from playlist */ itdb_playlist_remove_track (plitem, track); + /* if we removed a podcasts, remove it from memory as well, unless + it's present in the MPL (this happens if this podcast was on + the iPod as podcast as well as standard track) */ + if (itdb_playlist_is_podcasts (plitem)) + { + if (!itdb_playlist_contains_track (mpl, track)) + { + remove_track = TRUE; + } + } + if (itdb_playlist_is_mpl (plitem)) { /* if it's the MPL, we remove the track permanently */ GList *gl = g_list_nth (itdb->playlists, 1); @@ -508,8 +526,12 @@ } gl=gl->next; } - md5_track_remove (track); + remove_track = TRUE; + } + if (remove_track) + { + md5_track_remove (track); if (itdb->usertype & GP_ITDB_TYPE_IPOD) { switch (deleteaction) Index: file.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v retrieving revision 1.144 retrieving revision 1.145 diff -u -d -r1.144 -r1.145 --- file.c 15 Oct 2005 17:04:38 -0000 1.144 +++ file.c 12 Nov 2005 16:54:15 -0000 1.145 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-10-16 01:59:05 jcs> +/* Time-stamp: <2005-11-12 23:38:13 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -1755,8 +1755,8 @@ * * \*------------------------------------------------------------------*/ -/* Append file @name to the list of tracks. - @name is in the current locale +/* Append file @fname to the list of tracks. + @fname is in the current locale @plitem: if != NULL, add track to plitem as well (unless it's the MPL) descend: TRUE: add directories recursively FALSE: add contents of directories passed but don't descend @@ -1764,7 +1764,7 @@ /* @addtrackfunc: if != NULL this will be called instead of "add_track_to_playlist () -- used for dropping tracks at a specific position in the track view */ -gboolean add_track_by_filename (iTunesDB *itdb, gchar *name, +gboolean add_track_by_filename (iTunesDB *itdb, gchar *fname, Playlist *plitem, gboolean descend, AddTrackFunc addtrackfunc, gpointer data) { @@ -1776,23 +1776,23 @@ Playlist *mpl; gboolean result = TRUE; - g_return_val_if_fail (name, FALSE); + g_return_val_if_fail (fname, FALSE); g_return_val_if_fail (itdb, FALSE); mpl = itdb_playlist_mpl (itdb); g_return_val_if_fail (mpl, FALSE); if (!plitem) plitem = mpl; - if (g_file_test (name, G_FILE_TEST_IS_DIR)) + if (g_file_test (fname, G_FILE_TEST_IS_DIR)) { - return add_directory_by_name (itdb, name, plitem, descend, addtrackfunc, data); + return add_directory_by_name (itdb, fname, plitem, descend, addtrackfunc, data); } /* check if file is a playlist */ - switch (determine_file_type(name)) { + switch (determine_file_type(fname)) { case FILE_TYPE_M3U: case FILE_TYPE_PLS: - if (add_playlist_by_filename (itdb, name, plitem, -1, + if (add_playlist_by_filename (itdb, fname, plitem, -1, addtrackfunc, data)) return TRUE; return FALSE; @@ -1805,7 +1805,7 @@ } /* print a message about which file is being processed */ - basename = g_path_get_basename (name); + basename = g_path_get_basename (fname); if (basename) { gchar *bn_utf8 = charset_to_utf8 (basename); @@ -1817,7 +1817,7 @@ C_FREE (basename); /* Check if there exists already a track with the same filename */ - oldtrack = gp_track_by_filename (itdb, name); + oldtrack = gp_track_by_filename (itdb, fname); /* If a track already exists in the database, either update it or just add it to the current playlist (if it doesn't already exist) */ if (oldtrack) @@ -1839,9 +1839,8 @@ } } else /* oldtrack == NULL */ - { /* Only read the new track if there doesn't already exist an old - track with the same filename in the database */ - Track *track = get_track_info_from_file (name, NULL); + { /* OK, the same filename does not already exist */ + Track *track = get_track_info_from_file (fname, NULL); if (track) { Track *added_track = NULL; @@ -1851,25 +1850,26 @@ track->id = 0; track->transferred = FALSE; - /* is 'name' on the iPod? */ + /* is 'fname' on the iPod? -- if yes mark as transfered, if + * it's in the ipod_control directory */ if (itdb->usertype & GP_ITDB_TYPE_IPOD) { g_return_val_if_fail (itdb->mountpoint, FALSE); - if (strstr (name, itdb->mountpoint) == name) + if (strstr (fname, itdb->mountpoint) == fname) { /* Yes */ - /* is 'name' in the iPod_Control directory? */ - gchar *name_i = name + strlen (itdb->mountpoint); - gchar *name_l; - if (*name_i == G_DIR_SEPARATOR) ++name_i; - name_l = g_ascii_strdown (name_i, -1); - if (strstr (name_l, "ipod_control") == name_l) + /* is 'fname' in the iPod_Control directory? */ + gchar *fname_i = fname + strlen (itdb->mountpoint); + gchar *fname_l; + if (*fname_i == G_DIR_SEPARATOR) ++fname_i; + fname_l = g_ascii_strdown (fname_i, -1); + if (strstr (fname_l, "ipod_control") == fname_l) { /* Yes */ track->transferred = TRUE; track->ipod_path = g_strdup_printf ( - "%c%s", G_DIR_SEPARATOR, name_i); + "%c%s", G_DIR_SEPARATOR, fname_i); itdb_filename_fs2ipod (track->ipod_path); } - g_free (name_l); + g_free (fname_l); } } @@ -1886,17 +1886,19 @@ if (addtrackfunc) { if (itdb_playlist_is_mpl (plitem)) - { /* add track to master playlist (if it wasn't a + { /* add track to master playlist if it wasn't a duplicate */ if (added_track == track) addtrackfunc (plitem, added_track, data); } else - { /* add track to master playlist (if it wasn't a - * duplicate) */ + { /* add track to master playlist if it wasn't a + * duplicate and plitem is not the podcasts playlist + */ if (added_track == track) { - gp_playlist_add_track (mpl, added_track, TRUE); + if (!itdb_playlist_is_podcasts (plitem)) + gp_playlist_add_track (mpl, added_track, TRUE); } /* add track to specified playlist */ addtrackfunc (plitem, added_track, data); @@ -1904,14 +1906,27 @@ } else /* no addtrackfunc */ { - /* add track to master playlist (if it wasn't a - * duplicate) */ + if (itdb_playlist_is_mpl (plitem)) + { + /* add track to master playlist if it wasn't a + * duplicate */ if (added_track == track) - gp_playlist_add_track (mpl, added_track, + gp_playlist_add_track (plitem, added_track, TRUE); - /* add track to specified playlist, but not to MPL */ - if (!itdb_playlist_is_mpl (plitem)) - gp_playlist_add_track (plitem, added_track, TRUE); + } + else + { + /* add track to master playlist if it wasn't a + * duplicate and plitem is not the podcasts playlist + */ + if (added_track == track) + { + if (!itdb_playlist_is_podcasts (plitem)) + gp_playlist_add_track (mpl, added_track, TRUE); + } + /* add track to specified playlist */ + gp_playlist_add_track (plitem, added_track, TRUE); + } } /* indicate that non-transferred files exist */ data_changed (itdb); Index: misc_confirm.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- misc_confirm.c 24 Sep 2005 04:20:24 -0000 1.21 +++ misc_confirm.c 12 Nov 2005 16:54:15 -0000 1.22 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-09-24 13:17:12 jcs> +/* Time-stamp: <2005-11-13 01:39:08 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -541,6 +541,11 @@ msg = g_strdup_printf (_("Removed all %d tracks from the iPod"), n); display_reset (0); } + else if (itdb_playlist_is_podcasts (dd->pl)) + { + msg = g_strdup_printf (_("Removed all podcasts from the iPod")); + display_reset (0); + } else { /* remove playlist */ @@ -685,6 +690,11 @@ { label = g_strdup_printf (_("Are you sure you want to remove all tracks from your iPod?")); } + else if (itdb_playlist_is_podcasts (pl)) + { /* podcasts playlist */ + dd->selected_tracks = g_list_copy (pl->members); + label = g_strdup_printf (_("Are you sure you want to remove all podcasts from your iPod?")); + } else { /* normal playlist */ /* we set selected_tracks to get a list printed by Index: misc_track.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- misc_track.c 24 Sep 2005 04:20:24 -0000 1.27 +++ misc_track.c 12 Nov 2005 16:54:15 -0000 1.28 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-09-24 13:17:17 jcs> +/* Time-stamp: <2005-11-12 23:57:26 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -647,9 +647,14 @@ /* printf ("add tr %p to pl: %p\n", track, pl); */ if (from_itdb == to_itdb) { /* DND within the same itdb */ + if (!itdb_playlist_contains_track (to_mpl, track)) + { /* add to MPL if not already present (will happen + * if dragged from the podcasts playlist */ + gp_playlist_add_track (to_mpl, track, TRUE); + } if (!itdb_playlist_is_mpl (pl)) - { /* not necessary to add to MPL as track has to be - * present already */ + { + /* add to designated playlist */ gp_playlist_add_track (pl, track, TRUE); } } @@ -663,11 +668,31 @@ same track already exists in the database, the already existing track is returned and @duptr is freed */ addtr = gp_track_add (to_itdb, duptr); - /* check if we need to add to the MPL */ + if (addtr == duptr) - { - itdb_playlist_add_track (to_mpl, addtr, -1); + { /* no duplicate */ + /* we need to add to the MPL if the track is no + duplicate and will not be added to the podcasts + playlist */ + if (!itdb_playlist_is_podcasts (pl)) + { /* don't add to mpl if we add to the podcasts + playlist */ + gp_playlist_add_track (to_mpl, addtr, TRUE); + } + } + else + { /* duplicate */ + /* we also need to add to the MPL if the track is a + duplicate, does not yet exist in the MPL and will + not be added to a podcast list (this happens if + it's already in the podcast list) */ + if ((!itdb_playlist_contains_track (to_mpl, addtr)) && + (!itdb_playlist_is_podcasts (pl))) + { + gp_playlist_add_track (to_mpl, addtr, TRUE); + } } + /* add to designated playlist (if not mpl) */ if (!itdb_playlist_is_mpl (pl)) { gp_playlist_add_track (pl, addtr, TRUE); |
|
From: <jc...@us...> - 2005-11-12 16:54:22
|
Update of /cvsroot/gtkpod/gtkpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14842 Modified Files: ChangeLog_detailed configure.in Log Message: * display_itdb.c, context_menus.c, misc_confirm.c, misc_track.c: provisions for podcasts DND and podcasts deletion. Index: ChangeLog_detailed =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- ChangeLog_detailed 12 Nov 2005 13:28:02 -0000 1.100 +++ ChangeLog_detailed 12 Nov 2005 16:54:15 -0000 1.101 @@ -10,6 +10,12 @@ * gtkpod.glade: added scrollbars for smart playlist rules-view. + * display_spl.c: remember last size of edit smartlist window. + + * display_itdb.c, context_menus.c, misc_confirm.c, + misc_track.c: provisions for podcasts DND and podcasts + deletion. + 2005-11-10 Jorg Schuler <jc...@us...> * moved mkdirhier() from file_export.c to misc.c Index: configure.in =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/configure.in,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- configure.in 2 Oct 2005 14:34:33 -0000 1.77 +++ configure.in 12 Nov 2005 16:54:15 -0000 1.78 @@ -38,6 +38,12 @@ dnl we need 'flex' AM_PROG_LEX +if ! test `which $LEX`; then + echo LEX: $LEX + AC_MSG_FAILURE([**** flex or lex required]) +fi + + dnl Retrieve the path of mount and umount binaries AC_PATH_PROG(MOUNT, mount) AC_SUBST(MOUNT) |
|
From: <jc...@us...> - 2005-11-12 13:59:01
|
Update of /cvsroot/gtkpod/libgpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17257/src Modified Files: itdb_track.c Log Message: * src/itdb_track.c: (itdb_track_set_defaults) only change unk208 (audio/video) if not already set to non-zero. Index: itdb_track.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb_track.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- itdb_track.c 5 Nov 2005 19:41:23 -0000 1.10 +++ itdb_track.c 12 Nov 2005 13:58:50 -0000 1.11 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-10-12 01:04:36 jcs> +/* Time-stamp: <2005-11-12 22:57:11 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -138,21 +138,27 @@ tr->unk144 = 0x00; /* default value */ } } - if (is_video_ipod (tr->itdb->device)) { - /* The unk208 field seems to denote whether the file is a video or not. - It seems that it must be set to 0x00000002 for video files. */ - /* Only doing that for iPod videos since it remains to be proven that - * setting unk208 to non-0 doesn't upset older ipod models + if (is_video_ipod (tr->itdb->device)) + { + /* The unk208 field seems to denote whether the file is a + video or not. It seems that it must be set to 0x00000002 + for video files. */ + /* Only doing that for iPod videos since it remains to be + * proven that setting unk208 to non-0 doesn't upset older + * ipod models */ - if (haystack (tr->filetype, m4v_desc)) - { - /* set type to video (0x00000002) */ - tr->unk208 = 0x00000002; - } - else + if (tr->unk208 == 0) { - /* set type to audio */ - tr->unk208 = 0x00000001; + if (haystack (tr->filetype, m4v_desc)) + { + /* set type to video (0x00000002) */ + tr->unk208 = 0x00000002; + } + else + { + /* set type to audio */ + tr->unk208 = 0x00000001; + } } } /* The sample rate of the song expressed as an IEEE 32 bit |
|
From: <jc...@us...> - 2005-11-12 13:59:01
|
Update of /cvsroot/gtkpod/libgpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17257 Modified Files: ChangeLog Log Message: * src/itdb_track.c: (itdb_track_set_defaults) only change unk208 (audio/video) if not already set to non-zero. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- ChangeLog 12 Nov 2005 04:18:53 -0000 1.50 +++ ChangeLog 12 Nov 2005 13:58:50 -0000 1.51 @@ -1,3 +1,8 @@ +2005-11-12 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * src/itdb_track.c: (itdb_track_set_defaults) only change unk208 + (audio/video) if not already set to non-zero. + 2005-11-11 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb_itunesdb.c: (itdb_set_mountpoint) do not call |
|
From: <jc...@us...> - 2005-11-12 13:28:18
|
Update of /cvsroot/gtkpod/gtkpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11013 Modified Files: ChangeLog ChangeLog_detailed gtkpod.glade Log Message: * gtkpod.glade: added scrollbars for smart playlist rules-view. * display_spl.c: remember last size of edit smartlist window. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog,v retrieving revision 1.145 retrieving revision 1.146 diff -u -d -r1.145 -r1.146 --- ChangeLog 9 Nov 2005 23:58:59 -0000 1.145 +++ ChangeLog 12 Nov 2005 13:28:02 -0000 1.146 @@ -18,6 +18,9 @@ IMPROVEMENT: Support playcounts on iPod Shuffle as well + IMPROVEMENT: Remember size of 'Edit Smart Playlist' dialog and + use scrolled window for the rules display. + UPDATED: Italian translation (thanks to Edward Matteucci) BUGFIX: 'Check iPod's files' could crash under certain Index: ChangeLog_detailed =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- ChangeLog_detailed 12 Nov 2005 09:22:14 -0000 1.99 +++ ChangeLog_detailed 12 Nov 2005 13:28:02 -0000 1.100 @@ -7,6 +7,9 @@ * file_itunesdb.c: bugfix: tracks marked for deletion were not deleted from the iPod. + * gtkpod.glade: added scrollbars for smart playlist + rules-view. + 2005-11-10 Jorg Schuler <jc...@us...> * moved mkdirhier() from file_export.c to misc.c Index: gtkpod.glade =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v retrieving revision 1.176 retrieving revision 1.177 diff -u -d -r1.176 -r1.177 --- gtkpod.glade 12 Nov 2005 08:54:31 -0000 1.176 +++ gtkpod.glade 12 Nov 2005 13:28:02 -0000 1.177 @@ -12471,19 +12471,37 @@ <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> <child> - <widget class="GtkAlignment" id="spl_rules_table_align"> + <widget class="GtkScrolledWindow" id="scrolledwindow16"> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">5</property> - <property name="bottom_padding">5</property> - <property name="left_padding">5</property> - <property name="right_padding">5</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> <child> - <placeholder/> + <widget class="GtkViewport" id="viewport10"> + <property name="visible">True</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + + <child> + <widget class="GtkAlignment" id="spl_rules_table_align"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> + + <child> + <placeholder/> + </child> + </widget> + </child> + </widget> </child> </widget> </child> |
|
From: <jc...@us...> - 2005-11-12 13:28:18
|
Update of /cvsroot/gtkpod/gtkpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11013/src Modified Files: display_spl.c Log Message: * gtkpod.glade: added scrollbars for smart playlist rules-view. * display_spl.c: remember last size of edit smartlist window. Index: display_spl.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/display_spl.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- display_spl.c 25 Oct 2005 13:59:03 -0000 1.12 +++ display_spl.c 12 Nov 2005 13:28:02 -0000 1.13 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-10-25 22:52:04 jcs> +/* Time-stamp: <2005-11-12 22:22:49 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net> | Part of the gtkpod project. @@ -40,7 +40,8 @@ #include "display.h" #include "prefs.h" - +static const gchar *SPL_WINDOW_DEFX="spl_window_defx"; +static const gchar *SPL_WINDOW_DEFY="spl_window_defy"; static void spl_display_checklimits (GtkWidget *spl_window); static void spl_update_rule (GtkWidget *spl_window, SPLRule *splr); @@ -688,6 +689,15 @@ } +static void spl_store_window_size (GtkWidget *spl_window) +{ + gint defx, defy; + + gtk_window_get_size (GTK_WINDOW (spl_window), &defx, &defy); + prefs_set_int_value (SPL_WINDOW_DEFX, defx); + prefs_set_int_value (SPL_WINDOW_DEFY, defy); +} + static void spl_cancel (GtkButton *button, GtkWidget *spl_window) { Playlist *spl_dup = g_object_get_data (G_OBJECT (spl_window), @@ -707,6 +717,9 @@ { /* Delete */ itdb_playlist_free (spl_orig); } + + spl_store_window_size (spl_window); + gtk_widget_destroy (spl_window); release_widgets (); @@ -764,6 +777,9 @@ } itdb_playlist_free (spl_dup); + + spl_store_window_size (spl_window); + gtk_widget_destroy (spl_window); release_widgets (); @@ -1369,6 +1385,7 @@ void spl_edit_all (iTunesDB *itdb, Playlist *spl, gint32 pos) { GtkWidget *spl_window, *w; + gint defx, defy; Playlist *spl_dup; g_return_if_fail (spl != NULL); @@ -1458,6 +1475,12 @@ spl_display_rules (spl_window); + /* set default size */ + defx = prefs_get_int (SPL_WINDOW_DEFX); + defy = prefs_get_int (SPL_WINDOW_DEFY); + if ((defx != 0) && (defy != 0)) + gtk_window_set_default_size (GTK_WINDOW (spl_window), defx, defy); + gtk_widget_show (spl_window); block_widgets (); |
|
From: <jc...@us...> - 2005-11-12 09:22:24
|
Update of /cvsroot/gtkpod/gtkpod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3992 Modified Files: ChangeLog_detailed Log Message: * file_itunesdb.c: bugfix: tracks marked for deletion were not deleted from the iPod. Index: ChangeLog_detailed =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- ChangeLog_detailed 12 Nov 2005 08:54:31 -0000 1.98 +++ ChangeLog_detailed 12 Nov 2005 09:22:14 -0000 1.99 @@ -4,6 +4,9 @@ * prefs.c: handle filenames somewhat more decently + * file_itunesdb.c: bugfix: tracks marked for deletion were + not deleted from the iPod. + 2005-11-10 Jorg Schuler <jc...@us...> * moved mkdirhier() from file_export.c to misc.c |
|
From: <jc...@us...> - 2005-11-12 09:22:22
|
Update of /cvsroot/gtkpod/gtkpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3992/src Modified Files: file_itunesdb.c Log Message: * file_itunesdb.c: bugfix: tracks marked for deletion were not deleted from the iPod. Index: file_itunesdb.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- file_itunesdb.c 9 Nov 2005 23:58:59 -0000 1.66 +++ file_itunesdb.c 12 Nov 2005 09:22:14 -0000 1.67 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-11-10 08:57:52 jcs> +/* Time-stamp: <2005-11-12 18:10:50 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -1077,7 +1077,6 @@ gboolean result = TRUE; static gboolean abort_flag; ExtraiTunesDBData *eitdb; - const gchar *mp = NULL; #ifdef G_THREADS_ENABLED GThread *thread = NULL; GTimeVal gtime; @@ -1085,6 +1084,8 @@ if (!cond) cond = g_cond_new (); #endif + + g_return_val_if_fail (itdb, FALSE); eitdb = itdb->userdata; g_return_val_if_fail (eitdb, FALSE); @@ -1096,8 +1097,7 @@ if (itdb->usertype & GP_ITDB_TYPE_IPOD) { - mp = prefs_get_ipod_mount (); - g_return_val_if_fail (mp, FALSE); + g_return_val_if_fail (itdb->mountpoint, FALSE); } abort_flag = FALSE; @@ -1117,7 +1117,9 @@ if (itdb->usertype & GP_ITDB_TYPE_IPOD) { - filename = get_file_name_on_ipod (track); + track->itdb = itdb; + filename = itdb_filename_on_ipod (track); + track->itdb = NULL; } if (itdb->usertype & GP_ITDB_TYPE_LOCAL) { |
157 messages has been excluded from this view by a project administrator.
