← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gimp/intrepid-updates

« back to all changes in this revision

Viewing changes to app/plug-in/plug-in-menu-path.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-11-21 17:39:07 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20071121173907-od54p9hdtvn5frl0
Tags: 2.4.1-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes.
  - Weave i18n magic in the rules file.
  - Munge Maintainer field as per spec.
* Ubuntu changes dropped:
  - Apply patch from upstream (SVN r23659) that corrects the image
    disappearing for large images at 150% zoom.
  - Symlink doc directories to avoid duplicate files, CDBS does this for
    us.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/plug-in/plug-in-menu-path.c
42
42
{
43
43
#ifndef ENABLE_TOOLBOX_MENU
44
44
  { "<Toolbox>/Xtns", "<Image>/Xtns" },
45
 
  { "<Toolbox>/Help", "<Image>/Help" }
 
45
  { "<Toolbox>/Help", "<Image>/Help" },
46
46
#endif /* ENABLE_TOOLBOX_MENU */
 
47
  { NULL, NULL                       }
47
48
};
48
49
 
49
50
 
50
51
gchar *
51
52
plug_in_menu_path_map (const gchar *menu_path)
52
53
{
53
 
  gint i;
 
54
  const MenuPathMapping *mapping;
54
55
 
55
56
  g_return_val_if_fail (menu_path != NULL, NULL);
56
57
 
57
 
  for (i = 0; i < G_N_ELEMENTS (menu_path_mappings); i++)
 
58
  for (mapping = menu_path_mappings; mapping->orig_path; mapping++)
58
59
    {
59
 
      const MenuPathMapping *mapping = &menu_path_mappings[i];
60
 
 
61
60
      if (g_str_has_prefix (menu_path, mapping->orig_path))
62
61
        {
63
62
          gint   orig_len = strlen (mapping->orig_path);