← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clutter-1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to clutter/clutter-text-buffer.c

  • Committer: Package Import Robot
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2014-03-26 11:51:28 UTC
  • mfrom: (1.5.1) (4.1.30 experimental)
  • Revision ID: package-import@ubuntu.com-20140326115128-timmbsde8734o6wz
Tags: 1.18.0-1
* New upstream release.
* debian/control.in:
  + Bump gtk-doc-tools build dependency.
  + Also break libcogl15.
  + Standards-Version is 3.9.5, no changes needed.
* debian/libclutter-1.0-0.symbols:
  + Drop a few symbols that were accidentally exported in the DSO because
    they had a clutter_ prefix but were not in the public headers.
  + Add one new symbol.
  + Drop unnecessary debian revisions from some symbols.
* debian/control.in,
  debian/rules,
  debian/libclutter-1.0-0.symbols:
  + Temporarily disable evdev input support. It was only enabled in 1.17.6-1
    in experimental and there is nothing using it yet, and I would like to
    wait a bit before uploading libinput to unstable as the ABI isn't stable
    yet.
* d/p/0001-wayland-Add-missing-CLUTTER_AVAILABLE-annotations.patch:
  + Add missing annotations so that a few symbols are exported in the DSO.

* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/clutter-text-buffer.c
81
81
  guint  normal_text_chars;
82
82
};
83
83
 
84
 
G_DEFINE_TYPE (ClutterTextBuffer, clutter_text_buffer, G_TYPE_OBJECT);
 
84
G_DEFINE_TYPE_WITH_PRIVATE (ClutterTextBuffer, clutter_text_buffer, G_TYPE_OBJECT)
85
85
 
86
86
/* --------------------------------------------------------------------------------
87
87
 * DEFAULT IMPLEMENTATIONS OF TEXT BUFFER
246
246
 */
247
247
 
248
248
static void
249
 
clutter_text_buffer_init (ClutterTextBuffer *buffer)
 
249
clutter_text_buffer_init (ClutterTextBuffer *self)
250
250
{
251
 
  ClutterTextBufferPrivate *pv;
252
 
 
253
 
  pv = buffer->priv = G_TYPE_INSTANCE_GET_PRIVATE (buffer, CLUTTER_TYPE_TEXT_BUFFER, ClutterTextBufferPrivate);
254
 
 
255
 
  pv->normal_text = NULL;
256
 
  pv->normal_text_chars = 0;
257
 
  pv->normal_text_bytes = 0;
258
 
  pv->normal_text_size = 0;
 
251
  self->priv = clutter_text_buffer_get_instance_private (self);
 
252
 
 
253
  self->priv->normal_text = NULL;
 
254
  self->priv->normal_text_chars = 0;
 
255
  self->priv->normal_text_bytes = 0;
 
256
  self->priv->normal_text_size = 0;
259
257
}
260
258
 
261
259
static void
337
335
  klass->inserted_text = clutter_text_buffer_real_inserted_text;
338
336
  klass->deleted_text = clutter_text_buffer_real_deleted_text;
339
337
 
340
 
  g_type_class_add_private (gobject_class, sizeof (ClutterTextBufferPrivate));
341
 
 
342
338
  /**
343
339
   * ClutterTextBuffer:text:
344
340
   *