~ubuntu-branches/ubuntu/natty/glibmm2.4/natty

« back to all changes in this revision

Viewing changes to glib/src/markup.ccg

  • Committer: Bazaar Package Importer
  • Author(s): Deng Xiyue, Emilio Pozuelo Monfort, Deng Xiyue
  • Date: 2011-04-13 10:05:51 UTC
  • mfrom: (1.2.60 upstream) (2.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110413100551-xpgn8334oo6b901k
Tags: 2.28.0-1
[ Emilio Pozuelo Monfort ]
* debian/control.in,
  debian/rules:
  + Remove the chrpath hack, it's been fixed in libtool.

[ Deng Xiyue ]
* New upstream bugfix release.  (Closes: #621856)
  + debian/control.in:
    + Update GLib dependency to >= 2.28.0
  + debian/rules:
    + Update SHVER to 2.28.0 due to new API.
  + debian/libglibmm-2.4-dev.install:
    + Stop shipping /usr/share/glibmm-2.4, no longer exists.
* debian/control.in:
  + Update Standard-Version to 3.9.1.
* Convert to source format 3.0 (quilt):
  + debian/source/format: added.
  + debian/rules: drop simple-patchsys.mk

Show diffs side-by-side

added added

removed removed

Lines of Context:
286
286
Glib::ustring ParseContext::get_element() const
287
287
{
288
288
  const char *const element_name = g_markup_parse_context_get_element(gobject_);
289
 
  return (element_name) ? Glib::ustring(element_name) : Glib::ustring();
 
289
  return convert_const_gchar_ptr_to_ustring(element_name);
290
290
}
291
291
 
292
292
int ParseContext::get_line_number() const