[Xfce4-commits] <xfdesktop:master> Merge switch-to-exo-1 branch into master.

[Mark Trompell]

Hi Jannis,
I think you missed that one:
xfdesktop-file-properties-dialog.c:246: error:
'EXO_PANGO_ELLIPSIZE_START' undeclared (first use in this function)

On Sun, Aug 16, 2009 at 1:04 AM, Jannis Pohlmann<jannis at xfce.org> wrote:
> Updating branch refs/heads/master
>         to 169dc58f293eb1b73b78ab2bc962bc8cfec49f4b (commit)
>       from eebe64cc5ea7f56c18007ace69c71cbeecb1b079 (commit)
>
> commit 169dc58f293eb1b73b78ab2bc962bc8cfec49f4b
> Author: Jannis Pohlmann <jannis at xfce.org>
> Date:   Sun Aug 16 01:03:10 2009 +0200
>
>    Merge switch-to-exo-1 branch into master.
>
>    commit dc3554436f0950e9610e3bf8dc248a6813253175
>    Author: Jannis Pohlmann <jannis at xfce.org>
>    Date:   Thu Aug 13 16:05:33 2009 +0200
>
>        Use g_object_ref_sink() instead of exo_gtk_object_ref_sink().
>
>    commit f705cd20ce92f8f03ff35a0b503253b6894c8fcb
>    Author: Jannis Pohlmann <jannis at xfce.org>
>    Date:   Thu Aug 13 02:53:57 2009 +0200
>
>        Depend on exo-1 instead of exo-0.3.
>
>  configure.ac.in                   |    2 +-
>  src/xfdesktop-file-icon-manager.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac.in b/configure.ac.in
> index 8381282..4760f54 100644
> --- a/configure.ac.in
> +++ b/configure.ac.in
> @@ -139,7 +139,7 @@ dnl calls AM_CONDITIONAL(), which cannot be in an 'if' block
>  XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-1], [thunar_minimum_version],
>     [thunarx],
>     [Thunar's extension mechanism, to add external features to the desktop icon implementation])
> -XDT_CHECK_OPTIONAL_PACKAGE([LIBEXO], [exo-0.3], [exo_minimum_version], [exo],
> +XDT_CHECK_OPTIONAL_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version], [exo],
>     [libexo, for nifty icon effects])
>
>
> diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
> index 8873399..19934f2 100644
> --- a/src/xfdesktop-file-icon-manager.c
> +++ b/src/xfdesktop-file-icon-manager.c
> @@ -1559,7 +1559,7 @@ xfdesktop_file_icon_menu_fill_template_menu(GtkWidget *menu,
>         {
>           /* allocate a new submenu for the directory */
>           submenu = gtk_menu_new ();
> -          exo_gtk_object_ref_sink (GTK_OBJECT (submenu));
> +          g_object_ref_sink (G_OBJECT (submenu));
>           gtk_menu_set_screen (GTK_MENU (submenu), gtk_widget_get_screen (menu));
>
>           /* fill the submenu from the folder contents */
> _______________________________________________
> Xfce4-commits mailing list
> Xfce4-commits at xfce.org
> http://foo-projects.org/mailman/listinfo/xfce4-commits
>

-- 
Mark Trompell

Foresight Linux Xfce Edition
Cause your desktop should be freaking cool
(and Xfce)