diff options
| -rw-r--r-- | eel/eel-editable-label.c | 4 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index e7c9813e..a3b6813b 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -1005,9 +1005,9 @@ eel_editable_label_ensure_layout (EelEditableLabel *label, if (label->font_desc != NULL) pango_layout_set_font_description (label->layout, label->font_desc); - #if PANGO_CHECK_VERSION (1, 44, 0) +#if PANGO_CHECK_VERSION (1, 44, 0) pango_attr_list_insert (tmp_attrs, pango_attr_insert_hyphens_new (FALSE)); - #endif +#endif pango_layout_set_attributes (label->layout, tmp_attrs); if (preedit_string) diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 8a11b154..008a9048 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -943,8 +943,8 @@ in_single_click_mode (void) /* Keep these for a bit while we work on performance of draw_or_measure_label_text. */ /* - #define PERFORMANCE_TEST_DRAW_DISABLE - #define PERFORMANCE_TEST_MEASURE_DISABLE +#define PERFORMANCE_TEST_DRAW_DISABLE +#define PERFORMANCE_TEST_MEASURE_DISABLE */ /* This gets the size of the layout from the position of the layout. @@ -1975,18 +1975,18 @@ create_label_layout (CajaIconCanvasItem *item, CajaIconContainer *container; EelCanvasItem *canvas_item; char *zeroified_text; - #if PANGO_CHECK_VERSION (1, 44, 0) +#if PANGO_CHECK_VERSION (1, 44, 0) PangoAttrList *attr_list; - #endif +#endif canvas_item = EEL_CANVAS_ITEM (item); container = CAJA_ICON_CONTAINER (canvas_item->canvas); context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas)); layout = pango_layout_new (context); - #if PANGO_CHECK_VERSION (1, 44, 0) +#if PANGO_CHECK_VERSION (1, 44, 0) attr_list = pango_attr_list_new (); - #endif +#endif zeroified_text = NULL; @@ -2036,10 +2036,10 @@ create_label_layout (CajaIconCanvasItem *item, pango_layout_set_spacing (layout, LABEL_LINE_SPACING); pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); - #if PANGO_CHECK_VERSION (1, 44, 0) +#if PANGO_CHECK_VERSION (1, 44, 0) pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE)); pango_layout_set_attributes (layout, attr_list); - #endif +#endif /* Create a font description */ if (container->details->font) @@ -2056,9 +2056,9 @@ create_label_layout (CajaIconCanvasItem *item, pango_layout_set_font_description (layout, desc); pango_font_description_free (desc); g_free (zeroified_text); - #if PANGO_CHECK_VERSION (1, 44, 0) +#if PANGO_CHECK_VERSION (1, 44, 0) pango_attr_list_unref (attr_list); - #endif +#endif return layout; } |