← Back to branch summary

~ubuntu-branches/ubuntu/precise/enigmail/precise-security

« back to all changes in this revision

Viewing changes to extensions/enigmail/ui/content/enigmailMessengerOverlay.xul

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2010-08-20 11:45:10 UTC
  • mfrom: (0.10.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100820114510-h3cfzn2k0k5z01t5
Tags: 2:1.1.2-0ubuntu1
https://launchpad.net/bugs/565014
* New upstream release

* Merge from debian unstable.  Remaining changes:
  - Drop versioned mozilla-devscripts dependency since we don't build on
    mips or mipsel
  - Add back thunderbird-dev build depends
    - update debian/control
  - fixes LP: #565014 - No signature detected in emails signed using pgp/mime

* Update build-depends on thunderbird or icedove to >= 3.1~
  - update debian/control
* Drop frozen_api patch as changes were accepted upstream
  - drop debian/patches/frozen_api.diff
  - update debian/patches/series
* Use system NSPR in Ubuntu as well
  - update debian/rules
* Build with -fshort-wchar for now to make the build succeed
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/enigmail/ui/content/enigmailMessengerOverlay.xul
518
518
 
519
519
  </menubar>
520
520
 
521
 
<!-- Seamonkey 1.x -->
522
 
 <toolbox id="mailToolbarToolbox">
523
 
   <toolbar id="msgToolbar" persist="collapsed">
524
 
     <hbox id="toolbar_button_box">
525
 
 
526
 
        <toolbarbutton class="toolbarbutton-1"
527
 
                id="button-enigmail-decrypt"
528
 
                label="&enigmail.decryptbutton.label;"
529
 
                tooltip="aTooltip" tooltiptext="&enigmail.decryptbutton.tip;"
530
 
                oncommand="enigMessageDecrypt();"
531
 
                buttontype="seamonkey"
532
 
                insertafter="button-newmsg"
533
 
                persist="platform"
534
 
                />
535
 
 
536
 
        <toolbarseparator class="toolbarseparator-primary"
537
 
              insertafter="button-newmsg"
538
 
                />
539
 
      </hbox>
540
 
   </toolbar>
541
 
 </toolbox>
542
 
 
543
521
<!-- Thunderbird & SeaMonkey 2.x -->
544
522
   <toolbarpalette id="MailToolbarPalette">
545
523
      <toolbarbutton class="toolbarbutton-1"
578
556
           defaultset="button-getmsg,button-newmsg,separator,button-reply,button-replyall,button-forward,separator,button-enigmail-decrypt,spacer,button-goback,button-goforward,button-next,button-junk,button-delete,button-mark,spring,throbber-box">
579
557
  </toolbar>
580
558
 
 
559
 
581
560
  <vbox id="messagepanebox">
582
561
    <hbox id="enigmailBox" class="expandedEnigmailBox"
583
 
          position="1"
584
 
          collapsed="true" align="center">
585
 
          
 
562
          collapsed="true" align="center"
 
563
          position="1">
 
564
 
586
565
      <vbox>
587
566
        <spacer class="enigmailHeaderSpacer"/>
588
567
      </vbox>
612
591
        </vbox>
613
592
        <vbox class="enigmailHeaderNameBox" flex="0" pack="center">
614
593
          <observes element="enigmailStatusText" attribute="class"/>
615
 
          <button id="enigmailStatusHdrDetails" pack="center" 
616
 
                  label="&enigmail.detailsHdrButton.label;" 
 
594
          <button id="enigmailStatusHdrDetails" pack="center"
 
595
                  label="&enigmail.detailsHdrButton.label;"
617
596
                  type="menu"
618
597
                  class="enigMsgHdrView-flat-button">
619
598
            <menupopup id="enigSecurityContext"