← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libdbusmenu/lucid

« back to all changes in this revision

Viewing changes to libdbusmenu-glib/client.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2009-09-17 11:29:40 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090917112940-dfcpwhl8ocwfrvsy
Tags: 0.1.4-0ubuntu1
https://launchpad.net/bugs/432003
https://launchpad.net/bugs/427819
* Upstream release (LP: #432003)
  - Applying a fix by not blocking if we're calling for the root.  Everyone 
    should be listening for root changes anyway (lp: #427819)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdbusmenu-glib/client.c
803
803
                return NULL;
804
804
        }
805
805
 
 
806
#if 0
 
807
/* Seems to be a bug in dbus-glib that assert here, I think because
 
808
   multiple people try and grab it.  We're going to comment this out
 
809
   for now as everyone should be listening to the root changed signal
 
810
   anyway. */
806
811
        if (priv->layoutcall != NULL) {
807
812
                /* Will end the current call and block on it's completion */
808
813
                update_layout_cb(priv->propproxy, priv->layoutcall, client);
809
814
        }
 
815
#endif
810
816
 
811
817
        return priv->root;
812
818
}