[gtk+] Revert "pango: Handle case where pango_layout_get_text() returns NULL"



commit 6d344b2c6b8e9a17870e36f5bd7106cb73758d15
Author: Benjamin Otte <otte redhat com>
Date:   Mon Sep 9 17:19:28 2013 +0200

    Revert "pango: Handle case where pango_layout_get_text() returns NULL"
    
    This reverts commit 70ac2b24c3d400c854d8a9e0937afa076f9dbe7f.
    
    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.

 gtk/gtkpango.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index ea688ea..40c94f3 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]