← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gimp/oneiric

« back to all changes in this revision

Viewing changes to app/gui/gimpdbusservice-glue.h

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-08-31 10:24:10 UTC
  • mfrom: (1.1.21 upstream) (0.1.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090831102410-eqawgw6fhdyi91ee
Tags: 2.6.7-1ubuntu1
https://launchpad.net/bugs/419593
* Merge with Debian unstable (LP: #419593), remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + updated some strings for ubuntu
  - debian/rules:
    + updated translation templates
  - debian/control:
    + Drop webkit build dependency. gimp is the only thing pulling in webkit
      for the desktop CDs, and makes them explode. Without the webkit help
      browser plugin, help will just be displayed in the default browser.
* debian/patches/01_debian-gimprc.patch:
  - Updated
* debian/control:
  - Added a BZR link

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/gui/gimpdbusservice-glue.h
53
53
#endif /* !G_ENABLE_DEBUG */
54
54
 
55
55
 
56
 
/* BOOLEAN:STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.G6T2KU:1) */
 
56
/* BOOLEAN:STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.9Z8GXU:1) */
57
57
extern void dbus_glib_marshal_gimp_BOOLEAN__STRING_POINTER_POINTER (GClosure     *closure,
58
58
                                                                    GValue       *return_value,
59
59
                                                                    guint         n_param_values,
102
102
  g_value_set_boolean (return_value, v_return);
103
103
}
104
104
 
105
 
/* BOOLEAN:POINTER (/tmp/dbus-binding-tool-c-marshallers.G6T2KU:2) */
 
105
/* BOOLEAN:POINTER (/tmp/dbus-binding-tool-c-marshallers.9Z8GXU:2) */
106
106
extern void dbus_glib_marshal_gimp_BOOLEAN__POINTER (GClosure     *closure,
107
107
                                                     GValue       *return_value,
108
108
                                                     guint         n_param_values,