[Xfce4-commits] <exo:versioning-from-0.3-to-1> Drop ExoPangoEllipsizeMode and related functions.
Jannis Pohlmann
jannis at xfce.org
Thu Aug 13 16:56:01 CEST 2009
Updating branch refs/heads/versioning-from-0.3-to-1
to 28e7f49b8864163aacf764b21d07592a14072a45 (commit)
from 7ba2f84774dbf69f669cc6677cae10d382c6b66d (commit)
commit 28e7f49b8864163aacf764b21d07592a14072a45
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 16:54:36 2009 +0200
Drop ExoPangoEllipsizeMode and related functions.
docs/reference/exo-docs.sgml | 2 -
docs/reference/exo-sections.txt | 13 ----
docs/reference/tmpl/exo-pango-extensions.sgml | 43 --------------
exo/Makefile.am | 2 -
exo/exo-pango-extensions.c | 78 -------------------------
exo/exo-pango-extensions.h | 58 ------------------
exo/exo.h | 1 -
exo/exo.symbols | 8 ---
python/exo.defs | 4 -
9 files changed, 0 insertions(+), 209 deletions(-)
diff --git a/docs/reference/exo-docs.sgml b/docs/reference/exo-docs.sgml
index 85a318d..144d735 100644
--- a/docs/reference/exo-docs.sgml
+++ b/docs/reference/exo-docs.sgml
@@ -17,7 +17,6 @@
<!ENTITY exo-gdk-pixbuf-extensions SYSTEM "xml/exo-gdk-pixbuf-extensions.xml">
<!ENTITY exo-gobject-extensions SYSTEM "xml/exo-gobject-extensions.xml">
<!ENTITY exo-gtk-extensions SYSTEM "xml/exo-gtk-extensions.xml">
-<!ENTITY exo-pango-extensions SYSTEM "xml/exo-pango-extensions.xml">
<!ENTITY exo-config SYSTEM "xml/exo-config.xml">
<!ENTITY exo-binding SYSTEM "xml/exo-binding.xml">
<!ENTITY exo-execute SYSTEM "xml/exo-execute.xml">
@@ -293,7 +292,6 @@
&exo-gdk-pixbuf-extensions;
&exo-gobject-extensions;
&exo-gtk-extensions;
- &exo-pango-extensions;
</part>
<part id="exo-miscelleanous">
diff --git a/docs/reference/exo-sections.txt b/docs/reference/exo-sections.txt
index 76f7994..71dc1fa 100644
--- a/docs/reference/exo-sections.txt
+++ b/docs/reference/exo-sections.txt
@@ -400,19 +400,6 @@ exo_gtk_file_chooser_add_thumbnail_preview
</SECTION>
<SECTION>
-<FILE>exo-pango-extensions</FILE>
-<TITLE>Extensions to Pango</TITLE>
-ExoPangoEllipsizeMode
-exo_pango_layout_set_text_ellipsized
-<SUBSECTION Standard>
-EXO_TYPE_PANGO_ELLIPSIZE_MODE
-<SUBSECTION Private>
-exo_pango_ellipsize_mode_get_type
-</SECTION>
-
-
-
-<SECTION>
<FILE>exo-config</FILE>
<TITLE>Version Information</TITLE>
exo_major_version
diff --git a/docs/reference/tmpl/exo-pango-extensions.sgml b/docs/reference/tmpl/exo-pango-extensions.sgml
deleted file mode 100644
index bd71005..0000000
--- a/docs/reference/tmpl/exo-pango-extensions.sgml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Extensions to Pango
-
-<!-- ##### SECTION Short_Description ##### -->
-Miscelleanous extensions to the Pango library
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
- This facility provides ellipsizing support functions for Pango 1.4 and below. If its build against Pango 1.6 or
- above, it uses the ellipsizing functionality provided by Pango, else its emulated in libexo.
-</para>
-
-<para>
- It is deprecated as of version 0.3.1.8. Use the Pango 1.6 functions directly.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
- <ulink url="http://developer.gnome.org/doc/API/2.0/pango/" type="http">Pango Reference Manual</ulink>, <link
- linkend="ExoEllipsizedLabel">ExoEllipsizedLabel</link>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### TYPEDEF ExoPangoEllipsizeMode ##### -->
-<para>
- Use #PangoEllipsizeMode instead.
-</para>
-
-
-<!-- ##### FUNCTION exo_pango_layout_set_text_ellipsized ##### -->
-<para>
-
-</para>
-
- at layout:
- at string:
- at width:
- at mode:
- at Returns:
-
-
diff --git a/exo/Makefile.am b/exo/Makefile.am
index 1fa8739..187788d 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -25,7 +25,6 @@ libexo_headers = \
exo-job.h \
exo-simple-job.h \
exo-mount-point.h \
- exo-pango-extensions.h \
exo-string.h \
exo-toolbars-editor-dialog.h \
exo-toolbars-editor.h \
@@ -76,7 +75,6 @@ libexo_1_la_SOURCES = \
exo-job.h \
exo-simple-job.c \
exo-mount-point.c \
- exo-pango-extensions.c \
exo-private.c \
exo-private.h \
exo-string.c \
diff --git a/exo/exo-pango-extensions.c b/exo/exo-pango-extensions.c
deleted file mode 100644
index e0f28c2..0000000
--- a/exo/exo-pango-extensions.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2004-2006 os-cillation e.K.
- * Copyright (c) 2000 Anders Carlsson <andersca at gnu.org>
- *
- * Written by Benedikt Meurer <benny at xfce.org>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <exo/exo-pango-extensions.h>
-#include <exo/exo-alias.h>
-
-
-
-GType
-exo_pango_ellipsize_mode_get_type (void)
-{
- return pango_ellipsize_mode_get_type ();
-}
-
-
-
-/**
- * exo_pango_layout_set_text_ellipsized:
- * @layout : A #PangoLayout.
- * @string : The string to ellipsize.
- * @width : The maximal width for the @layout.
- * @mode : The ellipsize mode.
- *
- * Truncates a string if required to fit in @width and sets it on the
- * layout. Truncation involves removing characters from the start, middle or end
- * respectively and replacing them with "...". Algorithm is a bit
- * fuzzy, won't work 100%.
- *
- * Return value: %TRUE if @string had to be ellipsized to fit into @width, else
- * %FALSE.
- *
- * Deprecated: 0.3.1.8: Use pango_layout_set_ellipsize() instead.
- **/
-gboolean
-exo_pango_layout_set_text_ellipsized (PangoLayout *layout,
- const gchar *string,
- gint width,
- PangoEllipsizeMode mode)
-{
- g_return_val_if_fail (PANGO_IS_LAYOUT (layout), FALSE);
- g_return_val_if_fail (string != NULL, FALSE);
- g_return_val_if_fail (width >= 0, FALSE);
-
- pango_layout_set_text (layout, string, -1);
- pango_layout_set_width (layout, PANGO_SCALE * width);
- pango_layout_set_ellipsize (layout, mode);
-
- return (mode != EXO_PANGO_ELLIPSIZE_NONE);
-}
-
-
-
-#define __EXO_PANGO_EXTENSIONS_C__
-#include <exo/exo-aliasdef.c>
diff --git a/exo/exo-pango-extensions.h b/exo/exo-pango-extensions.h
deleted file mode 100644
index 03f3e93..0000000
--- a/exo/exo-pango-extensions.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2004-2006 os-cillation e.K.
- * Copyright (c) 2000 Anders Carlsson <andersca at gnu.org>
- *
- * Written by Benedikt Meurer <benny at xfce.org>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (EXO_INSIDE_EXO_H) && !defined (EXO_COMPILATION)
-#error "Only <exo/exo.h> can be included directly, this file may disappear or change contents."
-#endif
-
-/* Deprecated since 0.3.1.8, since Pango supports ellipsizing now. */
-#ifndef EXO_DISABLE_DEPRECATED
-
-#ifndef __EXO_PANGO_EXTENSIONS_H__
-#define __EXO_PANGO_EXTENSIONS_H__
-
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-/* define ExoPangoEllipsizeMode for backward compatibility */
-typedef PangoEllipsizeMode ExoPangoEllipsizeMode;
-
-#define EXO_PANGO_ELLIPSIZE_NONE PANGO_ELLIPSIZE_NONE
-#define EXO_PANGO_ELLIPSIZE_START PANGO_ELLIPSIZE_START
-#define EXO_PANGO_ELLIPSIZE_MIDDLE PANGO_ELLIPSIZE_MIDDLE
-#define EXO_PANGO_ELLIPSIZE_END PANGO_ELLIPSIZE_END
-
-#define EXO_TYPE_PANGO_ELLIPSIZE_MODE (exo_pango_ellipsize_mode_get_type ())
-GType exo_pango_ellipsize_mode_get_type (void) G_GNUC_CONST;
-
-gboolean exo_pango_layout_set_text_ellipsized (PangoLayout *layout,
- const gchar *string,
- gint width,
- PangoEllipsizeMode mode);
-
-G_END_DECLS
-
-#endif /* !__EXO_PANGO_EXTENSIONS_H__ */
-
-#endif /* !EXO_DISABLE_DEPRECATED */
diff --git a/exo/exo.h b/exo/exo.h
index 2857fc3..de05b69 100644
--- a/exo/exo.h
+++ b/exo/exo.h
@@ -49,7 +49,6 @@
#include <exo/exo-icon-view.h>
#include <exo/exo-job.h>
#include <exo/exo-mount-point.h>
-#include <exo/exo-pango-extensions.h>
#include <exo/exo-simple-job.h>
#include <exo/exo-string.h>
#include <exo/exo-toolbars-editor.h>
diff --git a/exo/exo.symbols b/exo/exo.symbols
index 0dbed04..f4ec851 100644
--- a/exo/exo.symbols
+++ b/exo/exo.symbols
@@ -253,14 +253,6 @@ exo_atomic_dec
#endif
#endif
-/* exo-pango-extensions functions */
-#if IN_HEADER(__EXO_PANGO_EXTENSIONS_H__)
-#if IN_SOURCE(__EXO_PANGO_EXTENSIONS_C__)
-exo_pango_ellipsize_mode_get_type G_GNUC_CONST
-exo_pango_layout_set_text_ellipsized
-#endif
-#endif
-
/* exo-string functions */
#if IN_HEADER(__EXO_STRING_H__)
#if IN_SOURCE(__EXO_STRING_C__)
diff --git a/python/exo.defs b/python/exo.defs
index 94b7b02..c326789 100644
--- a/python/exo.defs
+++ b/python/exo.defs
@@ -144,10 +144,6 @@
(return-type "GType")
)
-(define-function exo_pango_ellipsize_mode_get_type
- (c-name "exo_pango_ellipsize_mode_get_type")
- (return-type "GType")
-)
(define-function exo_toolbars_model_flags_get_type
(c-name "exo_toolbars_model_flags_get_type")
More information about the Xfce4-commits
mailing list