← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gimp/jaunty-security

« back to all changes in this revision

Viewing changes to app/menus/tool-options-menu.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2007-05-02 16:33:03 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070502163303-bvzhjzbpw8qglc4y
Tags: 2.3.16-1ubuntu1
* Resynchronized with Debian, remaining Ubuntu changes:
  - debian/rules: i18n magic.
* debian/control.in:
  - Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch,
  debian/patches/10_dont_show_wizard.patch: updated.
* debian/patches/04_composite-signedness.patch,
  debian/patches/05_add-letter-spacing.patch: dropped, used upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/menus/tool-options-menu.c
1
 
/* The GIMP -- an image manipulation program
 
1
/* GIMP - The GNU Image Manipulation Program
2
2
 * Copyright (C) 1995 Spencer Kimball and Peter Mattis
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
101
101
  context   = gimp_get_user_context (manager->gimp);
102
102
  tool_info = gimp_context_get_tool (context);
103
103
 
104
 
  if (! tool_info->options_presets)
 
104
  if (! tool_info->presets)
105
105
    return;
106
106
 
107
107
  merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (manager));
111
111
 
112
112
  tool_options_menu_update_presets (manager, merge_id, ui_path,
113
113
                                    "Save", "save",
114
 
                                    tool_info->options_presets);
 
114
                                    GIMP_CONTAINER (tool_info->presets));
115
115
 
116
116
  tool_options_menu_update_presets (manager, merge_id, ui_path,
117
117
                                    "Restore", "restore",
118
 
                                    tool_info->options_presets);
 
118
                                    GIMP_CONTAINER (tool_info->presets));
119
119
 
120
120
  tool_options_menu_update_presets (manager, merge_id, ui_path,
121
121
                                    "Rename", "rename",
122
 
                                    tool_info->options_presets);
 
122
                                    GIMP_CONTAINER (tool_info->presets));
123
123
 
124
124
  tool_options_menu_update_presets (manager, merge_id, ui_path,
125
125
                                    "Delete", "delete",
126
 
                                    tool_info->options_presets);
 
126
                                    GIMP_CONTAINER (tool_info->presets));
127
127
 
128
128
  gtk_ui_manager_ensure_update (GTK_UI_MANAGER (manager));
129
129
}