Commit 6d344b2c authored by Benjamin Otte's avatar Benjamin Otte

Revert "pango: Handle case where pango_layout_get_text() returns NULL"

This reverts commit 70ac2b24.

It turns out the correct fix is to make pango_layout_get_text() not
return NULL. This has been done, so we can drop this patch.

I won't bump the Pango dependency in configure.ac for this as I don't
consider the crash critical enough.
parent 70ac2b24
......@@ -1014,7 +1014,7 @@ _gtk_pango_get_text_before (PangoLayout *layout,
text = pango_layout_get_text (layout);
if (text == NULL || text[0] == 0)
if (text[0] == 0)
{
*start_offset = 0;
*end_offset = 0;
......@@ -1115,7 +1115,7 @@ _gtk_pango_get_text_after (PangoLayout *layout,
text = pango_layout_get_text (layout);
if (text == NULL || text[0] == 0)
if (text[0] == 0)
{
*start_offset = 0;
*end_offset = 0;
......@@ -1222,7 +1222,7 @@ _gtk_pango_get_text_at (PangoLayout *layout,
text = pango_layout_get_text (layout);
if (text == NULL || text[0] == 0)
if (text[0] == 0)
{
*start_offset = 0;
*end_offset = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment