error applying picons.patch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

I extracted the picon databases into /usr/lib/picons/

[root@turnip picons]# ls
domains  misc  news  unknown  usenix  users  weather

and in the squirrelmail directory typed

  patch -p1 <plugins/picons/picons.patch

which gave this

patching file functions/mailbox_display.php
Hunk #1 FAILED at 151.
1 out of 1 hunk FAILED -- saving rejects to file
functions/mailbox_display.php.rej
patching file src/read_body.php
Hunk #1 FAILED at 802.
1 out of 1 hunk FAILED -- saving rejects to file src/read_body.php.rej


contents of mailbox_display.php.rej

*** functions/mailbox_display.php       Sun Aug 25 21:42:26 2002
--- functions/mailbox_display.php       Mon Aug 26 05:32:42 2002
***************
*** 151,157 ****
          . $msg["ID"]."$checked></TD>\n";
        break;
        case 2: /* from */
!       echo "   <td bgcolor=\"$hlt_color\">$italic$bold$flag$fontstr"
          . "$senderName$fontstr_end$flag_end$bold_end$italic_end</td>\n";
        break;
        case 3: /* date */
--- 151,159 ----
          . $msg["ID"]."$checked></TD>\n";
        break;
        case 2: /* from */
!       echo "   <td bgcolor=\"$hlt_color\" valign=\"middle\">";
!         do_hook("message_icon", $msg['FROM'], 0);
!       echo "$italic$bold$flag$fontstr"
          . "$senderName$fontstr_end$flag_end$bold_end$italic_end</td>\n";
        break;
        case 3: /* date */
~
~


----------------------

contents of src/read_body.php.rej


*** src/read_body.php   Sun Aug 25 21:42:27 2002
--- src/read_body.php   Mon Aug 26 05:36:34 2002
***************
*** 802,807 ****
         '<TR><TD WIDTH="100%">' .
         '<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">'
. "\n" .
            '<TR>' . "\n";

  /** subject **/
  echo          "<TD BGCOLOR=\"$color[0]\" WIDTH=\"10%\" ALIGN=\"right\"
VALIGN=\"top\">\n" .
--- 802,810 ----
         '<TR><TD WIDTH="100%">' .
         '<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">'
. "\n" .
            '<TR>' . "\n";
+     echo "         <TD BGCOLOR=\"$color[0]\" ROWSPAN=\"5\"
ALIGN=\"RIGHT\" VALIGN=\"MIDDLE\">\n";
+     do_hook("message_icon", $from_name, 1);
+     echo "         </TD>";

  /** subject **/
  echo          "<TD BGCOLOR=\"$color[0]\" WIDTH=\"10%\" ALIGN=\"right\"
VALIGN=\"top\">\n" .
~
~
---------------------


Help appreciated

cheers

Mick

-- 
mickiwiki.com


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
-----
squirrelmail-users mailing list
Posting guidelines: http://squirrelmail.org/postingguidelines
List address: squirrelmail-users@xxxxxxxxxxxxxxxxxxxxx
List archives: http://news.gmane.org/gmane.mail.squirrelmail.user
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-users

[Index of Archives]     [Video For Linux]     [Yosemite News]     [Yosemite Photos]     [gtk]     [KDE]     [Cyrus SASL]     [Gimp on Windows]     [Steve's Art]     [Webcams]

  Powered by Linux