gnome-panel-ubuntu/18_lockdown_lock_editor.patch

   1 Description: lockdown locks the menu editor entry too
   2 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=499148
   3 Bug-Ubuntu: https://bugs.launchpad.net/bugs/4712
   4
   5 Index: gnome-panel-2.30.0/gnome-panel/panel-menu-bar.c
   6 ===================================================================
   7 --- gnome-panel-2.30.0.orig/gnome-panel/panel-menu-bar.c        2010-03-05 03:20:12.000000000 +1100
   8 +++ gnome-panel-2.30.0/gnome-panel/panel-menu-bar.c     2010-06-03 13:58:03.123946697 +1000
   9 @@ -345,8 +345,9 @@
  10                                    _("_Help"),
  11                                    NULL);
  12
  13 -       if (panel_is_program_in_path ("alacarte") ||
  14 -           panel_is_program_in_path ("gmenu-simple-editor")) {
  15 +       if (!panel_lockdown_get_locked_down () &&
  16 +           (panel_is_program_in_path ("alacarte") ||
  17 +           panel_is_program_in_path ("gmenu-simple-editor"))) {
  18                 panel_applet_add_callback (menubar->priv->info,
  19                                            "edit",
  20                                            NULL,
  21 Index: gnome-panel-2.30.0/gnome-panel/panel-menu-button.c
  22 ===================================================================
  23 --- gnome-panel-2.30.0.orig/gnome-panel/panel-menu-button.c     2010-03-10 09:52:58.000000000 +1100
  24 +++ gnome-panel-2.30.0/gnome-panel/panel-menu-button.c  2010-06-03 13:58:03.123946697 +1000
  25 @@ -662,8 +662,9 @@
  26
  27         panel_applet_add_callback (info, "help", GTK_STOCK_HELP, _("_Help"), NULL);
  28
  29 -        if (panel_is_program_in_path ("alacarte") ||
  30 -           panel_is_program_in_path ("gmenu-simple-editor"))
  31 +        if (!panel_lockdown_get_locked_down () &&
  32 +           (panel_is_program_in_path ("alacarte") ||
  33 +           panel_is_program_in_path ("gmenu-simple-editor")))
  34                 panel_applet_add_callback (info, "edit", NULL,
  35                                            _("_Edit Menus"), NULL);
  36