← Back to branch summary

~ubuntu-branches/ubuntu/precise/gtk+2.0/precise-updates

« back to all changes in this revision

Viewing changes to gtk/gtkmenushell.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2011-07-20 12:31:52 UTC
  • Revision ID: james.westby@ubuntu.com-20110720123152-xxcdokip6dy256po
Tags: 2.24.5-0ubuntu6
https://launchpad.net/bugs/743265
* debian/patches/043_ubuntu_menu_proxy.patch:
  - Don't overwrite 'ubuntu-local' property when 'show-local' changes.
    LP: #743265

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/gtkmenushell.c
416
416
                   GParamSpec      *pspec,
417
417
                   GtkMenuShell    *shell)
418
418
{
419
 
  gboolean local;
420
 
 
421
 
  g_object_get (proxy,
422
 
                "show-local", &local,
423
 
                NULL);
424
 
 
425
 
  g_object_set (shell,
426
 
                "ubuntu-local", local,
427
 
                NULL);
 
419
  g_object_notify (shell, "ubuntu-local");
428
420
}
429
421
 
430
422
static void
493
485
      g_value_set_boolean (value, gtk_menu_shell_get_take_focus (menu_shell));
494
486
      break;
495
487
    case PROP_LOCAL:
496
 
      if (priv->proxy == NULL) {
 
488
      if (priv->proxy == NULL || ubuntu_menu_proxy_show_local (priv->proxy)) {
497
489
        local = TRUE;
498
490
      } else {
499
491
        local = priv->local;