[gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-places-plugin/files: xfce4-places-plugin-1.2.0-exo.patch

[gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-places-plugin/files: xfce4-places-plugin-1.2.0-exo.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/09/10 07:45:02

  Added:                xfce4-places-plugin-1.2.0-exo.patch
  Log:
  Port xfce4-places-plugin to exo-0.5 API wrt upstream #5754.
  
  (Portage version: 2.2_rc78/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.2.0-exo.patch?rev=1.1&content-type=text/plain

Index: xfce4-places-plugin-1.2.0-exo.patch
===================================================================
http://bugzilla.xfce.org/show_bug.cgi?id=5754

--- configure.in
+++ configure.in
@@ -25,7 +25,7 @@
 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])
 
 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])
--- panel-plugin/support.c
+++ panel-plugin/support.c
@@ -52,10 +52,9 @@
 
     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 @@
 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);
 }
 
 /**