Revert "Merge branch 'fix-deadlocks' into 'master'"revert-1fedc11a

This reverts merge request !309

1 files changed, 2 insertions, 34 deletions

diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index fdc1e86a..e20b6413 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -228,22 +228,6 @@ typedef enum
  * @PANGO_UNDERLINE_ERROR_LINE: Like @PANGO_UNDERLINE_ERROR, but
  *     drawn continuously across multiple runs. This type
  *     of underlining is available since Pango 1.46.
- * @PANGO_UNDERLINE_SINGLE_DOTTED: a single, dotted underline. Since Pango 1.50.
- * @PANGO_UNDERLINE_DOUBLE_DOTTED: a double, dotted underline. Since Pango 1.50.
- * @PANGO_UNDERLINE_LOW_DOTTED: a single, dotted underline in the same
- *     position as for @PANGO_UNDERLINE_LOW. Since Pango 1.50.
- * @PANGO_UNDERLINE_SINGLE_LINE_DOTTED: a single, dotted underline, drawn
- *     continuously across multiple runs. Since Pango 1.50.
- * @PANGO_UNDERLINE_DOUBLE_LINE_DOTTED: a double, dotted underline, drawn
- *     continuously across multiple runs. Since Pango 1.50.
- * @PANGO_UNDERLINE_SINGLE_DASHED: a single, dashed underline. Since Pango 1.50.
- * @PANGO_UNDERLINE_DOUBLE_DASHED: a double, dashed underline. Since Pango 1.50.
- * @PANGO_UNDERLINE_LOW_DASHED: a single, dashed underline in the same
- *     position as for @PANGO_UNDERLINE_LOW. Since Pango 1.50.
- * @PANGO_UNDERLINE_SINGLE_LINE_DASHED: a single, dashed underline, drawn
- *     continuously across multiple runs. Since Pango 1.50.
- * @PANGO_UNDERLINE_DOUBLE_LINE_DASHED: a double, dashed underline, drawn
- *     continuously across multiple runs. Since Pango 1.50.
  *
  * The `PangoUnderline` enumeration is used to specify whether text
  * should be underlined, and if so, the type of underlining.
@@ -256,19 +240,7 @@ typedef enum {
   PANGO_UNDERLINE_ERROR,
   PANGO_UNDERLINE_SINGLE_LINE,
   PANGO_UNDERLINE_DOUBLE_LINE,
-  PANGO_UNDERLINE_ERROR_LINE,
-
-  PANGO_UNDERLINE_SINGLE_DOTTED,
-  PANGO_UNDERLINE_DOUBLE_DOTTED,
-  PANGO_UNDERLINE_LOW_DOTTED,
-  PANGO_UNDERLINE_SINGLE_LINE_DOTTED,
-  PANGO_UNDERLINE_DOUBLE_LINE_DOTTED,
-
-  PANGO_UNDERLINE_SINGLE_DASHED,
-  PANGO_UNDERLINE_DOUBLE_DASHED,
-  PANGO_UNDERLINE_LOW_DASHED,
-  PANGO_UNDERLINE_SINGLE_LINE_DASHED,
-  PANGO_UNDERLINE_DOUBLE_LINE_DASHED,
+  PANGO_UNDERLINE_ERROR_LINE
 } PangoUnderline;
 
 
@@ -277,8 +249,6 @@ typedef enum {
  * @PANGO_OVERLINE_NONE: no overline should be drawn
  * @PANGO_OVERLINE_SINGLE: Draw a single line above the ink
  *     extents of the text being underlined.
- * @PANGO_OVERLINE_SINGLE_DOTTED: A single, dotted line. Since Pango 1.50
- * @PANGO_OVERLINE_SINGLE_DASHED: A single, dashed line. Since Pango 1.50
  *
  * The `PangoOverline` enumeration is used to specify whether text
  * should be overlined, and if so, the type of line.
@@ -287,9 +257,7 @@ typedef enum {
  */
 typedef enum {
   PANGO_OVERLINE_NONE,
-  PANGO_OVERLINE_SINGLE,
-  PANGO_OVERLINE_SINGLE_DOTTED,
-  PANGO_OVERLINE_SINGLE_DASHED
+  PANGO_OVERLINE_SINGLE
 } PangoOverline;
 
 /**