← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to browser/components/bookmarks/src/nsBookmarksService.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
browser/components/bookmarks/src/nsBookmarksService.cpp
1791
1791
        && (keyUni))
1792
1792
    {
1793
1793
        str = keyUni;
1794
 
        nsCRT::free(keyUni);
 
1794
        NS_Free(keyUni);
1795
1795
    }
1796
1796
    else
1797
1797
    {
3515
3515
 
3516
3516
    nsCOMPtr<nsIRDFNode> nodeType;
3517
3517
    GetSynthesizedType(bookmark, getter_AddRefs(nodeType));
3518
 
    if (nodeType == kNC_Bookmark) {
 
3518
    if (nodeType == kNC_Bookmark || nodeType == kNC_MicsumBookmark) {
3519
3519
        nsCOMPtr<nsIRDFNode> charsetNode;
3520
3520
        rv = GetTarget(bookmark, kWEB_LastCharset, PR_TRUE,
3521
3521
                       getter_AddRefs(charsetNode));
3564
3564
 
3565
3565
    nsCOMPtr<nsIRDFNode> nodeType;
3566
3566
    GetSynthesizedType(bookmark, getter_AddRefs(nodeType));
3567
 
    if (nodeType == kNC_Bookmark || nodeType == kNC_Bookmark) {
 
3567
    if (nodeType == kNC_Bookmark || nodeType == kNC_MicsumBookmark) {
3568
3568
        nsCOMPtr<nsIRDFNode> charsetNode;
3569
3569
        rv = GetTarget(bookmark, kWEB_LastCharset, PR_TRUE,
3570
3570
                       getter_AddRefs(charsetNode));
5222
5222
            rv |= aStrm->Write(kIDEquals, sizeof(kIDEquals)-1, &dummy);
5223
5223
            rv |= aStrm->Write(escapedID, strlen(escapedID), &dummy);
5224
5224
            rv |= aStrm->Write(kQuoteStr, sizeof(kQuoteStr)-1, &dummy);
5225
 
            nsCRT::free(escapedID);
 
5225
            NS_Free(escapedID);
5226
5226
        }
5227
5227
    }
5228
5228
 
5254
5254
    if (escapedAttrib)
5255
5255
    {
5256
5256
        rv = aStrm->Write(escapedAttrib, strlen(escapedAttrib), &dummy);
5257
 
        nsCRT::free(escapedAttrib);
 
5257
        NS_Free(escapedAttrib);
5258
5258
    }
5259
5259
    return rv;
5260
5260
}
5318
5318
                            {
5319
5319
                                rv |= aStrm->Write(kQuoteStr, sizeof(kQuoteStr)-1, &dummy);
5320
5320
                            }
5321
 
                            nsCRT::free(escapedAttrib);
 
5321
                            NS_Free(escapedAttrib);
5322
5322
                            escapedAttrib = nsnull;
5323
5323
                        }
5324
5324
                    }
5325
5325
                }
5326
 
                nsCRT::free(attribute);
 
5326
                NS_Free(attribute);
5327
5327
                attribute = nsnull;
5328
5328
            }
5329
5329
        }