[Xfce4-commits] <exo:master> Rename exo-0.3 to exo-1. Merge versioning-from-0.3-to-1 branch.
Jannis Pohlmann
jannis at xfce.org
Sat Aug 15 23:58:01 CEST 2009
Updating branch refs/heads/master
to 46ee5ce1284231ce6437e4465b54337dad0393e7 (commit)
from 4c725114b766723232351bfb39f453d94cf8d631 (commit)
commit 46ee5ce1284231ce6437e4465b54337dad0393e7
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Sat Aug 15 23:50:09 2009 +0200
Rename exo-0.3 to exo-1. Merge versioning-from-0.3-to-1 branch.
commit c9b8d885c034022ae7cbaba91f17ffc15b5608ea
Author: Nick Schermer <nick at xfce.org>
Date: Fri Aug 14 22:59:00 2009 +0200
Cleanup some unneeded Gtk or Glib version checks.
commit 6a9b850134897ea57830de53dce38d6abb510193
Author: Nick Schermer <nick at xfce.org>
Date: Fri Aug 14 22:52:34 2009 +0200
Move some private binding struts out of the header.
commit 5ba0cb5e14b1e89f94c9e1a3fa9763dc57220249
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 17:16:47 2009 +0200
Remove exo_icon_view_{set,get}_{text,markup,pixbuf}_column() functions.
commit 28e7f49b8864163aacf764b21d07592a14072a45
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 16:54:36 2009 +0200
Drop ExoPangoEllipsizeMode and related functions.
commit 7ba2f84774dbf69f669cc6677cae10d382c6b66d
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 16:49:00 2009 +0200
Remove exo_md5_*() functions and ExoMd5Digest. There's GChecksum now.
commit 0d7c388f8875a32d902cd94ca492787c812121d4
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 16:40:57 2009 +0200
Remove exo_intern_string() and exo_intern_static_string().
commit 796215a00b477d8ad10fd5a3d1c6b575739ef2ba
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 16:31:55 2009 +0200
Remove ExoEllipsizedLabel from exo.symbols.
commit ec8c2ced12d05a0e54ade145527e0d2fb752c36c
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 16:26:10 2009 +0200
Drop ExoEllipsizedLabel entirely.
commit 9bb4e592eb7c04d7227292ab3eb59f47a5cb634c
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 15:39:50 2009 +0200
Drop exo_gtk_object_ref_sink and exo_gtk_radio_action_set_current_value.
This is part of bug #5671, which is about dropping deprecated/obsolete
bits from exo before we switch from exo-0.3 to exo-1.
commit 79ce003347ba5e4bb32a9f3c2cd93739fc07a0f3
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 02:10:39 2009 +0200
Make Python bindings work again. pyexo.require('0.3') works with exo-1.
commit 1793ad0e2fc2a2407f5babfc3c6464bd4cf4c250
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 01:26:33 2009 +0200
Rename 0.3 to 1 in even more places. Python module might not work.
commit 2de4f022e76541549f2c7a1e1e41116b8da98e2c
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 00:09:35 2009 +0200
Switch from exo-0.3 to exo-1 (library and command names).
I might have missed a few spots. This is not tested yet.
INSTALL | 107 +++-
configure.in.in | 13 +-
docs/reference/Makefile.am | 2 +-
docs/reference/exo-docs.sgml | 8 +-
docs/reference/exo-sections.txt | 63 ---
docs/reference/exo.types | 3 -
docs/reference/tmpl/exo-ellipsized-label.sgml | 69 ---
docs/reference/tmpl/exo-gtk-extensions.sgml | 18 -
docs/reference/tmpl/exo-hal.sgml | 2 +-
docs/reference/tmpl/exo-icon-bar.sgml | 2 +-
docs/reference/tmpl/exo-icon-view.sgml | 54 --
docs/reference/tmpl/exo-md5.sgml | 99 ----
docs/reference/tmpl/exo-pango-extensions.sgml | 43 --
docs/reference/tmpl/exo-string.sgml | 20 +-
exo-desktop-item-edit/Makefile.am | 4 +-
exo-hal/Makefile.am | 14 +-
exo-hal/{exo-hal-0.3.pc.in => exo-hal-1.pc.in} | 0
exo-helper/Makefile.am | 14 +-
exo-helper/exo-helper-chooser.c | 4 +-
exo-helper/helpers/Makefile.am | 4 +-
exo-helper/helpers/balsa.desktop.in.in | 2 +-
exo-helper/helpers/evolution.desktop.in.in | 2 +-
.../{exo-compose-mail-0.3 => exo-compose-mail-1} | 6 +-
exo-helper/helpers/kmail.desktop.in.in | 2 +-
exo-helper/helpers/mozilla-mailer.desktop.in.in | 2 +-
exo-helper/helpers/mutt.desktop.in.in | 2 +-
exo-helper/helpers/sylpheed-claws.desktop.in.in | 2 +-
exo-helper/helpers/sylpheed.desktop.in.in | 2 +-
exo-helper/helpers/thunderbird.desktop.in.in | 2 +-
exo-helper/main.c | 5 +-
exo-mount-notify/Makefile.am | 10 +-
exo-mount/Makefile.am | 8 +-
exo-open/Makefile.am | 2 +-
exo/Makefile.am | 20 +-
exo/{exo-0.3.pc.in => exo-1.pc.in} | 0
exo/exo-binding.c | 37 ++-
exo/exo-binding.h | 34 +--
exo/exo-cell-renderer-ellipsized-text.c | 19 -
exo/exo-config.h.in | 23 +-
exo/exo-ellipsized-label.c | 122 -----
exo/exo-ellipsized-label.h | 73 ---
exo/exo-gtk-extensions.c | 84 +---
exo/exo-gtk-extensions.h | 5 -
exo/exo-icon-view.c | 212 --------
exo/exo-icon-view.h | 12 -
exo/exo-md5.c | 551 --------------------
exo/exo-md5.h | 60 ---
exo/exo-pango-extensions.c | 78 ---
exo/exo-pango-extensions.h | 58 --
exo/exo-string.c | 50 --
exo/exo-string.h | 7 -
exo/exo-thumbnail.c | 5 +-
exo/exo-tree-view.c | 6 -
exo/exo.h | 3 -
exo/exo.symbols | 43 --
python/Makefile.am | 6 +-
python/exo.defs | 89 ----
tests/Makefile.am | 20 +-
58 files changed, 201 insertions(+), 2006 deletions(-)
diff --git a/INSTALL b/INSTALL
index d3c5b40..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,15 +2,15 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
@@ -73,9 +73,9 @@ The simplest way to compile this package is:
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -88,7 +88,7 @@ is an example:
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@ architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +152,46 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +229,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff --git a/configure.in.in b/configure.in.in
index 1e27787..8dd9bec 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,8 @@ dnl
dnl ***************************
dnl *** Version information ***
dnl ***************************
-m4_define([libexo_verinfo], [5:0:5]) dnl Needs to be set to [6:0:6] before the next release!
+m4_define([libexo_verinfo], [0:0:0])
+m4_define([libexo_version_api], [1])
m4_define([libexo_version_major], [0])
m4_define([libexo_version_minor], [3])
m4_define([libexo_version_micro], [101])
@@ -51,14 +52,14 @@ AC_SUBST([LIBEXO_VERINFO])
dnl ****************************
dnl *** Subst libexo version ***
dnl ****************************
+LIBEXO_VERSION_API=libexo_version_api()
LIBEXO_VERSION_MAJOR=libexo_version_major()
LIBEXO_VERSION_MINOR=libexo_version_minor()
LIBEXO_VERSION_MICRO=libexo_version_micro()
-LIBEXO_VERSION_API=$LIBEXO_VERSION_MAJOR.$LIBEXO_VERSION_MINOR
+AC_SUBST([LIBEXO_VERSION_API])
AC_SUBST([LIBEXO_VERSION_MAJOR])
AC_SUBST([LIBEXO_VERSION_MINOR])
AC_SUBST([LIBEXO_VERSION_MICRO])
-AC_SUBST([LIBEXO_VERSION_API])
dnl *******************************
dnl *** Check for UNIX variants ***
@@ -162,7 +163,7 @@ dnl *** Check for HAL (optional) ***
dnl ********************************
XDT_CHECK_OPTIONAL_PACKAGE([HAL], [hal-storage], [0.5.7], [hal], [HAL support], [yes])
if test x"$HAL_FOUND" = x"yes"; then
- dnl # substituted into exo-hal-0.3.pc
+ dnl # substituted into exo-hal-1.pc
HAL_STORAGE_DEPENDENCY="hal-storage"
dnl # Check if LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL is declared
@@ -414,12 +415,12 @@ docs/reference/Makefile
docs/reference/version.xml
exo.spec
exo/Makefile
-exo/exo-0.3.pc
+exo/exo-1.pc
exo/exo-config.h
exo-csource/Makefile
exo-desktop-item-edit/Makefile
exo-hal/Makefile
-exo-hal/exo-hal-0.3.pc
+exo-hal/exo-hal-1.pc
exo-helper/Makefile
exo-helper/helpers/Makefile
exo-mount/Makefile
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f4c9cdc..acea9c2 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -54,7 +54,7 @@ INCLUDES = \
$(LIBXFCE4UTIL_CFLAGS)
GTKDOC_LIBS = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/exo-docs.sgml b/docs/reference/exo-docs.sgml
index 80863d6..144d735 100644
--- a/docs/reference/exo-docs.sgml
+++ b/docs/reference/exo-docs.sgml
@@ -17,18 +17,15 @@
<!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">
-<!ENTITY exo-md5 SYSTEM "xml/exo-md5.xml">
<!ENTITY exo-mount-point SYSTEM "xml/exo-mount-point.xml">
<!ENTITY exo-string SYSTEM "xml/exo-string.xml">
<!ENTITY exo-url SYSTEM "xml/exo-url.xml">
<!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">
@@ -295,7 +292,6 @@
&exo-gdk-pixbuf-extensions;
&exo-gobject-extensions;
&exo-gtk-extensions;
- &exo-pango-extensions;
</part>
<part id="exo-miscelleanous">
@@ -303,7 +299,6 @@
&exo-config;
&exo-binding;
&exo-execute;
- &exo-md5;
&exo-mount-point;
&exo-string;
&exo-url;
@@ -323,10 +318,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 c2d97c6..47cd6e2 100644
--- a/docs/reference/exo-sections.txt
+++ b/docs/reference/exo-sections.txt
@@ -164,12 +164,6 @@ exo_icon_view_new
exo_icon_view_new_with_model
exo_icon_view_get_model
exo_icon_view_set_model
-exo_icon_view_get_text_column
-exo_icon_view_set_text_column
-exo_icon_view_get_markup_column
-exo_icon_view_set_markup_column
-exo_icon_view_get_pixbuf_column
-exo_icon_view_set_pixbuf_column
exo_icon_view_get_orientation
exo_icon_view_set_orientation
exo_icon_view_get_columns
@@ -396,25 +390,10 @@ exo_g_value_transform_negate
<FILE>exo-gtk-extensions</FILE>
<TITLE>Extensions to Gtk</TITLE>
exo_gtk_object_destroy_later
-exo_gtk_object_ref_sink
-exo_gtk_radio_action_set_current_value
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
@@ -454,24 +433,6 @@ exo_execute_terminal_shell_on_screen
</SECTION>
<SECTION>
-<FILE>exo-md5</FILE>
-<TITLE>MD5 functions</TITLE>
-ExoMd5Digest
-exo_str_get_md5_digest
-exo_str_get_md5_str
-exo_md5_str_to_digest
-exo_md5_digest_to_str
-exo_md5_digest_dup
-exo_md5_digest_free
-exo_md5_digest_hash
-exo_md5_digest_equal
-<SUBSECTION Standard>
-EXO_TYPE_MD5_DIGEST
-<SUBSECTION Private>
-exo_md5_digest_get_type
-</SECTION>
-
-<SECTION>
<FILE>exo-mount-point</FILE>
<TITLE>Mount Points</TITLE>
ExoMountPointFlags
@@ -492,8 +453,6 @@ exo_str_is_equal
exo_str_replace
exo_strdup_strftime
exo_strndupv
-exo_intern_string
-exo_intern_static_string
I_
</SECTION>
@@ -551,25 +510,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..b3ebcdf 100644
--- a/docs/reference/exo.types
+++ b/docs/reference/exo.types
@@ -18,7 +18,4 @@ exo_job_get_type
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>
-
- at text:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_ellipsized_label_get_ellipsize ##### -->
-<para>
-
-</para>
-
- at label:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_ellipsized_label_set_ellipsize ##### -->
-<para>
-
-</para>
-
- at label:
- at ellipsize:
-
-
diff --git a/docs/reference/tmpl/exo-gtk-extensions.sgml b/docs/reference/tmpl/exo-gtk-extensions.sgml
index 6d6facd..efe8e54 100644
--- a/docs/reference/tmpl/exo-gtk-extensions.sgml
+++ b/docs/reference/tmpl/exo-gtk-extensions.sgml
@@ -31,24 +31,6 @@ Stable
@object:
-<!-- ##### FUNCTION exo_gtk_object_ref_sink ##### -->
-<para>
-
-</para>
-
- at object:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_gtk_radio_action_set_current_value ##### -->
-<para>
-
-</para>
-
- at action:
- at current_value:
-
-
<!-- ##### FUNCTION exo_gtk_file_chooser_add_thumbnail_preview ##### -->
<para>
diff --git a/docs/reference/tmpl/exo-hal.sgml b/docs/reference/tmpl/exo-hal.sgml
index a698f10..584bffe 100644
--- a/docs/reference/tmpl/exo-hal.sgml
+++ b/docs/reference/tmpl/exo-hal.sgml
@@ -26,7 +26,7 @@ Miscellaneous Utility Functions for HAL integration
<para>
The HAL support module is not part of the main <filename>exo</filename> library, so you if you want to
use any of these functions you will need to explicitly link to the <filename>exo-hal</filename> library.
- This is done with the <command>pkg-config</command> utility, using <filename>exo-hal-0.3</filename> as
+ This is done with the <command>pkg-config</command> utility, using <filename>exo-hal-1</filename> as
the package name.
</para>
diff --git a/docs/reference/tmpl/exo-icon-bar.sgml b/docs/reference/tmpl/exo-icon-bar.sgml
index 9344efa..f3c1132 100644
--- a/docs/reference/tmpl/exo-icon-bar.sgml
+++ b/docs/reference/tmpl/exo-icon-bar.sgml
@@ -236,7 +236,7 @@ enum
</para>
@icon_bar:
- at index:
+ at idx:
<!-- ##### FUNCTION exo_icon_bar_get_active_iter ##### -->
diff --git a/docs/reference/tmpl/exo-icon-view.sgml b/docs/reference/tmpl/exo-icon-view.sgml
index 7758ae1..9641544 100644
--- a/docs/reference/tmpl/exo-icon-view.sgml
+++ b/docs/reference/tmpl/exo-icon-view.sgml
@@ -261,60 +261,6 @@ A widget which displays a list of icons in a grid
@model:
-<!-- ##### FUNCTION exo_icon_view_get_text_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_icon_view_set_text_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at column:
-
-
-<!-- ##### FUNCTION exo_icon_view_get_markup_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_icon_view_set_markup_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at column:
-
-
-<!-- ##### FUNCTION exo_icon_view_get_pixbuf_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_icon_view_set_pixbuf_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at column:
-
-
<!-- ##### FUNCTION exo_icon_view_get_orientation ##### -->
<para>
diff --git a/docs/reference/tmpl/exo-md5.sgml b/docs/reference/tmpl/exo-md5.sgml
deleted file mode 100644
index 945288c..0000000
--- a/docs/reference/tmpl/exo-md5.sgml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-MD5 Functions
-
-<!-- ##### SECTION Short_Description ##### -->
-MD5 hash implementation
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
- This is an implementation 16-byte MD5 hash algorithm with some
- related utility functions.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-Stable
-
-<!-- ##### STRUCT ExoMd5Digest ##### -->
-<para>
- Structure to represent a MD5 digest.
-</para>
-
- at digest: the MD5 digest.
-
-<!-- ##### FUNCTION exo_str_get_md5_digest ##### -->
-<para>
-
-</para>
-
- at contents:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_str_get_md5_str ##### -->
-<para>
-
-</para>
-
- at contents:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_md5_str_to_digest ##### -->
-<para>
-
-</para>
-
- at str_digest:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_md5_digest_to_str ##### -->
-<para>
-
-</para>
-
- at digest:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_md5_digest_dup ##### -->
-<para>
-
-</para>
-
- at digest:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_md5_digest_free ##### -->
-<para>
-
-</para>
-
- at digest:
-
-
-<!-- ##### FUNCTION exo_md5_digest_hash ##### -->
-<para>
-
-</para>
-
- at digest:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_md5_digest_equal ##### -->
-<para>
-
-</para>
-
- at digest1:
- at digest2:
- at Returns:
-
-
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/docs/reference/tmpl/exo-string.sgml b/docs/reference/tmpl/exo-string.sgml
index e9b2388..b8ed5f0 100644
--- a/docs/reference/tmpl/exo-string.sgml
+++ b/docs/reference/tmpl/exo-string.sgml
@@ -67,27 +67,9 @@ Stable
@Returns:
-<!-- ##### FUNCTION exo_intern_string ##### -->
-<para>
-
-</para>
-
- at string:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_intern_static_string ##### -->
-<para>
-
-</para>
-
- at string:
- at Returns:
-
-
<!-- ##### MACRO I_ ##### -->
<para>
- Shortcut for exo_intern_static_string().
+ Shortcut for g_intern_static_string().
</para>
@string: a static string.
diff --git a/exo-desktop-item-edit/Makefile.am b/exo-desktop-item-edit/Makefile.am
index 8c82077..99438a3 100644
--- a/exo-desktop-item-edit/Makefile.am
+++ b/exo-desktop-item-edit/Makefile.am
@@ -36,13 +36,13 @@ exo_desktop_item_edit_LDFLAGS = \
exo_desktop_item_edit_DEPENDENCIES = \
$(top_builddir)/exo-support/libexo-support.la \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
exo_desktop_item_edit_LDADD = \
$(GTK_LIBS) \
$(GTHREAD_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(top_builddir)/exo-support/libexo-support.la \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/exo-hal/Makefile.am b/exo-hal/Makefile.am
index 574aed7..024cf56 100644
--- a/exo-hal/Makefile.am
+++ b/exo-hal/Makefile.am
@@ -6,31 +6,31 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"exo-hal\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-libexohalincludedir = $(includedir)/exo-0.3/exo-hal
+libexohalincludedir = $(includedir)/exo-1/exo-hal
libexohalinclude_HEADERS = exo-hal.h
lib_LTLIBRARIES = \
- libexo-hal-0.3.la
+ libexo-hal-1.la
-libexo_hal_0_3_la_SOURCES = \
+libexo_hal_1_la_SOURCES = \
$(libexohalinclude_HEADERS) \
exo-hal.c
-libexo_hal_0_3_la_CFLAGS = \
+libexo_hal_1_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(HAL_CFLAGS)
-libexo_hal_0_3_la_LDFLAGS = \
+libexo_hal_1_la_LDFLAGS = \
-export-dynamic \
-version-info $(LIBEXO_VERINFO) \
-export-symbols-regex "^[^_].*" \
-no-undefined
-libexo_hal_0_3_la_LIBADD = \
+libexo_hal_1_la_LIBADD = \
$(GLIB_LIBS) \
$(HAL_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = exo-hal-0.3.pc
+pkgconfig_DATA = exo-hal-$(LIBEXO_VERSION_API).pc
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/exo-hal/exo-hal-0.3.pc.in b/exo-hal/exo-hal-1.pc.in
similarity index 100%
rename from exo-hal/exo-hal-0.3.pc.in
rename to exo-hal/exo-hal-1.pc.in
diff --git a/exo-helper/Makefile.am b/exo-helper/Makefile.am
index ab8feaf..3e545c5 100644
--- a/exo-helper/Makefile.am
+++ b/exo-helper/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
libexec_PROGRAMS = \
- exo-helper-0.3
+ exo-helper-1
exo_helper_built_sources = \
exo-helper-enum-types.c \
@@ -20,7 +20,7 @@ exo_helper_built_sources = \
exo_helper_headers = \
exo-helper.h
-exo_helper_0_3_SOURCES = \
+exo_helper_1_SOURCES = \
$(exo_helper_built_sources) \
$(exo_helper_headers) \
exo-helper-chooser-dialog.c \
@@ -34,19 +34,19 @@ exo_helper_0_3_SOURCES = \
exo-helper.c \
main.c
-exo_helper_0_3_CFLAGS = \
+exo_helper_1_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
-exo_helper_0_3_DEPENDENCIES = \
+exo_helper_1_DEPENDENCIES = \
$(top_builddir)/exo-support/libexo-support.la \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
-exo_helper_0_3_LDADD = \
+exo_helper_1_LDADD = \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(top_builddir)/exo-support/libexo-support.la \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
bin_SCRIPTS = \
exo-preferred-applications
diff --git a/exo-helper/exo-helper-chooser.c b/exo-helper/exo-helper-chooser.c
index cef9dab..6307756 100644
--- a/exo-helper/exo-helper-chooser.c
+++ b/exo-helper/exo-helper-chooser.c
@@ -141,7 +141,7 @@ exo_helper_chooser_init (ExoHelperChooser *chooser)
chooser->database = exo_helper_database_get ();
chooser->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (chooser->tooltips));
+ g_object_ref_sink (G_OBJECT (chooser->tooltips));
gtk_widget_push_composite_child ();
@@ -690,7 +690,7 @@ exo_helper_chooser_pressed (ExoHelperChooser *chooser,
/* allocate a new menu */
menu = gtk_menu_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (menu));
+ g_object_ref_sink (G_OBJECT (menu));
gtk_menu_set_screen (GTK_MENU (menu), gtk_widget_get_screen (button));
/* set Atk popup-window relation for the menu */
diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index a765a71..f194b48 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -42,7 +42,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
libexec_SCRIPTS = \
- exo-compose-mail-0.3
+ exo-compose-mail-$(LIBEXO_VERSION_API)
DISTCLEANFILES = \
$(desktop_in_files) \
@@ -51,6 +51,6 @@ DISTCLEANFILES = \
EXTRA_DIST = \
$(defaults_DATA) \
$(desktop_in_in_files) \
- exo-compose-mail-0.3
+ exo-compose-mail-$(LIBEXO_VERSION_API)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/exo-helper/helpers/balsa.desktop.in.in b/exo-helper/helpers/balsa.desktop.in.in
index 78b3bf0..84b71ef 100644
--- a/exo-helper/helpers/balsa.desktop.in.in
+++ b/exo-helper/helpers/balsa.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=balsa;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 balsa %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 balsa %B "mailto:%s";
diff --git a/exo-helper/helpers/evolution.desktop.in.in b/exo-helper/helpers/evolution.desktop.in.in
index f6cccef..c5d9d9b 100644
--- a/exo-helper/helpers/evolution.desktop.in.in
+++ b/exo-helper/helpers/evolution.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=evolution-2.4;evolution-2.3;evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 evolution %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 evolution %B "mailto:%s";
diff --git a/exo-helper/helpers/exo-compose-mail-0.3 b/exo-helper/helpers/exo-compose-mail-1
similarity index 96%
rename from exo-helper/helpers/exo-compose-mail-0.3
rename to exo-helper/helpers/exo-compose-mail-1
index 58e2561..8ea65a9 100755
--- a/exo-helper/helpers/exo-compose-mail-0.3
+++ b/exo-helper/helpers/exo-compose-mail-1
@@ -1,8 +1,8 @@
#!/usr/bin/env perl
#
-# exo-compose-mail-0.3 - Perl script to parse mailto:-URIs and invoke the
-# various included MailReaders with the appropriate
-# parameters.
+# exo-compose-mail-1 - Perl script to parse mailto:-URIs and invoke the
+# various included MailReaders with the appropriate
+# parameters.
#
# $Id$
#
diff --git a/exo-helper/helpers/kmail.desktop.in.in b/exo-helper/helpers/kmail.desktop.in.in
index c287055..5dd3ffd 100644
--- a/exo-helper/helpers/kmail.desktop.in.in
+++ b/exo-helper/helpers/kmail.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=true
X-XFCE-Binaries=kmail;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParamter=@libexecdir@/exo-compose-mail-0.3 kmail %B "mailto:%s";
+X-XFCE-CommandsWithParamter=@libexecdir@/exo-compose-mail-1 kmail %B "mailto:%s";
diff --git a/exo-helper/helpers/mozilla-mailer.desktop.in.in b/exo-helper/helpers/mozilla-mailer.desktop.in.in
index f09b8bb..81b3aac 100644
--- a/exo-helper/helpers/mozilla-mailer.desktop.in.in
+++ b/exo-helper/helpers/mozilla-mailer.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B -mail;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-0.3 mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";
diff --git a/exo-helper/helpers/mutt.desktop.in.in b/exo-helper/helpers/mutt.desktop.in.in
index d1cdd5e..a8fd822 100644
--- a/exo-helper/helpers/mutt.desktop.in.in
+++ b/exo-helper/helpers/mutt.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=mutt;
X-XFCE-Category=MailReader
X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @libexecdir@/exo-compose-mail-0.3 mutt %B "mailto:%s";
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @libexecdir@/exo-compose-mail-1 mutt %B "mailto:%s";
diff --git a/exo-helper/helpers/sylpheed-claws.desktop.in.in b/exo-helper/helpers/sylpheed-claws.desktop.in.in
index 90e56f2..0c57c4e 100644
--- a/exo-helper/helpers/sylpheed-claws.desktop.in.in
+++ b/exo-helper/helpers/sylpheed-claws.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=true
X-XFCE-Binaries=claws-mail;sylpheed-claws-gtk2;sylpheed-claws
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/sylpheed.desktop.in.in b/exo-helper/helpers/sylpheed.desktop.in.in
index a39b899..7fa81ab 100644
--- a/exo-helper/helpers/sylpheed.desktop.in.in
+++ b/exo-helper/helpers/sylpheed.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=true
X-XFCE-Binaries=sylpheed;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/thunderbird.desktop.in.in b/exo-helper/helpers/thunderbird.desktop.in.in
index 40b7c5d..e8944b9 100644
--- a/exo-helper/helpers/thunderbird.desktop.in.in
+++ b/exo-helper/helpers/thunderbird.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-0.3 mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";
diff --git a/exo-helper/main.c b/exo-helper/main.c
index 6917545..1a3c992 100644
--- a/exo-helper/main.c
+++ b/exo-helper/main.c
@@ -203,11 +203,8 @@ main (int argc, char **argv)
else
{
result = EXIT_FAILURE;
-#if GLIB_CHECK_VERSION(2, 14, 0)
+
g_printerr ("%s", g_option_context_get_help (opt_ctx, FALSE, NULL));
-#else
- g_printerr (_("Unknown helper arguments.\n"));
-#endif
}
g_option_context_free (opt_ctx);
diff --git a/exo-mount-notify/Makefile.am b/exo-mount-notify/Makefile.am
index 59aedd8..91e0b08 100644
--- a/exo-mount-notify/Makefile.am
+++ b/exo-mount-notify/Makefile.am
@@ -6,20 +6,20 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
libexec_PROGRAMS = \
- exo-mount-notify-0.3
+ exo-mount-notify-1
-exo_mount_notify_0_3_SOURCES = \
+exo_mount_notify_1_SOURCES = \
main.c
-exo_mount_notify_0_3_CFLAGS = \
+exo_mount_notify_1_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
-exo_mount_notify_0_3_LDFLAGS = \
+exo_mount_notify_1_LDFLAGS = \
-no-undefined
-exo_mount_notify_0_3_LDADD = \
+exo_mount_notify_1_LDADD = \
$(GTK_LIBS) \
$(LIBNOTIFY_LIBS) \
$(LIBXFCE4UTIL_LIBS)
diff --git a/exo-mount/Makefile.am b/exo-mount/Makefile.am
index 87f8cf4..cdff6d4 100644
--- a/exo-mount/Makefile.am
+++ b/exo-mount/Makefile.am
@@ -33,15 +33,15 @@ exo_mount_LDFLAGS = \
-no-undefined
exo_mount_DEPENDENCIES = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la \
- $(top_builddir)/exo-hal/libexo-hal-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la \
+ $(top_builddir)/exo-hal/libexo-hal-$(LIBEXO_VERSION_API).la
exo_mount_LDADD = \
$(GTK_LIBS) \
$(HAL_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la \
- $(top_builddir)/exo-hal/libexo-hal-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la \
+ $(top_builddir)/exo-hal/libexo-hal-$(LIBEXO_VERSION_API).la
# install apppropriate symlinks
install-data-local:
diff --git a/exo-open/Makefile.am b/exo-open/Makefile.am
index 6c5df08..0f95c4d 100644
--- a/exo-open/Makefile.am
+++ b/exo-open/Makefile.am
@@ -20,6 +20,6 @@ exo_open_LDFLAGS = \
exo_open_LDADD = \
$(GTK_LIBS) \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/exo/Makefile.am b/exo/Makefile.am
index cc8c4a3..187788d 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -9,13 +9,12 @@ INCLUDES = \
-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-lib_LTLIBRARIES = libexo-0.3.la
+lib_LTLIBRARIES = libexo-1.la
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 \
@@ -25,9 +24,7 @@ libexo_headers = \
exo-icon-view.h \
exo-job.h \
exo-simple-job.h \
- exo-md5.h \
exo-mount-point.h \
- exo-pango-extensions.h \
exo-string.h \
exo-toolbars-editor-dialog.h \
exo-toolbars-editor.h \
@@ -50,7 +47,7 @@ libexo_built_sources = \
exo-marshal.c \
exo-marshal.h
-libexoincludedir = $(includedir)/exo-0.3/exo
+libexoincludedir = $(includedir)/exo-1/exo
libexoinclude_HEADERS = \
$(libexo_built_public_sources) \
@@ -58,14 +55,13 @@ libexoinclude_HEADERS = \
exo.h \
exo-config.h
-libexo_0_3_la_SOURCES = \
+libexo_1_la_SOURCES = \
$(libexoinclude_HEADERS) \
$(libexo_built_sources) \
exo-binding.c \
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 \
@@ -78,9 +74,7 @@ libexo_0_3_la_SOURCES = \
exo-job.c \
exo-job.h \
exo-simple-job.c \
- exo-md5.c \
exo-mount-point.c \
- exo-pango-extensions.c \
exo-private.c \
exo-private.h \
exo-string.c \
@@ -100,24 +94,24 @@ libexo_0_3_la_SOURCES = \
exo-wrap-table.c \
exo-xsession-client.c
-libexo_0_3_la_CFLAGS = \
+libexo_1_la_CFLAGS = \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
-libexo_0_3_la_LDFLAGS = \
+libexo_1_la_LDFLAGS = \
-export-dynamic \
-version-info $(LIBEXO_VERINFO) \
-export-symbols-regex "^[^_].*" \
-no-undefined
-libexo_0_3_la_LIBADD = \
+libexo_1_la_LIBADD = \
$(GIO_LIBS) \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = exo-0.3.pc
+pkgconfig_DATA = exo-$(LIBEXO_VERSION_API).pc
##
diff --git a/exo/exo-0.3.pc.in b/exo/exo-1.pc.in
similarity index 100%
rename from exo/exo-0.3.pc.in
rename to exo/exo-1.pc.in
diff --git a/exo/exo-binding.c b/exo/exo-binding.c
index b87a752..5a68320 100644
--- a/exo/exo-binding.c
+++ b/exo/exo-binding.c
@@ -30,6 +30,31 @@
#include <exo/exo-private.h>
#include <exo/exo-alias.h>
+typedef struct
+{
+ GObject *dst_object;
+ GParamSpec *dst_pspec;
+ gulong dst_handler; /* only set for mutual bindings */
+ gulong handler;
+ ExoBindingTransform transform;
+ gpointer user_data;
+}
+ExoBindingLink;
+
+struct _ExoBinding
+{
+ GObject *src_object;
+ GDestroyNotify destroy;
+ ExoBindingLink link;
+};
+
+struct _ExoMutualBinding
+{
+ GDestroyNotify destroy;
+ ExoBindingLink direct;
+ ExoBindingLink reverse;
+};
+
static void
@@ -116,8 +141,8 @@ exo_binding_on_disconnect (gpointer data,
binding = (ExoBinding *) (((gchar *) link) - G_STRUCT_OFFSET (ExoBinding, link));
- if (binding->base.destroy != NULL)
- binding->base.destroy (link->user_data);
+ if (binding->destroy != NULL)
+ binding->destroy (link->user_data);
if (link->dst_object != NULL)
g_object_weak_unref (link->dst_object, exo_binding_on_dst_object_destroy, binding);
@@ -142,8 +167,8 @@ exo_mutual_binding_on_disconnect_object1 (gpointer data,
object2 = binding->direct.dst_object;
if (object2 != NULL)
{
- if (binding->base.destroy != NULL)
- binding->base.destroy (binding->direct.user_data);
+ if (binding->destroy != NULL)
+ binding->destroy (binding->direct.user_data);
binding->direct.dst_object = NULL;
g_signal_handler_disconnect (object2, binding->reverse.handler);
g_slice_free (ExoMutualBinding, binding);
@@ -284,7 +309,7 @@ exo_binding_new_full (GObject *src_object,
binding = g_slice_new (ExoBinding);
binding->src_object = src_object;
- binding->base.destroy = destroy_notify;
+ binding->destroy = destroy_notify;
exo_binding_link_init (&binding->link,
src_object,
@@ -433,7 +458,7 @@ exo_mutual_binding_new_full (GObject *object1,
user_data);
binding = g_slice_new (ExoMutualBinding);
- binding->base.destroy = destroy_notify;
+ binding->destroy = destroy_notify;
exo_binding_link_init (&binding->direct,
object1,
diff --git a/exo/exo-binding.h b/exo/exo-binding.h
index b5a95c3..467e8ee 100644
--- a/exo/exo-binding.h
+++ b/exo/exo-binding.h
@@ -32,45 +32,15 @@
G_BEGIN_DECLS
-typedef struct _ExoBindingBase ExoBindingBase;
-typedef struct _ExoBindingLink ExoBindingLink;
typedef struct _ExoBinding ExoBinding;
typedef struct _ExoMutualBinding ExoMutualBinding;
+
+
typedef gboolean (*ExoBindingTransform) (const GValue *src_value,
GValue *dst_value,
gpointer user_data);
-struct _ExoBindingBase
-{
- GDestroyNotify destroy;
-};
-
-struct _ExoBindingLink
-{
- GObject *dst_object;
- GParamSpec *dst_pspec;
- gulong dst_handler; /* only set for mutual bindings */
- gulong handler;
- ExoBindingTransform transform;
- gpointer user_data;
-};
-
-struct _ExoBinding
-{
- /*< private >*/
- GObject *src_object;
- ExoBindingBase base;
- ExoBindingLink link;
-};
-
-struct _ExoMutualBinding
-{
- /*< private >*/
- ExoBindingBase base;
- ExoBindingLink direct;
- ExoBindingLink reverse;
-};
ExoBinding *exo_binding_new (GObject *src_object,
diff --git a/exo/exo-cell-renderer-ellipsized-text.c b/exo/exo-cell-renderer-ellipsized-text.c
index b9abff5..5dee42f 100644
--- a/exo/exo-cell-renderer-ellipsized-text.c
+++ b/exo/exo-cell-renderer-ellipsized-text.c
@@ -239,11 +239,7 @@ exo_cell_renderer_ellipsized_text_render (GtkCellRenderer *renderer,
ExoCellRendererEllipsizedTextPrivate *priv = EXO_CELL_RENDERER_ELLIPSIZED_TEXT_GET_PRIVATE (renderer);
GdkRectangle text_area;
GtkStateType state;
-#if !GTK_CHECK_VERSION(2,8,0)
- GdkPoint points[8];
-#else
cairo_t *cr;
-#endif
gint focus_line_width;
gint focus_padding;
gint text_height;
@@ -307,7 +303,6 @@ exo_cell_renderer_ellipsized_text_render (GtkCellRenderer *renderer,
x1 = x0 + text_width;
y1 = y0 + text_height;
-#if GTK_CHECK_VERSION(2,8,0)
/* Cairo produces nicer results than using a polygon
* and so we use it directly if possible.
*/
@@ -324,20 +319,6 @@ exo_cell_renderer_ellipsized_text_render (GtkCellRenderer *renderer,
gdk_cairo_set_source_color (cr, &widget->style->base[state]);
cairo_fill (cr);
cairo_destroy (cr);
-#else
- /* calculate a (more or less rounded) polygon */
- points[0].x = x0 + 2; points[0].y = y0;
- points[1].x = x1 - 2; points[1].y = y0;
- points[2].x = x1; points[2].y = y0 + 2;
- points[3].x = x1; points[3].y = y1 - 2;
- points[4].x = x1 - 2; points[4].y = y1;
- points[5].x = x0 + 2; points[5].y = y1;
- points[6].x = x0; points[6].y = y1 - 2;
- points[7].x = x0; points[7].y = y0 + 2;
-
- /* render the indicator */
- gdk_draw_polygon (window, widget->style->base_gc[state], TRUE, points, G_N_ELEMENTS (points));
-#endif
}
/* draw the focus indicator */
diff --git a/exo/exo-config.h.in b/exo/exo-config.h.in
index e03e803..78c882e 100644
--- a/exo/exo-config.h.in
+++ b/exo/exo-config.h.in
@@ -69,25 +69,10 @@ const gchar *exo_check_version (guint required_major,
#endif /* __GNUC__ */
#endif /* !defined(G_GNUC_WARN_UNUSED_RESULT) */
-/* with GObject >= 2.7.0, copying name, nick and blurb can be avoided */
-#if GLIB_CHECK_VERSION(2,7,0)
-#define EXO_PARAM_READABLE (G_PARAM_READABLE \
- | G_PARAM_STATIC_NAME \
- | G_PARAM_STATIC_NICK \
- | G_PARAM_STATIC_BLURB)
-#define EXO_PARAM_WRITABLE (G_PARAM_WRITABLE \
- | G_PARAM_STATIC_NAME \
- | G_PARAM_STATIC_NICK \
- | G_PARAM_STATIC_BLURB)
-#define EXO_PARAM_READWRITE (G_PARAM_READWRITE \
- | G_PARAM_STATIC_NAME \
- | G_PARAM_STATIC_NICK \
- | G_PARAM_STATIC_BLURB)
-#else
-#define EXO_PARAM_READABLE (G_PARAM_READABLE)
-#define EXO_PARAM_WRITABLE (G_PARAM_WRITABLE)
-#define EXO_PARAM_READWRITE (G_PARAM_READWRITE)
-#endif
+/* shorter macros for the GParamSpecs with static strings */
+#define EXO_PARAM_READABLE (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)
+#define EXO_PARAM_WRITABLE (G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)
+#define EXO_PARAM_READWRITE (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
G_END_DECLS
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 <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-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 <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
-
-/* 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-gtk-extensions.c b/exo/exo-gtk-extensions.c
index 1cb8238..805fc40 100644
--- a/exo/exo-gtk-extensions.c
+++ b/exo/exo-gtk-extensions.c
@@ -54,89 +54,7 @@ exo_gtk_object_destroy_later (GtkObject *object)
g_return_if_fail (GTK_IS_OBJECT (object));
g_idle_add_full (G_PRIORITY_HIGH, later_destroy, object, NULL);
- exo_gtk_object_ref_sink (object);
-}
-
-
-
-/**
- * exo_gtk_object_ref_sink:
- * @object : a #GtkObject.
- *
- * Helper function used to take a reference on
- * @object and droppping the floating reference
- * to @object (if any) atomically.
- *
- * If libexo is compiled against Gtk+ 2.9.0 or
- * newer, this function will use g_object_ref_sink(),
- * since with newer Gtk+/GObject versions, the floating
- * reference handling was moved to GObject. Else, this
- * function will expand to
- *
- * <informalexample><programlisting>
- * g_object_ref (G_OBJECT (object));
- * gtk_object_sink (GTK_OBJECT (object));
- * </programlisting></informalexample>
- *
- * The caller is responsible to release the reference
- * on @object acquire by this function call using
- * g_object_unref().
- *
- * Return value: a reference to @object.
- **/
-gpointer
-exo_gtk_object_ref_sink (GtkObject *object)
-{
- g_return_val_if_fail (GTK_IS_OBJECT (object), NULL);
-
-#if GTK_CHECK_VERSION(2,9,0)
- g_object_ref_sink (G_OBJECT (object));
-#else
- g_object_ref (G_OBJECT (object));
- gtk_object_sink (object);
-#endif
-
- return object;
-}
-
-
-
-/**
- * exo_gtk_radio_action_set_current_value:
- * @action : A #GtkRadioAction.
- * @current_value : the value of the #GtkRadioAction to activate.
- *
- * Looks for all actions in the group to which @action belongs and if
- * any of the actions matches the @current_value, it will become the
- * new active action.
- *
- * Else if none of the actions in @action<!---->'s radio group match
- * the specified @current_value, all actions will be deactivated and
- * the radio group will have no active action afterwards.
- **/
-void
-exo_gtk_radio_action_set_current_value (GtkRadioAction *action,
- gint current_value)
-{
- GSList *lp;
- gint value;
-
- g_return_if_fail (GTK_IS_RADIO_ACTION (action));
-
- /* check if we have action who's value matches */
- for (lp = gtk_radio_action_get_group (action); lp != NULL; lp = lp->next)
- {
- g_object_get (G_OBJECT (lp->data), "value", &value, NULL);
- if (value == current_value)
- {
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (lp->data), TRUE);
- return;
- }
- }
-
- /* no action found, so none of the actions gets the "active" flag */
- for (lp = gtk_radio_action_get_group (action); lp != NULL; lp = lp->next)
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (lp->data), FALSE);
+ g_object_ref_sink (object);
}
diff --git a/exo/exo-gtk-extensions.h b/exo/exo-gtk-extensions.h
index e8bd1b9..8cae715 100644
--- a/exo/exo-gtk-extensions.h
+++ b/exo/exo-gtk-extensions.h
@@ -33,11 +33,6 @@ G_BEGIN_DECLS
void exo_gtk_object_destroy_later (GtkObject *object);
-gpointer exo_gtk_object_ref_sink (GtkObject *object);
-
-void exo_gtk_radio_action_set_current_value (GtkRadioAction *action,
- gint current_value);
-
void exo_gtk_file_chooser_add_thumbnail_preview (GtkFileChooser *chooser);
G_END_DECLS
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index 4837b4e..4ea75be 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -1343,10 +1343,6 @@ exo_icon_view_set_property (GObject *object,
exo_icon_view_set_margin (icon_view, g_value_get_int (value));
break;
- case PROP_MARKUP_COLUMN:
- exo_icon_view_set_markup_column (icon_view, g_value_get_int (value));
- break;
-
case PROP_MODEL:
exo_icon_view_set_model (icon_view, g_value_get_object (value));
break;
@@ -1355,10 +1351,6 @@ exo_icon_view_set_property (GObject *object,
exo_icon_view_set_orientation (icon_view, g_value_get_enum (value));
break;
- case PROP_PIXBUF_COLUMN:
- exo_icon_view_set_pixbuf_column (icon_view, g_value_get_int (value));
- break;
-
case PROP_REORDERABLE:
exo_icon_view_set_reorderable (icon_view, g_value_get_boolean (value));
break;
@@ -1387,10 +1379,6 @@ exo_icon_view_set_property (GObject *object,
exo_icon_view_set_spacing (icon_view, g_value_get_int (value));
break;
- case PROP_TEXT_COLUMN:
- exo_icon_view_set_text_column (icon_view, g_value_get_int (value));
- break;
-
case PROP_LAYOUT_MODE:
exo_icon_view_set_layout_mode (icon_view, g_value_get_enum (value));
break;
@@ -5468,206 +5456,6 @@ update_pixbuf_cell (ExoIconView *icon_view)
/**
- * exo_icon_view_get_text_column:
- * @icon_view: A #ExoIconView.
- *
- * Returns the column with text for @icon_view.
- *
- * Returns: the text column, or -1 if it's unset.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- */
-gint
-exo_icon_view_get_text_column (const ExoIconView *icon_view)
-{
- g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), -1);
- return icon_view->priv->text_column;
-}
-
-
-
-/**
- * exo_icon_view_set_text_column:
- * @icon_view: A #ExoIconView.
- * @column: A column in the currently used model.
- *
- * Sets the column with text for @icon_view to be @column. The text
- * column must be of type #G_TYPE_STRING.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- **/
-void
-exo_icon_view_set_text_column (ExoIconView *icon_view,
- gint column)
-{
- GType column_type;
-
- if (G_UNLIKELY (column == icon_view->priv->text_column))
- return;
-
- if (column == -1)
- {
- icon_view->priv->text_column = -1;
- }
- else
- {
- if (icon_view->priv->model != NULL)
- {
- column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
- g_return_if_fail (column_type == G_TYPE_STRING);
- }
-
- icon_view->priv->text_column = column;
- }
-
- exo_icon_view_stop_editing (icon_view, TRUE);
-
- update_text_cell (icon_view);
-
- exo_icon_view_invalidate_sizes (icon_view);
-
- g_object_notify (G_OBJECT (icon_view), "text-column");
-}
-
-
-
-/**
- * exo_icon_view_get_markup_column:
- * @icon_view: A #ExoIconView.
- *
- * Returns the column with markup text for @icon_view.
- *
- * Returns: the markup column, or -1 if it's unset.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- */
-gint
-exo_icon_view_get_markup_column (const ExoIconView *icon_view)
-{
- g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), -1);
- return icon_view->priv->markup_column;
-}
-
-
-
-/**
- * exo_icon_view_set_markup_column:
- * @icon_view : A #ExoIconView.
- * @column : A column in the currently used model.
- *
- * Sets the column with markup information for @icon_view to be
- * @column. The markup column must be of type #G_TYPE_STRING.
- * If the markup column is set to something, it overrides
- * the text column set by exo_icon_view_set_text_column().
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- **/
-void
-exo_icon_view_set_markup_column (ExoIconView *icon_view,
- gint column)
-{
- if (G_UNLIKELY (column == icon_view->priv->markup_column))
- return;
-
- if (column == -1)
- icon_view->priv->markup_column = -1;
- else
- {
- if (icon_view->priv->model != NULL)
- {
- GType column_type;
-
- column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
-
- g_return_if_fail (column_type == G_TYPE_STRING);
- }
-
- icon_view->priv->markup_column = column;
- }
-
- exo_icon_view_stop_editing (icon_view, TRUE);
-
- update_text_cell (icon_view);
-
- exo_icon_view_invalidate_sizes (icon_view);
-
- g_object_notify (G_OBJECT (icon_view), "markup-column");
-}
-
-
-
-/**
- * exo_icon_view_get_pixbuf_column:
- * @icon_view : A #ExoIconView.
- *
- * Returns the column with pixbufs for @icon_view.
- *
- * Returns: the pixbuf column, or -1 if it's unset.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- */
-gint
-exo_icon_view_get_pixbuf_column (const ExoIconView *icon_view)
-{
- g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), -1);
- return icon_view->priv->pixbuf_column;
-}
-
-
-
-/**
- * exo_icon_view_set_pixbuf_column:
- * @icon_view : A #ExoIconView.
- * @column : A column in the currently used model.
- *
- * Sets the column with pixbufs for @icon_view to be @column. The pixbuf
- * column must be of type #GDK_TYPE_PIXBUF
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- **/
-void
-exo_icon_view_set_pixbuf_column (ExoIconView *icon_view,
- gint column)
-{
- GType column_type;
-
- if (G_UNLIKELY (column == icon_view->priv->pixbuf_column))
- return;
-
- if (column == -1)
- {
- icon_view->priv->pixbuf_column = -1;
- }
- else
- {
- if (icon_view->priv->model != NULL)
- {
- column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
- g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
- }
-
- icon_view->priv->pixbuf_column = column;
- }
-
- exo_icon_view_stop_editing (icon_view, TRUE);
-
- update_pixbuf_cell (icon_view);
-
- exo_icon_view_invalidate_sizes (icon_view);
-
- g_object_notify (G_OBJECT (icon_view), "pixbuf-column");
-
-}
-
-
-
-/**
* exo_icon_view_select_path:
* @icon_view : A #ExoIconView.
* @path : The #GtkTreePath to be selected.
diff --git a/exo/exo-icon-view.h b/exo/exo-icon-view.h
index fb30913..44affda 100644
--- a/exo/exo-icon-view.h
+++ b/exo/exo-icon-view.h
@@ -181,18 +181,6 @@ GtkTreeModel *exo_icon_view_get_model (const ExoIconView
void exo_icon_view_set_model (ExoIconView *icon_view,
GtkTreeModel *model);
-#ifndef EXO_DISABLE_DEPRECATED
-gint exo_icon_view_get_text_column (const ExoIconView *icon_view);
-void exo_icon_view_set_text_column (ExoIconView *icon_view,
- gint column);
-gint exo_icon_view_get_markup_column (const ExoIconView *icon_view);
-void exo_icon_view_set_markup_column (ExoIconView *icon_view,
- gint column);
-gint exo_icon_view_get_pixbuf_column (const ExoIconView *icon_view);
-void exo_icon_view_set_pixbuf_column (ExoIconView *icon_view,
- gint column);
-#endif
-
GtkOrientation exo_icon_view_get_orientation (const ExoIconView *icon_view);
void exo_icon_view_set_orientation (ExoIconView *icon_view,
GtkOrientation orientation);
diff --git a/exo/exo-md5.c b/exo/exo-md5.c
deleted file mode 100644
index 33e651e..0000000
--- a/exo/exo-md5.c
+++ /dev/null
@@ -1,551 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2004-2007 os-cillation e.K.
- * Copyright (c) 2004 James M. Cape <jcape at ignore-your.tv>
- *
- * 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
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <exo/exo-md5.h>
-#include <exo/exo-private.h>
-#include <exo/exo-string.h>
-#include <exo/exo-alias.h>
-
-
-
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest. The original code was
- * written by Colin Plumb in 1993, and put in the public domain.
- *
- * Modified to use glib datatypes. Put under GPL to simplify
- * licensing for ROX-Filer. Taken from Debian's dpkg package.
- */
-
-#define md5byte unsigned char
-
-typedef struct _MD5_CTX MD5_CTX;
-
-struct _MD5_CTX {
- guint32 buf[4];
- guint32 bytes[2];
- guint32 in[16];
-};
-
-
-
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-static void
-byteSwap (guint32 *buf, unsigned words)
-{
- md5byte *p = (md5byte *)buf;
-
- do
- {
- *buf++ = (guint32)((unsigned)p[3] << 8 | p[2]) << 16 |
- ((unsigned)p[1] << 8 | p[0]);
- p += 4;
- }
- while (--words);
-}
-#else
-#define byteSwap(buf,words)
-#endif
-
-
-
-/*
- * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
- * initialization constants.
- */
-static void
-MD5Init (MD5_CTX *ctx)
-{
- ctx->buf[0] = 0x67452301;
- ctx->buf[1] = 0xefcdab89;
- ctx->buf[2] = 0x98badcfe;
- ctx->buf[3] = 0x10325476;
-
- ctx->bytes[0] = 0;
- ctx->bytes[1] = 0;
-}
-
-
-
-/* The four core functions - F1 is optimized somewhat */
-
-
-
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f,w,x,y,z,in,s) \
- (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
-
-
-
-/*
- * The core of the MD5 algorithm, this alters an existing MD5 hash to
- * reflect the addition of 16 longwords of new data. MD5Update blocks
- * the data and converts bytes into longwords for this routine.
- */
-static void
-MD5Transform (guint32 buf[4], guint32 const in[16])
-{
- register guint32 a, b, c, d;
-
- a = buf[0];
- b = buf[1];
- c = buf[2];
- d = buf[3];
-
- MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
- MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
- MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
- MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
- MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
- MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
- MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
- MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
- MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
- MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
- MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
- MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
- MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
- MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
- MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
- MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
- MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
- MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
- MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
- MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
- MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
- MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
- MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
- MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
- MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
- MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
- MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
- MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
- MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
- MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
- MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
- MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
- MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
- MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
- MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
- MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
- MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
- MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
- MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
- MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
- MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
- MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
- MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
- MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
- MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
- MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
- MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
- MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
- MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
- MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
- MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
- MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
- MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
- MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
- MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
- MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
- MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
- MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
- MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
- MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
- MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
- MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
- MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
- MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
- buf[0] += a;
- buf[1] += b;
- buf[2] += c;
- buf[3] += d;
-}
-
-
-
-/*
- * Update context to reflect the concatenation of another buffer full
- * of bytes.
- */
-static void
-MD5Update (MD5_CTX *ctx, md5byte const *buf, unsigned len)
-{
- guint32 t;
-
- /* Update byte count */
-
- t = ctx->bytes[0];
- if ((ctx->bytes[0] = t + len) < t)
- ctx->bytes[1]++; /* Carry from low to high */
-
- t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */
- if (t > len)
- {
- memcpy((md5byte *)ctx->in + 64 - t, buf, len);
- return;
- }
- /* First chunk is an odd size */
- memcpy((md5byte *)ctx->in + 64 - t, buf, t);
- byteSwap(ctx->in, 16);
- MD5Transform(ctx->buf, ctx->in);
- buf += t;
- len -= t;
-
- /* Process data in 64-byte chunks */
- while (len >= 64)
- {
- memcpy(ctx->in, buf, 64);
- byteSwap(ctx->in, 16);
- MD5Transform(ctx->buf, ctx->in);
- buf += 64;
- len -= 64;
- }
-
- /* Handle any remaining bytes of data. */
- memcpy(ctx->in, buf, len);
-}
-
-
-
-/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern
- * 1 0* (64-bit count of bits processed, MSB-first)
- * Returns the newly allocated string of the hash.
- */
-static void
-MD5Final (unsigned char digest[16], MD5_CTX *ctx)
-{
- int count = ctx->bytes[0] & 0x3f; /* Number of bytes in ctx->in */
- md5byte *p = (md5byte *)ctx->in + count;
-
- /* Set the first char of padding to 0x80. There is always room. */
- *p++ = 0x80;
-
- /* Bytes of padding needed to make 56 bytes (-8..55) */
- count = 56 - 1 - count;
-
- if (count < 0) /* Padding forces an extra block */
- {
- memset(p, 0, count + 8);
- byteSwap(ctx->in, 16);
- MD5Transform(ctx->buf, ctx->in);
- p = (md5byte *)ctx->in;
- count = 56;
- }
- memset(p, 0, count);
- byteSwap(ctx->in, 14);
-
- /* Append length in bits and transform */
- ctx->in[14] = ctx->bytes[0] << 3;
- ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
- MD5Transform (ctx->buf, ctx->in);
-
- byteSwap(ctx->buf, 4);
-
- memcpy (digest, ctx->buf, 16);
-}
-
-
-
-static void
-get_md5 (const gchar *contents,
- guchar digest[16])
-{
- MD5_CTX ctx;
-
- MD5Init (&ctx);
- MD5Update (&ctx, (const guchar *) contents, strlen (contents));
- MD5Final (digest, &ctx);
-}
-
-
-
-GType
-exo_md5_digest_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = g_boxed_type_register_static (I_("ExoMd5Digest"),
- (GBoxedCopyFunc) exo_md5_digest_dup,
- (GBoxedFreeFunc) exo_md5_digest_free);
- }
-
- return type;
-}
-
-
-
-/**
- * exo_str_get_md5_digest:
- * @contents : The string to create a digest of.
- *
- * Creates a binary MD5 digest of the string @contents.
- *
- * Return value: A new binary MD5 digest. It should be freed
- * with exo_md5_digest_free() when no longer
- * needed.
- **/
-ExoMd5Digest*
-exo_str_get_md5_digest (const gchar *contents)
-{
- ExoMd5Digest *digest;
-
- g_return_val_if_fail (contents != NULL, NULL);
-
- digest = g_slice_new (ExoMd5Digest);
- get_md5 (contents, digest->digest);
-
- return digest;
-}
-
-
-
-/**
- * exo_str_get_md5_str:
- * @contents : The string to create a digest of.
- *
- * Creates a character array MD5 digestof the string
- * @contents.
- *
- * Return value: A newly-allocated character array which
- * should be free with g_free() when no
- * longer needed.
- **/
-gchar*
-exo_str_get_md5_str (const gchar *contents)
-{
- ExoMd5Digest digest;
-
- g_return_val_if_fail (contents != NULL, NULL);
-
- get_md5 (contents, digest.digest);
-
- return exo_md5_digest_to_str (&digest);
-}
-
-
-
-/**
- * exo_md5_str_to_digest:
- * @str_digest : The character array digest to convert.
- *
- * Converts thq @str_digest character array digest
- * into a binary digest.
- *
- * Return value: A newly allocated binary digest. It should
- * be freed with exo_md5_digest_free() when
- * no longer needed.
- **/
-ExoMd5Digest*
-exo_md5_str_to_digest (const gchar *str_digest)
-{
- ExoMd5Digest *digest;
- guint n;
-
- g_return_val_if_fail (str_digest != NULL, NULL);
- g_return_val_if_fail (strlen (str_digest) == 32, NULL);
-
- digest = g_slice_new (ExoMd5Digest);
- for (n = 0; n < 16; ++n)
- {
- digest->digest[n] =
- g_ascii_xdigit_value (str_digest[2 * n]) << 4 |
- g_ascii_xdigit_value (str_digest[2 * n + 1]);
- }
-
- return digest;
-}
-
-
-
-/**
- * exo_md5_digest_to_str:
- * @digest : The binary MD5 digest to convert.
- *
- * Converts the binary @digest to an ASCII character array
- * digest. The result can be used as an ordinary C string.
- *
- * Return value: A newly-allocated character array which
- * should be freed with g_free() when no
- * longer needed.
- **/
-gchar*
-exo_md5_digest_to_str (const ExoMd5Digest *digest)
-{
- static const gchar HEX_DIGITS[] = "0123456789abcdef";
- guchar *str_digest;
- guint n;
-
- g_return_val_if_fail (digest != NULL, NULL);
-
- str_digest = g_new (guchar, 33);
- for (n = 0; n < 16; n++)
- {
- str_digest[2 * n] = HEX_DIGITS[digest->digest[n] >> 4];
- str_digest[2 * n + 1] = HEX_DIGITS[digest->digest[n] & 0xf];
- }
- str_digest[32] = 0;
-
- return (gchar *) str_digest;
-}
-
-
-
-/**
- * exo_md5_digest_dup:
- * @digest : The MD5 digest to copy.
- *
- * Duplicates the contents of the @digest binary
- * MD5 digest.
- *
- * Return value: A new binary MD5 digest. It should
- * be freed with exo_md5_digest_free()
- * when no longer needed.
- **/
-ExoMd5Digest*
-exo_md5_digest_dup (const ExoMd5Digest *digest)
-{
- ExoMd5Digest *duplicate;
-
- if (G_LIKELY (digest != NULL))
- {
- /* take a copy of the digest */
- duplicate = g_slice_new (ExoMd5Digest);
- memcpy (duplicate, digest, sizeof (*digest));
- return duplicate;
- }
- else
- {
- /* duplicating NULL yields NULL */
- return NULL;
- }
-}
-
-
-
-/**
- * exo_md5_digest_free:
- * @digest : The MD5 digest to free.
- *
- * Frees the memory allocated for the MD5 binary
- * @digest.
- **/
-void
-exo_md5_digest_free (ExoMd5Digest *digest)
-{
- g_slice_free (ExoMd5Digest, digest);
-}
-
-
-
-/**
- * exo_md5_digest_hash:
- * @digest : The #ExoMd5Digest to hash.
- *
- * Gets the numeric hash of @digest, for use
- * in #GHashTable and #GCache.
- *
- * Return value: An unsigned integer hash of
- * the digest;
- **/
-guint
-exo_md5_digest_hash (gconstpointer digest)
-{
- return *((guint *) digest);
-}
-
-
-
-/**
- * exo_md5_digest_equal:
- * @digest1: the first #ExoMd5Digest to compare.
- * @digest2: the second #ExoMd5Digest to compare.
- *
- * Tests the equality of @digest1 and @digest2, useful for #GHashTable and
- * #GCashe.
- *
- * Returns: %TRUE if both digests are equal, %FALSE otherwise.
- **/
-gboolean
-exo_md5_digest_equal (gconstpointer digest1,
- gconstpointer digest2)
-{
- guint *d1;
- guint *d2;
- guint i;
-
- /* Both NULL or same digest */
- if (digest1 == digest2)
- return TRUE;
-
- /* One is NULL and the other isn't */
- if (digest1 == NULL || digest2 == NULL)
- return FALSE;
-
- d1 = (guint *) digest1;
- d2 = (guint *) digest2;
-
- for (i = 0; i < (16 / sizeof (guint)); ++i)
- {
- if (*d1 != *d2)
- return FALSE;
-
- d1 += i;
- d2 += i;
- }
-
- return TRUE;
-}
-
-
-
-#define __EXO_MD5_C__
-#include <exo/exo-aliasdef.c>
diff --git a/exo/exo-md5.h b/exo/exo-md5.h
deleted file mode 100644
index bad79c7..0000000
--- a/exo/exo-md5.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2004-2006 os-cillation e.K.
- * Copyright (c) 2004 James M. Cape <jcape at ignore-your.tv>
- *
- * 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
-
-#ifndef __EXO_MD5_H__
-#define __EXO_MD5_H__
-
-#include <exo/exo-config.h>
-
-G_BEGIN_DECLS
-
-#define EXO_TYPE_MD5_DIGEST (exo_md5_digest_get_type ())
-
-typedef struct _ExoMd5Digest ExoMd5Digest;
-struct _ExoMd5Digest
-{
- guchar digest[16];
-};
-
-GType exo_md5_digest_get_type (void) G_GNUC_CONST;
-
-ExoMd5Digest *exo_str_get_md5_digest (const gchar *contents) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gchar *exo_str_get_md5_str (const gchar *contents) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-ExoMd5Digest *exo_md5_str_to_digest (const gchar *str_digest) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gchar *exo_md5_digest_to_str (const ExoMd5Digest *digest) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-ExoMd5Digest *exo_md5_digest_dup (const ExoMd5Digest *digest) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-void exo_md5_digest_free (ExoMd5Digest *digest);
-
-guint exo_md5_digest_hash (gconstpointer digest);
-gboolean exo_md5_digest_equal (gconstpointer digest1,
- gconstpointer digest2);
-
-G_END_DECLS
-
-#endif /* !__EXO_MD5_H__ */
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-string.c b/exo/exo-string.c
index 7a40d18..2f90b73 100644
--- a/exo/exo-string.c
+++ b/exo/exo-string.c
@@ -385,55 +385,5 @@ exo_strndupv (gchar **strv,
-/**
- * exo_intern_string:
- * @string: a string
- *
- * Returns a canonical representation for @string. Interned strings can
- * be compared for equality by comparing the pointers, instead of using strcmp()
- * or exo_str_is_equal(). exo_intern_string() takes a copy of the @string for its
- * internal usage, so @string does not need to be static.
- *
- * Return value: a canonical representation for the string
- *
- * Since: 0.3.1.1
- */
-G_CONST_RETURN gchar*
-exo_intern_string (const gchar *string)
-{
-#if GLIB_CHECK_VERSION(2,9,0)
- return g_intern_string (string);
-#else
- return (string != NULL) ? g_quark_to_string (g_quark_from_string (string)) : NULL;
-#endif
-}
-
-
-
-/**
- * exo_intern_static_string:
- * @string: a static string
- *
- * Returns a canonical representation for @string. Interned strings can
- * be compared for equality by comparing the pointers, instead of using strcmp()
- * or exo_str_is_equal(). exo_intern_static_string() does not copy the string,
- * therefore @string must not be freed or modified.
- *
- * Return value: a canonical representation for the string
- *
- * Since: 0.3.1.1
- */
-G_CONST_RETURN gchar*
-exo_intern_static_string (const gchar *string)
-{
-#if GLIB_CHECK_VERSION(2,9,0)
- return g_intern_static_string (string);
-#else
- return (string != NULL) ? g_quark_to_string (g_quark_from_static_string (string)) : NULL;
-#endif
-}
-
-
-
#define __EXO_STRING_C__
#include <exo/exo-aliasdef.c>
diff --git a/exo/exo-string.h b/exo/exo-string.h
index f872fb1..40a7689 100644
--- a/exo/exo-string.h
+++ b/exo/exo-string.h
@@ -46,14 +46,7 @@ gchar *exo_strdup_strftime (const gchar *format,
gchar **exo_strndupv (gchar **strv,
gint num) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-G_CONST_RETURN gchar *exo_intern_string (const gchar *string);
-G_CONST_RETURN gchar *exo_intern_static_string (const gchar *string);
-
-#if GLIB_CHECK_VERSION(2,9,0)
#define I_(string) (g_intern_static_string ((string)))
-#else
-#define I_(string) (exo_intern_static_string ((string)))
-#endif
G_END_DECLS
diff --git a/exo/exo-thumbnail.c b/exo/exo-thumbnail.c
index 5ec09fc..7ca6e2c 100644
--- a/exo/exo-thumbnail.c
+++ b/exo/exo-thumbnail.c
@@ -52,7 +52,6 @@
#include <libxfce4util/libxfce4util.h>
#include <exo/exo-gdk-pixbuf-extensions.h>
-#include <exo/exo-md5.h>
#include <exo/exo-private.h>
#include <exo/exo-thumbnail.h>
#include <exo/exo-alias.h>
@@ -217,7 +216,7 @@ _exo_thumbnail_get_for_file (const gchar *filename,
if (G_LIKELY (uri != NULL))
{
/* determine the filename of the thumbnail */
- md5 = exo_str_get_md5_str (uri);
+ md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
name = g_strconcat (md5, ".png", NULL);
g_free (md5);
@@ -280,7 +279,7 @@ _exo_thumbnail_get_for_uri (const gchar *uri,
_exo_return_val_if_fail (uri != NULL, NULL);
/* determine the filename of the thumbnail */
- md5 = exo_str_get_md5_str (uri);
+ md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
name = g_strconcat (md5, ".png", NULL);
g_free (md5);
diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
index 60cf781..45b3520 100644
--- a/exo/exo-tree-view.c
+++ b/exo/exo-tree-view.c
@@ -308,7 +308,6 @@ exo_tree_view_button_press_event (GtkWidget *widget,
selected_paths = gtk_tree_selection_get_selected_rows (selection, NULL);
}
-#if GTK_CHECK_VERSION(2,9,0)
/* Rubberbanding in GtkTreeView 2.9.0 and above is rather buggy, unfortunately, and
* doesn't interact properly with GTKs own DnD mechanism. So we need to block all
* dragging here when pressing the mouse button on a not yet selected row if
@@ -343,7 +342,6 @@ exo_tree_view_button_press_event (GtkWidget *widget,
tree_view->priv->button_release_enables_rubber_banding = TRUE;
}
}
-#endif
/* call the parent's button press handler */
result = (*GTK_WIDGET_CLASS (exo_tree_view_parent_class)->button_press_event) (widget, event);
@@ -433,7 +431,6 @@ exo_tree_view_button_release_event (GtkWidget *widget,
}
}
-#if GTK_CHECK_VERSION(2,9,0)
/* check if we need to re-enable drag and drop */
if (G_LIKELY (tree_view->priv->button_release_unblocks_dnd))
{
@@ -454,7 +451,6 @@ exo_tree_view_button_release_event (GtkWidget *widget,
gtk_tree_view_set_rubber_banding (GTK_TREE_VIEW (tree_view), TRUE);
tree_view->priv->button_release_enables_rubber_banding = FALSE;
}
-#endif
/* call the parent's button release handler */
return (*GTK_WIDGET_CLASS (exo_tree_view_parent_class)->button_release_event) (widget, event);
@@ -473,7 +469,6 @@ exo_tree_view_motion_notify_event (GtkWidget *widget,
/* check if the event occurred on the tree view internal window and we are in single-click mode */
if (event->window == gtk_tree_view_get_bin_window (GTK_TREE_VIEW (tree_view)) && tree_view->priv->single_click)
{
-#if GTK_CHECK_VERSION(2,9,0)
/* check if we're doing a rubberband selection right now (which means DnD is blocked) */
if (G_UNLIKELY (tree_view->priv->button_release_unblocks_dnd))
{
@@ -484,7 +479,6 @@ exo_tree_view_motion_notify_event (GtkWidget *widget,
gdk_window_set_cursor (event->window, NULL);
}
else
-#endif
{
/* determine the path at the event coordinates */
if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tree_view), event->x, event->y, &path, NULL, NULL, NULL))
diff --git a/exo/exo.h b/exo/exo.h
index d01e2c1..de05b69 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>
@@ -49,9 +48,7 @@
#include <exo/exo-icon-chooser-dialog.h>
#include <exo/exo-icon-view.h>
#include <exo/exo-job.h>
-#include <exo/exo-md5.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 25dcce1..38c9bef 100644
--- a/exo/exo.symbols
+++ b/exo/exo.symbols
@@ -75,16 +75,6 @@ exo_check_version
#endif
#endif
-/* ExoEllipsizedLabel methods */
-#if IN_HEADER(__EXO_ELLIPSIZED_LABEL_H__)
-#if IN_SOURCE(__EXO_ELLIPSIZED_LABEL_C__)
-exo_ellipsized_label_get_type G_GNUC_CONST
-exo_ellipsized_label_new G_GNUC_MALLOC
-exo_ellipsized_label_get_ellipsize
-exo_ellipsized_label_set_ellipsize
-#endif
-#endif
-
/* exo-enum-types functions */
#if IN_HEADER(__EXO_ENUM_TYPES_H__)
#if IN_SOURCE(__EXO_ENUM_TYPES_C__)
@@ -129,8 +119,6 @@ exo_g_value_transform_negate
#if IN_HEADER(__EXO_GTK_EXTENSIONS_H__)
#if IN_SOURCE(__EXO_GTK_EXTENSIONS_C__)
exo_gtk_object_destroy_later
-exo_gtk_object_ref_sink
-exo_gtk_radio_action_set_current_value
exo_gtk_file_chooser_add_thumbnail_preview
#endif
#endif
@@ -174,12 +162,6 @@ exo_icon_view_new
exo_icon_view_new_with_model
exo_icon_view_get_model
exo_icon_view_set_model
-exo_icon_view_get_text_column
-exo_icon_view_set_text_column
-exo_icon_view_get_markup_column
-exo_icon_view_set_markup_column
-exo_icon_view_get_pixbuf_column
-exo_icon_view_set_pixbuf_column
exo_icon_view_get_orientation
exo_icon_view_set_orientation
exo_icon_view_get_columns
@@ -239,21 +221,6 @@ exo_icon_view_set_search_position_func
#endif
#endif
-/* exo-md5 functions */
-#if IN_HEADER(__EXO_MD5_H__)
-#if IN_SOURCE(__EXO_MD5_C__)
-exo_md5_digest_get_type G_GNUC_CONST
-exo_str_get_md5_digest G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-exo_str_get_md5_str G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-exo_md5_str_to_digest G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-exo_md5_digest_to_str G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-exo_md5_digest_dup G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-exo_md5_digest_free
-exo_md5_digest_hash
-exo_md5_digest_equal
-#endif
-#endif
-
/* exo-mount-point functions */
#if IN_HEADER(__EXO_MOUNT_POINT_H__)
#if IN_SOURCE(__EXO_MOUNT_POINT_C__)
@@ -280,14 +247,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__)
@@ -296,8 +255,6 @@ exo_str_is_equal
exo_str_replace G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
exo_strdup_strftime G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
exo_strndupv G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-exo_intern_string
-exo_intern_static_string
#endif
#endif
diff --git a/python/Makefile.am b/python/Makefile.am
index 94369e5..7bdafe2 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -3,16 +3,16 @@
SUBDIRS = \
examples
-defsdir = $(datadir)/pygtk/2.0/defs/exo-$(LIBEXO_VERSION_API)
+defsdir = $(datadir)/pygtk/2.0/defs/exo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR)
defs_DATA = exo.defs
pyexodir = $(pythondir)
pyexo_PYTHON = pyexo.py
-exomoduledir = $(pyexecdir)/exo-$(LIBEXO_VERSION_API)/exo
+exomoduledir = $(pyexecdir)/exo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR)/exo
exomodule_PYTHON = __init__.py
-exobindingsdir = $(pyexecdir)/exo-$(LIBEXO_VERSION_API)
+exobindingsdir = $(pyexecdir)/exo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR)
exobindings_LTLIBRARIES = _exo.la
_exo_la_CFLAGS = \
diff --git a/python/exo.defs b/python/exo.defs
index a7dbeb8..a4446d7 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
@@ -184,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")
@@ -450,51 +406,6 @@
)
)
-(define-method get_text_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_get_text_column")
- (return-type "gint")
-)
-
-(define-method set_text_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_set_text_column")
- (return-type "none")
- (parameters
- '("gint" "column")
- )
-)
-
-(define-method get_markup_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_get_markup_column")
- (return-type "gint")
-)
-
-(define-method set_markup_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_set_markup_column")
- (return-type "none")
- (parameters
- '("gint" "column")
- )
-)
-
-(define-method get_pixbuf_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_get_pixbuf_column")
- (return-type "gint")
-)
-
-(define-method set_pixbuf_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_set_pixbuf_column")
- (return-type "none")
- (parameters
- '("gint" "column")
- )
-)
-
(define-method get_orientation
(of-object "ExoIconView")
(c-name "exo_icon_view_get_orientation")
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3484aa5..74f8488 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,10 +37,10 @@ test_exo_mount_point_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS)
test_exo_mount_point_DEPENDENCIES = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_mount_point_LDADD = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_noop_SOURCES = \
test-exo-noop.c
@@ -50,10 +50,10 @@ test_exo_noop_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS)
test_exo_noop_DEPENDENCIES = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_noop_LDADD = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_string_SOURCES = \
test-exo-string.c
@@ -63,10 +63,10 @@ test_exo_string_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS)
test_exo_string_DEPENDENCIES = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_string_LDADD = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
noinst_PROGRAMS = \
test-exo-icon-chooser-dialog \
@@ -80,10 +80,10 @@ test_exo_icon_chooser_dialog_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS)
test_exo_icon_chooser_dialog_DEPENDENCIES = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_icon_chooser_dialog_LDADD = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_wrap_table_SOURCES = \
test-exo-wrap-table.c
@@ -93,10 +93,10 @@ test_exo_wrap_table_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS)
test_exo_wrap_table_DEPENDENCIES = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
test_exo_wrap_table_LDADD = \
- $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR).la
+ $(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
DISTCLEANFILES = test-exo-csource-data.c
BUILT_SOURCES = test-exo-csource-data.c
More information about the Xfce4-commits
mailing list