From b1db876c92085841e88b1f476bf4efbff58a545f Mon Sep 17 00:00:00 2001 From: Romain Bouvier Date: Mon, 10 Jan 2011 21:37:06 +0100 Subject: [PATCH] Fix and clean build with xfce4-panel 4.7/exo 0.5 --- configure.in.in | 3 ++- panel-plugin/button.c | 3 +-- panel-plugin/cfg.c | 3 +-- panel-plugin/cfg.h | 2 +- panel-plugin/places.c | 2 +- panel-plugin/support.c | 8 ++++---- panel-plugin/view.c | 4 +--- panel-plugin/view.h | 2 +- panel-plugin/xfce46-compat.c | 3 +-- 9 files changed, 13 insertions(+), 17 deletions(-) diff --git a/configure.in.in b/configure.in.in index 9198fce..65f66f0 100644 --- a/configure.in.in +++ b/configure.in.in @@ -25,7 +25,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2]) XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2]) -XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1]) +XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1], [], + [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])]) dnl check for optional packages/versions XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes]) diff --git a/panel-plugin/button.c b/panel-plugin/button.c index 8a4a0be..5bb3f0e 100644 --- a/panel-plugin/button.c +++ b/panel-plugin/button.c @@ -50,8 +50,7 @@ #endif #include -#include -#include +#include #include #define EXO_API_SUBJECT_TO_CHANGE diff --git a/panel-plugin/cfg.c b/panel-plugin/cfg.c index dcc395e..20ec24a 100644 --- a/panel-plugin/cfg.c +++ b/panel-plugin/cfg.c @@ -28,8 +28,7 @@ #include #include -#include -#include +#include #include #include "cfg.h" diff --git a/panel-plugin/cfg.h b/panel-plugin/cfg.h index 18994dd..a0e5f9a 100644 --- a/panel-plugin/cfg.h +++ b/panel-plugin/cfg.h @@ -23,7 +23,7 @@ #define _XFCE_PANEL_PLACES_CFG_H #include -#include +#include #include "view.h" typedef struct diff --git a/panel-plugin/places.c b/panel-plugin/places.c index d0c72bc..4fe3557 100644 --- a/panel-plugin/places.c +++ b/panel-plugin/places.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "places.h" #include "view.h" diff --git a/panel-plugin/support.c b/panel-plugin/support.c index 3546cd6..bd4fe5b 100644 --- a/panel-plugin/support.c +++ b/panel-plugin/support.c @@ -52,10 +52,9 @@ places_load_file_browser(const gchar *path) if(path != NULL && *path != '\0'){ - DBG("exo_url_show(%s)", path); - exo_success = exo_url_show(path, NULL, NULL); + GError *error = NULL; - if(!exo_success){ + if ( !gtk_show_uri (NULL, path, 0, &error)){ gchar *cmd = g_strconcat("thunar \"", path, "\"", NULL); DBG("exec: %s", cmd); places_gui_exec(cmd); @@ -114,8 +113,9 @@ places_load_terminal(const gchar *const_path) void places_load_file(const gchar *path) { + GError *error = NULL; if(path != NULL && *path != '\0') - exo_url_show(path, NULL, NULL); + gtk_show_uri (NULL , path, 0, &error); } /** diff --git a/panel-plugin/view.c b/panel-plugin/view.c index 9358a4d..2f21492 100644 --- a/panel-plugin/view.c +++ b/panel-plugin/view.c @@ -49,9 +49,7 @@ #define USE_GTK_TOOLTIP_API GTK_CHECK_VERSION(2,12,0) #include -#include -#include -#include +#include #include #define EXO_API_SUBJECT_TO_CHANGE diff --git a/panel-plugin/view.h b/panel-plugin/view.h index 1634e0e..12ac0d5 100644 --- a/panel-plugin/view.h +++ b/panel-plugin/view.h @@ -25,7 +25,7 @@ #include #include -#include +#include #define USE_RECENT_DOCUMENTS GTK_CHECK_VERSION(2,10,0) diff --git a/panel-plugin/xfce46-compat.c b/panel-plugin/xfce46-compat.c index 9bf8fb1..8f2dfff 100644 --- a/panel-plugin/xfce46-compat.c +++ b/panel-plugin/xfce46-compat.c @@ -27,8 +27,7 @@ #include "xfce46-compat.h" -#include -#include +#include /* support macros for debugging */ #ifndef NDEBUG -- 1.7.3.4