← Back to branch summary

~indicator-applet-developers/unity-gtk-module/trunk.14.04

« back to all changes in this revision

Viewing changes to lib/unity-gtk-menu-item.c

  • Committer: Tarmac
  • Author(s): William Hua
  • Date: 2013-12-13 17:03:55 UTC
  • mfrom: (309.1.1 1243974)
  • Revision ID: tarmac-20131213170355-xfwjh2k77v4zbapd
Fix regression on GtkRecentChooserMenus. (LP: #1243974). Fixes: https://bugs.launchpad.net/bugs/1243974.

Approved by Ted Gould, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/unity-gtk-menu-item.c
425
425
        {
426
426
          UnityGtkMenuShell *parent_shell = item->parent_shell;
427
427
 
428
 
          if (parent_shell != NULL && parent_shell->action_group != NULL)
429
 
            unity_gtk_action_group_connect_shell (parent_shell->action_group, item->child_shell);
 
428
          if (parent_shell != NULL)
 
429
            {
 
430
              if (parent_shell->action_group != NULL)
 
431
                unity_gtk_action_group_connect_shell (parent_shell->action_group, item->child_shell);
 
432
            }
 
433
          else
 
434
            g_warn_if_reached ();
430
435
        }
431
436
    }
432
437
 
563
568
}
564
569
 
565
570
void
 
571
unity_gtk_menu_item_activate (UnityGtkMenuItem *item)
 
572
{
 
573
  g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
 
574
  g_return_if_fail (item->parent_shell != NULL);
 
575
 
 
576
  unity_gtk_menu_shell_activate_item (item->parent_shell, item);
 
577
}
 
578
 
 
579
void
566
580
unity_gtk_menu_item_print (UnityGtkMenuItem *item,
567
581
                           guint             indent)
568
582
{