← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/gimp/gutsy

« back to all changes in this revision

Viewing changes to app/widgets/gimpundoeditor.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-09-30 18:06:49 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20070930180649-f647f0cxj32tgyn3
Tags: 2.4.0~rc3-1ubuntu1
* Resynchronized with Debian.
* 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:
  - 10_dont_show_wizard.patch: Unused, upstream doesn't call it anymore.
  - Use dh_icons.
* Disabled the print plugin, and removed the Conflicts/Replaces on
  gimp-print.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/widgets/gimpundoeditor.c
216
216
{
217
217
  GimpUndoEditor *editor = GIMP_UNDO_EDITOR (docked);
218
218
 
219
 
  parent_docked_iface->set_context (docked, context);
220
 
 
221
219
  if (editor->context)
222
220
    g_object_unref (editor->context);
223
221
 
226
224
  if (editor->context)
227
225
    g_object_ref (editor->context);
228
226
 
 
227
  /* This calls gimp_undo_editor_set_image(), so make sure that it
 
228
   * isn't called before editor->context has been initialized.
 
229
   */
 
230
  parent_docked_iface->set_context (docked, context);
 
231
 
229
232
  gimp_container_view_set_context (GIMP_CONTAINER_VIEW (editor->view),
230
233
                                   context);
231
234
}