← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

Viewing changes to src/libgdl/gdl-dock-object.h

  • Committer: Package Import Robot
  • Author(s): Alex Valavanis
  • Date: 2014-08-19 19:10:32 UTC
  • mfrom: (1.6.5) (2.5.14 sid)
  • Revision ID: package-import@ubuntu.com-20140819191032-2eca1qihaszjk9i6
Tags: 0.48.5-2ubuntu1
https://launchpad.net/bugs/1358863
https://launchpad.net/bugs/166371
https://launchpad.net/bugs/966441
https://launchpad.net/bugs/1051017
https://launchpad.net/bugs/1163241
https://launchpad.net/bugs/529843
https://launchpad.net/bugs/1090865
* Merge with Debian Unstable (LP: #1358863). Fixes several Ubuntu bugs:
  - Illustrator CS SVG won't load: namespace URIs in entities (LP: #166371)
  - inkscape crashed with SIGSEGV in
    sp_dtw_color_profile_event() (LP: #966441)
  - inkscape crashed with SIGSEGV (LP: #1051017)
  - inkscape crashed with SIGSEGV in Inkscape::Preferences::_getNode()
    (LP: #1163241)
  - save a copy reverts to save as (LP: #529843)
  - Extension to braille not working on Xubuntu 12.10 (LP: #1090865)
* Remaining changes:
  - debian/control:
    + Set Ubuntu Developer as maintainer,
    + build-depend on dh-translation to handle Ubuntu translation,
    + demote pstoedit from Recommends to Suggests (because it's in universe),
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation
* Drop debian/patches/librevenge.patch (superseded by
    debian/patches/0006-Update_to_new_libwpg.patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libgdl/gdl-dock-object.h
204
204
GType gdl_dock_param_get_type (void);
205
205
 
206
206
/* functions for setting/retrieving nick names for serializing GdlDockObject types */
207
 
G_CONST_RETURN gchar *gdl_dock_object_nick_from_type    (GType        type);
 
207
const gchar          *gdl_dock_object_nick_from_type    (GType        type);
208
208
GType                 gdl_dock_object_type_from_nick    (const gchar *nick);
209
209
GType                 gdl_dock_object_set_type_for_nick (const gchar *nick,
210
210
                                                         GType        type);
215
215
    G_STMT_START {                            \
216
216
    g_log (G_LOG_DOMAIN,                      \
217
217
           G_LOG_LEVEL_DEBUG,                 \
218
 
           "%s:%d (%s) %s [%p %d%s:%d]: "format, \
 
218
           "%s:%d (%s) %s [%p %d%s:%d]: " format, \
219
219
           __FILE__,                          \
220
220
           __LINE__,                          \
221
221
           __PRETTY_FUNCTION__,               \