← Back to branch summary

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

« back to all changes in this revision

Viewing changes to app/display/gimpdisplayshell-filter-dialog.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/display/gimpdisplayshell-filter-dialog.c
1
 
/* The GIMP -- an image manipulation program
 
1
/* GIMP - The GNU Image Manipulation Program
2
2
 * Copyright (C) 1999 Manish Singh
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
24
24
 
25
25
#include "display-types.h"
26
26
 
27
 
#include "core/gimpviewable.h"
 
27
#include "core/gimp.h"
 
28
#include "core/gimpimage.h"
28
29
 
29
30
#include "widgets/gimpcolordisplayeditor.h"
30
31
#include "widgets/gimphelp-ids.h"
62
63
gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
63
64
{
64
65
  ColorDisplayDialog *cdd;
 
66
  GimpImage          *image;
65
67
  GtkWidget          *editor;
66
68
 
67
69
  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
68
70
 
 
71
  image = shell->display->image;
 
72
 
69
73
  cdd = g_new0 (ColorDisplayDialog, 1);
70
74
 
71
75
  cdd->shell  = shell;
72
 
  cdd->dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (shell->gdisp->gimage),
 
76
  cdd->dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (image),
 
77
                                          gimp_get_user_context (image->gimp),
73
78
                                          _("Color Display Filters"),
74
79
                                          "gimp-display-filters",
75
80
                                          GIMP_STOCK_DISPLAY_FILTER,
83
88
 
84
89
                                          NULL);
85
90
 
 
91
  gtk_dialog_set_alternative_button_order (GTK_DIALOG (cdd->dialog),
 
92
                                           GTK_RESPONSE_OK,
 
93
                                           GTK_RESPONSE_CANCEL,
 
94
                                           -1);
 
95
 
86
96
  gtk_window_set_destroy_with_parent (GTK_WINDOW (cdd->dialog), TRUE);
87
97
 
88
98
  g_object_weak_ref (G_OBJECT (cdd->dialog), (GWeakNotify) g_free, cdd);