← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firefox/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/globalmenu/components/src/uGlobalMenu.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2011-08-01 20:41:31 UTC
  • mfrom: (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110801204131-4liom0bx36zg4hwm
Tags: 6.0~b4+build1+nobinonly-0ubuntu1
https://launchpad.net/bugs/810489
https://launchpad.net/bugs/800733
* New upstream release from the beta channel (FIREFOX_6_0b4_BUILD1)

* Update globalmenu-extension to 1.8
  - Update for imgILoader changes in Firefox 8
  - Fix LP: #810489 - Inconsistent behaviour if extension is enabled
    after turning off the menubar, which will affect Lucid -> P upgrades
    once Lucid has a newer Firefox. document.loadOverlay() triggers a reload
    of localstore.rdf, which overwrites our changes to the UI to hide
    the Firefox button and bookmark button. Restore them when this happens
  - Fix LP: #800733 - Quick Filter Bar checkbox in Thunderbird menu is
    not marked as checked. On menuitems with command nodes, ensure we update
    the state on the correct node
  - Ensure we disconnect all signal handlers when a menu is destroyed.
    Should fix a SIGSEGV in uGlobalMenu::OnClose()
* Drop a distro pref that should have gone a long time ago
  - update debian/vendor.js
* Remove patches fixed upstream
  - remove debian/patches/change-opt-back-to-Os.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/globalmenu/components/src/uGlobalMenu.cpp
207
207
  if (doc) {
208
208
#if MOZILLA_BRANCH_MAJOR_VERSION >= 6
209
209
    nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(doc);
 
210
#else
 
211
    nsCOMPtr<nsIDOMDocumentEvent> domDoc = do_QueryInterface(doc);
 
212
#endif
210
213
    if (domDoc) {
211
214
      nsCOMPtr<nsIDOMEvent> event;
212
215
      domDoc->CreateEvent(NS_LITERAL_STRING("mouseevent"),
213
216
                          getter_AddRefs(event));
214
 
#else
215
 
    nsCOMPtr<nsIDOMDocumentEvent> docEvent = do_QueryInterface(doc);
216
 
    if (docEvent) {
217
 
      nsCOMPtr<nsIDOMEvent> event;
218
 
      docEvent->CreateEvent(NS_LITERAL_STRING("mouseevent"),
219
 
                            getter_AddRefs(event));
220
 
#endif
221
217
      if (event) {
222
218
        nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(event);
223
219
        if (mouseEvent) {
275
271
  if (doc) {
276
272
#if MOZILLA_BRANCH_MAJOR_VERSION >= 6
277
273
    nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(doc);
 
274
#else
 
275
    nsCOMPtr<nsIDOMDocumentEvent> domDoc = do_QueryInterface(doc);
 
276
#endif
278
277
    if (domDoc) {
279
278
      nsCOMPtr<nsIDOMEvent> event;
280
279
      domDoc->CreateEvent(NS_LITERAL_STRING("mouseevent"),
281
280
                          getter_AddRefs(event));
282
 
#else
283
 
    nsCOMPtr<nsIDOMDocumentEvent> docEvent = do_QueryInterface(doc);
284
 
    if (docEvent) {
285
 
      nsCOMPtr<nsIDOMEvent> event;
286
 
      docEvent->CreateEvent(NS_LITERAL_STRING("mouseevent"),
287
 
                            getter_AddRefs(event));
288
 
#endif
289
281
      if (event) {
290
282
        nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(event);
291
283
        if (mouseEvent) {
333
325
  if (doc) {
334
326
#if MOZILLA_BRANCH_MAJOR_VERSION >= 6
335
327
    nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(doc);
 
328
#else
 
329
    nsCOMPtr<nsIDOMDocumentEvent> domDoc = do_QueryInterface(doc);
 
330
#endif
336
331
    if (domDoc) {
337
332
      nsCOMPtr<nsIDOMEvent> event;
338
333
      domDoc->CreateEvent(NS_LITERAL_STRING("mouseevent"),
339
334
                          getter_AddRefs(event));
340
 
#else
341
 
    nsCOMPtr<nsIDOMDocumentEvent> docEvent = do_QueryInterface(doc);
342
 
    if (docEvent) {
343
 
      nsCOMPtr<nsIDOMEvent> event;
344
 
      docEvent->CreateEvent(NS_LITERAL_STRING("mouseevent"),
345
 
                            getter_AddRefs(event));
346
 
#endif
347
335
      if (event) {
348
336
        nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(event);
349
337
        if (mouseEvent) {
619
607
 
620
608
  if (mDbusMenuItem) {
621
609
    g_signal_handler_disconnect(mDbusMenuItem, mOpenHandlerID);
 
610
    g_signal_handler_disconnect(mDbusMenuItem, mEventHandlerID);
622
611
    g_object_unref(mDbusMenuItem);
623
612
  }
624
613