← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gimp/karmic-security

« back to all changes in this revision

Viewing changes to app/widgets/gimpfontselect.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-10-06 13:30:41 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20081006133041-axco233xt49jobn7
Tags: 2.6.0-1ubuntu1
https://launchpad.net/bugs/276839
* Sync on debian and new version (lp: #276839)
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch:
  - updated some strings for ubuntu
* debian/rules:
  - updated translation templates

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/widgets/gimpfontselect.c
40
40
#include "gimpfontview.h"
41
41
 
42
42
 
43
 
static GObject     * gimp_font_select_constructor  (GType          type,
44
 
                                                    guint          n_params,
 
43
static GObject     * gimp_font_select_constructor  (GType           type,
 
44
                                                    guint           n_params,
45
45
                                                    GObjectConstructParam *params);
46
46
 
47
 
static GValueArray * gimp_font_select_run_callback (GimpPdbDialog *dialog,
48
 
                                                    GimpObject    *object,
49
 
                                                    gboolean       closing);
 
47
static GValueArray * gimp_font_select_run_callback (GimpPdbDialog  *dialog,
 
48
                                                    GimpObject     *object,
 
49
                                                    gboolean        closing,
 
50
                                                    GError        **error);
50
51
 
51
52
 
52
53
G_DEFINE_TYPE (GimpFontSelect, gimp_font_select, GIMP_TYPE_PDB_DIALOG)
100
101
}
101
102
 
102
103
static GValueArray *
103
 
gimp_font_select_run_callback (GimpPdbDialog *dialog,
104
 
                               GimpObject    *object,
105
 
                               gboolean       closing)
 
104
gimp_font_select_run_callback (GimpPdbDialog  *dialog,
 
105
                               GimpObject     *object,
 
106
                               gboolean        closing,
 
107
                               GError        **error)
106
108
{
107
109
  return gimp_pdb_execute_procedure_by_name (dialog->pdb,
108
110
                                             dialog->caller_context,
109
 
                                             NULL,
 
111
                                             NULL, error,
110
112
                                             dialog->callback_name,
111
113
                                             G_TYPE_STRING,   object->name,
112
114
                                             GIMP_TYPE_INT32, closing,