Updating branch refs/heads/versioning-from-0.3-to-1 to ec8c2ced12d05a0e54ade145527e0d2fb752c36c (commit) from 9bb4e592eb7c04d7227292ab3eb59f47a5cb634c (commit)
commit ec8c2ced12d05a0e54ade145527e0d2fb752c36c Author: Jannis Pohlmann <jan...@xfce.org> Date: Thu Aug 13 16:26:10 2009 +0200 Drop ExoEllipsizedLabel entirely. docs/reference/exo-docs.sgml | 4 +- docs/reference/exo-sections.txt | 22 ----- docs/reference/exo.types | 2 - docs/reference/tmpl/exo-ellipsized-label.sgml | 69 -------------- exo/Makefile.am | 2 - exo/exo-ellipsized-label.c | 122 ------------------------- exo/exo-ellipsized-label.h | 73 --------------- exo/exo.h | 1 - python/exo.defs | 40 -------- 9 files changed, 2 insertions(+), 333 deletions(-) diff --git a/docs/reference/exo-docs.sgml b/docs/reference/exo-docs.sgml index 80863d6..e9696ed 100644 --- a/docs/reference/exo-docs.sgml +++ b/docs/reference/exo-docs.sgml @@ -28,7 +28,6 @@ <!ENTITY exo-utils SYSTEM "xml/exo-utils.xml"> <!ENTITY exo-hal SYSTEM "xml/exo-hal.xml"> <!ENTITY exo-xsession-client SYSTEM "xml/exo-xsession-client.xml"> -<!ENTITY exo-ellipsized-label SYSTEM "xml/exo-ellipsized-label.xml"> <!ENTITY exo-csource SYSTEM "exo-csource.xml"> @@ -323,10 +322,11 @@ &exo-csource; </part> + <!-- <part id="exo-deprecated-widgets"> <title>Deprecated widgets</title> - &exo-ellipsized-label; </part> + --> <chapter> <title>Visual Index</title> diff --git a/docs/reference/exo-sections.txt b/docs/reference/exo-sections.txt index e90e271..2f48f94 100644 --- a/docs/reference/exo-sections.txt +++ b/docs/reference/exo-sections.txt @@ -549,25 +549,3 @@ EXO_XSESSION_CLIENT_GET_CLASS <SUBSECTION Private> exo_xsession_client_get_type </SECTION> - - - -<SECTION> -<FILE>exo-ellipsized-label</FILE> -<TITLE>ExoEllipsizedLabel</TITLE> -ExoEllipsizedLabel -exo_ellipsized_label_new -exo_ellipsized_label_get_ellipsize -exo_ellipsized_label_set_ellipsize -<SUBSECTION Standard> -EXO_TYPE_ELLIPSIZED_LABEL -EXO_ELLIPSIZED_LABEL -EXO_ELLIPSIZED_LABEL_CLASS -EXO_IS_ELLIPSIZED_LABEL -EXO_IS_ELLIPSIZED_LABEL_CLASS -EXO_ELLIPSIZED_LABEL_GET_CLASS -<SUBSECTION Private> -exo_ellipsized_label_get_type -</SECTION> - - diff --git a/docs/reference/exo.types b/docs/reference/exo.types index 85fcafb..748af4a 100644 --- a/docs/reference/exo.types +++ b/docs/reference/exo.types @@ -20,5 +20,3 @@ exo_simple_job_get_type exo_xsession_client_get_type exo_md5_digest_get_type exo_mount_point_get_type - -exo_ellipsized_label_get_type diff --git a/docs/reference/tmpl/exo-ellipsized-label.sgml b/docs/reference/tmpl/exo-ellipsized-label.sgml deleted file mode 100644 index ea0e771..0000000 --- a/docs/reference/tmpl/exo-ellipsized-label.sgml +++ /dev/null @@ -1,69 +0,0 @@ -<!-- ##### SECTION Title ##### --> -ExoEllipsizedLabel - -<!-- ##### SECTION Short_Description ##### --> -A widget that automatically ellipsizes text - -<!-- ##### SECTION Long_Description ##### --> -<para> - #ExoEllipsizedLabel extends the standard #GtkLabel class present in - Gtk+ 2.4 with the ability to automatically ellipsize text with - "...". -</para> - -<para> - #ExoEllipsizedLabel automatically detects if its running with Gtk+ - 2.5 or above and uses the native ellipsizing support of Gtk+ 2.5 - or above in that case. So its safe to use #ExoEllipsizedLabel - with every Gtk+ version above 2.4. -</para> - -<para> - As of exo 0.3.1.8, #ExoEllipsizedLabel is deprecated and should not - be used in newly written code. Instead use #GtkLabel directly, which - supports the "ellipsize" property since GTK+ 2.6. -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> -<ulink url="http://developer.gnome.org/doc/API/2.0/gtk/GtkLabel.html" -type="http">GtkLabel</ulink>, <link linkend="exo-Extensions-to-Pango">Exo -Pango Extensions</link> -</para> - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### STRUCT ExoEllipsizedLabel ##### --> -<para> - The <structname>ExoEllipsizedLabel</structname> struct contains only private fields and should not be directly accessed. -</para> - - -<!-- ##### FUNCTION exo_ellipsized_label_new ##### --> -<para> - -</para> - -...@text: -...@returns: - - -<!-- ##### FUNCTION exo_ellipsized_label_get_ellipsize ##### --> -<para> - -</para> - -...@label: -...@returns: - - -<!-- ##### FUNCTION exo_ellipsized_label_set_ellipsize ##### --> -<para> - -</para> - -...@label: -...@ellipsize: - - diff --git a/exo/Makefile.am b/exo/Makefile.am index d43fc77..96ef214 100644 --- a/exo/Makefile.am +++ b/exo/Makefile.am @@ -15,7 +15,6 @@ libexo_headers = \ exo-binding.h \ exo-cell-renderer-ellipsized-text.h \ exo-cell-renderer-icon.h \ - exo-ellipsized-label.h \ exo-execute.h \ exo-gdk-pixbuf-extensions.h \ exo-gtk-extensions.h \ @@ -65,7 +64,6 @@ libexo_1_la_SOURCES = \ exo-cell-renderer-ellipsized-text.c \ exo-cell-renderer-icon.c \ exo-config.c \ - exo-ellipsized-label.c \ exo-execute.c \ exo-gdk-pixbuf-extensions.c \ exo-gtk-extensions.c \ diff --git a/exo/exo-ellipsized-label.c b/exo/exo-ellipsized-label.c deleted file mode 100644 index 2d78016..0000000 --- a/exo/exo-ellipsized-label.c +++ /dev/null @@ -1,122 +0,0 @@ -/* $Id$ */ -/*- - * Copyright (c) 2004-2006 os-cillation e.K. - * - * Written by Benedikt Meurer <be...@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-ellipsized-label.h> -#include <exo/exo-alias.h> - - - -GType -exo_ellipsized_label_get_type (void) -{ - GType type; - - /* check if ExoEllipsizedLabel is already registered */ - type = g_type_from_name ("ExoEllipsizedLabel"); - if (G_UNLIKELY (type == G_TYPE_INVALID)) - { - const GTypeInfo info = - { - sizeof (ExoEllipsizedLabelClass), - NULL, - NULL, - NULL, - NULL, - NULL, - sizeof (ExoEllipsizedLabel), - 0, - NULL, - NULL, - }; - - type = g_type_register_static (GTK_TYPE_LABEL, "ExoEllipsizedLabel", &info, 0); - } - - return type; -} - - - -/** - * exo_ellipsized_label_new: - * @text : The text of the label. - * - * Creates a new #ExoEllipsizedLabel with the given - * text inside it. You can pass %NULL to get an - * empty label widget. - * - * Return value: The new #ExoEllipsizedLabel. - * - * Deprecated: 0.3.1.8: Use #GtkLabel instead. - **/ -GtkWidget* -exo_ellipsized_label_new (const gchar *text) -{ - return gtk_label_new (text); -} - - - -/** - * exo_ellipsized_label_get_ellipsize: - * @label : An #ExoEllipsizedLabel. - * - * Returns the ellipsizing position of the @label. - * See exo_ellipsized_label_set_ellipsize(). - * - * Return value: An #PangoEllipsizeMode. - * - * Deprecated: 0.3.1.8: Use gtk_label_get_ellipsize() instead. - **/ -PangoEllipsizeMode -exo_ellipsized_label_get_ellipsize (ExoEllipsizedLabel *label) -{ - return gtk_label_get_ellipsize (GTK_LABEL (label)); -} - - - -/** - * exo_ellipsized_label_set_ellipsize: - * @label : An #ExoEllipsizedLabel. - * @ellipsize : An #PangoEllipsizeMode. - * - * Sets the mode used to ellipsize (add an ellipsis: "...") to the - * text if there is not enough space to render the entire string. - * - * Deprecated: 0.3.1.8: Use gtk_label_set_ellipsize() instead. - **/ -void -exo_ellipsized_label_set_ellipsize (ExoEllipsizedLabel *label, - PangoEllipsizeMode ellipsize) -{ - gtk_label_set_ellipsize (GTK_LABEL (label), ellipsize); -} - - - -#define __EXO_ELLIPSIZED_LABEL_C__ -#include <exo/exo-aliasdef.c> diff --git a/exo/exo-ellipsized-label.h b/exo/exo-ellipsized-label.h deleted file mode 100644 index b8f1ac0..0000000 --- a/exo/exo-ellipsized-label.h +++ /dev/null @@ -1,73 +0,0 @@ -/* $Id$ */ -/*- - * Copyright (c) 2004-2006 os-cillation e.K. - * - * Written by Benedikt Meurer <be...@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 - -/* ExoEllipsizedLabel is deprecated since 0.3.1.8. Use GtkLabel instead. */ -#ifndef EXO_DISABLE_DEPRECATED - -#ifndef __EXO_ELLIPSIZED_LABEL_H__ -#define __EXO_ELLIPSIZED_LABEL_H__ - -#include <gtk/gtk.h> - -G_BEGIN_DECLS - -#define EXO_TYPE_ELLIPSIZED_LABEL (exo_ellipsized_label_get_type ()) -#define EXO_ELLIPSIZED_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_ELLIPSIZED_LABEL, ExoEllipsizedLabel)) -#define EXO_ELLIPSIZED_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXO_TYPE_ELLIPSIZED_LABEL, ExoEllipsizedLabelClass)) -#define EXO_IS_ELLIPSIZED_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXO_TYPE_ELLIPSIZED_LABEL)) -#define EXO_IS_ELLIPSIZED_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXO_TYPE_ELLIPSIZED_LABEL)) -#define EXO_ELLIPSIZED_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EXO_TYPE_ELLIPSIZED_LABEL, ExoEllipsizedLabelClass)) - -typedef struct _ExoEllipsizedLabelPrivate ExoEllipsizedLabelPrivate; -typedef struct _ExoEllipsizedLabelClass ExoEllipsizedLabelClass; -typedef struct _ExoEllipsizedLabel ExoEllipsizedLabel; - -struct _ExoEllipsizedLabelClass -{ - /*< private >*/ - GtkLabelClass __parent__; -}; - -struct _ExoEllipsizedLabel -{ - /*< private >*/ - GtkLabel __parent__; - ExoEllipsizedLabelPrivate *priv; -}; - -GType exo_ellipsized_label_get_type (void) G_GNUC_CONST; - -GtkWidget *exo_ellipsized_label_new (const gchar *text) G_GNUC_MALLOC; - -PangoEllipsizeMode exo_ellipsized_label_get_ellipsize (ExoEllipsizedLabel *label); -void exo_ellipsized_label_set_ellipsize (ExoEllipsizedLabel *label, - PangoEllipsizeMode ellipsize); - -G_END_DECLS - -#endif /* !__EXO_ELLIPSIZED_LABEL_H__ */ - -#endif /* !EXO_DISABLE_DEPRECATED */ diff --git a/exo/exo.h b/exo/exo.h index d01e2c1..ee686cd 100644 --- a/exo/exo.h +++ b/exo/exo.h @@ -39,7 +39,6 @@ #include <exo/exo-binding.h> #include <exo/exo-cell-renderer-ellipsized-text.h> #include <exo/exo-cell-renderer-icon.h> -#include <exo/exo-ellipsized-label.h> #include <exo/exo-execute.h> #include <exo/exo-enum-types.h> #include <exo/exo-gdk-pixbuf-extensions.h> diff --git a/python/exo.defs b/python/exo.defs index a7dbeb8..94b7b02 100644 --- a/python/exo.defs +++ b/python/exo.defs @@ -14,13 +14,6 @@ (gtype-id "EXO_TYPE_CELL_RENDERER_ICON") ) -(define-object EllipsizedLabel - (in-module "Exo") - (parent "GtkLabel") - (c-name "ExoEllipsizedLabel") - (gtype-id "EXO_TYPE_ELLIPSIZED_LABEL") -) - (define-object IconBar (in-module "Exo") (parent "GtkContainer") @@ -144,39 +137,6 @@ -;; From ../exo/exo-ellipsized-label.h - -(define-function exo_ellipsized_label_get_type - (c-name "exo_ellipsized_label_get_type") - (return-type "GType") -) - -(define-function exo_ellipsized_label_new - (c-name "exo_ellipsized_label_new") - (is-constructor-of "ExoEllipsizedLabel") - (return-type "GtkWidget*") - (parameters - '("const-gchar*" "text") - ) -) - -(define-method get_ellipsize - (of-object "ExoEllipsizedLabel") - (c-name "exo_ellipsized_label_get_ellipsize") - (return-type "ExoPangoEllipsizeMode") -) - -(define-method set_ellipsize - (of-object "ExoEllipsizedLabel") - (c-name "exo_ellipsized_label_set_ellipsize") - (return-type "none") - (parameters - '("ExoPangoEllipsizeMode" "ellipsize") - ) -) - - - ;; From ../exo/exo-enum-types.h (define-function exo_icon_view_drop_position_get_type _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits