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

[Jannis Pohlmann]

Updating branch refs/heads/master
         to b4e92fb2539e2ae5608449983f040d7ee6d31233 (commit)
       from f1449c6a3be8426a280f0cc6d86c72432f8c39a7 (commit)

commit b4e92fb2539e2ae5608449983f040d7ee6d31233
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Aug 16 00:51:32 2009 +0200

    Merge switch-to-exo-1 branch into master.
    
    commit 7b364ccf40ae45876cbaec21dbf8887138db220d
    Author: Jannis Pohlmann <jannis at xfce.org>
    Date:   Thu Aug 13 16:07:52 2009 +0200
    
        Use g_object_ref_sink() instead of exo_gtk_object_ref_sink().
    
    commit 00f64282127887d1862f9fd030bb1b0d889c02f6
    Author: Jannis Pohlmann <jannis at xfce.org>
    Date:   Thu Aug 13 03:30:15 2009 +0200
    
        Depend on exo-1 instead of exo-0.3.
    
        Change exo0.3 to exo1 in xfce4-panel.spec.in. I don't know whether this
        is correct or not.

 configure.in.in             |    2 +-
 plugins/launcher/launcher.c |    2 +-
 xfce4-panel.spec.in         |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 72f5884..9e82081 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -112,7 +112,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.12.0])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.100])
+XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.3.100])
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0])
 
 dnl **********************
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index a9fcc4e..492c1ca 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -1032,7 +1032,7 @@ launcher_plugin_new (XfcePanelPlugin *plugin)
 #if !LAUNCHER_NEW_TOOLTIP_API
     /* create tooltips */
     launcher->tips = gtk_tooltips_new ();
-    exo_gtk_object_ref_sink (GTK_OBJECT (launcher->tips));
+    g_object_ref_sink (G_OBJECT (launcher->tips));
 #endif
 
     /* create widgets */
diff --git a/xfce4-panel.spec.in b/xfce4-panel.spec.in
index 06719dd..ed1b425 100644
--- a/xfce4-panel.spec.in
+++ b/xfce4-panel.spec.in
@@ -9,12 +9,12 @@ Group: 			User Interface/Desktops
 BuildRoot: 		%{_tmppath}/%{name}-root
 Requires:		libxfce4util >= @LIBXFCEGUI4_REQUIRED_VERSION@
 Requires:		libxfcegui4 >= @LIBXFCEGUI4_REQUIRED_VERSION@
-Requires:		exo0.3 >= @EXO_REQUIRED_VERSION@
+Requires:		exo1 >= @EXO_REQUIRED_VERSION@
 Requires:		gtk2 >= @GTK_REQUIRED_VERSION@
 Requires:		startup-notification >= @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
 BuildRequires:		libxfce4util-devel >= @LIBXFCEGUI4_REQUIRED_VERSION@
 BuildRequires:		libxfcegui4-devel >= @LIBXFCEGUI4_REQUIRED_VERSION@
-BuildRequires:		exo0.3-devel >= @EXO_REQUIRED_VERSION@
+BuildRequires:		exo1-devel >= @EXO_REQUIRED_VERSION@
 BuildRequires:		gtk2-devel >= @GTK_REQUIRED_VERSION@
 
 %description