[Xfce4-commits] <xfce4-places-plugin:master> Description: Port to exo-1 Origin: backport, http://bugzilla.xfce.org/show_bug.cgi?id=5754 Bug: http://bugzilla.xfce.org/show_bug.cgi?id=5754

[Andrzej]

Updating branch refs/heads/master
         to e3d56eb79974f2032e33cc7707cab43be5bb6e6e (commit)
       from 358d62155be4ad95f7011270b484d73170a7cb21 (commit)

commit e3d56eb79974f2032e33cc7707cab43be5bb6e6e
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Tue Apr 3 04:14:15 2012 +0900

    Description: Port to exo-1
    Origin: backport, http://bugzilla.xfce.org/show_bug.cgi?id=5754
    Bug: http://bugzilla.xfce.org/show_bug.cgi?id=5754
    
    (committer comment: changed configure.in into configure.in.in)

 configure.in.in        |    2 +-
 panel-plugin/support.c |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 9198fce..b86b74a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -25,7 +25,7 @@ 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-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/support.c b/panel-plugin/support.c
index 3546cd6..104a5e6 100644
--- a/panel-plugin/support.c
+++ b/panel-plugin/support.c
@@ -48,14 +48,11 @@
 void
 places_load_file_browser(const gchar *path)
 {
-    gboolean exo_success;
+    GError *error = NULL;
 
     if(path != NULL && *path != '\0'){
 
-        DBG("exo_url_show(%s)", path);
-        exo_success = exo_url_show(path, NULL, 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 +111,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);
 }
 
 /**