xfce4-places-plugin/01_port-to-exo-1.patch

   1 diff -Naur xfce4-places-plugin-1.2.0.orig/configure.in xfce4-places-plugin-1.2.0/configure.in
   2 --- xfce4-places-plugin-1.2.0.orig/configure.in 2009-07-31 08:21:02.000000000 +0200
   3 +++ xfce4-places-plugin-1.2.0/configure.in      2011-03-24 11:30:01.410713907 +0100
   4 @@ -25,7 +25,7 @@
   5  XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
   6  XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
   7  XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2])
   8 -XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1])
   9 +XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
  10
  11  dnl check for optional packages/versions
  12  XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes])
  13 diff -Naur xfce4-places-plugin-1.2.0.orig/panel-plugin/button.c xfce4-places-plugin-1.2.0/panel-plugin/button.c
  14 --- xfce4-places-plugin-1.2.0.orig/panel-plugin/button.c        2009-07-31 07:10:48.000000000 +0200
  15 +++ xfce4-places-plugin-1.2.0/panel-plugin/button.c     2011-03-24 11:31:15.310413668 +0100
  16 @@ -50,8 +50,7 @@
  17  #endif
  18
  19  #include <gtk/gtk.h>
  20 -#include <libxfce4panel/xfce-panel-plugin.h>
  21 -#include <libxfce4panel/xfce-hvbox.h>
  22 +#include <libxfce4panel/libxfce4panel.h>
  23  #include <string.h>
  24
  25  #define EXO_API_SUBJECT_TO_CHANGE
  26 diff -Naur xfce4-places-plugin-1.2.0.orig/panel-plugin/cfg.c xfce4-places-plugin-1.2.0/panel-plugin/cfg.c
  27 --- xfce4-places-plugin-1.2.0.orig/panel-plugin/cfg.c   2009-05-28 05:05:53.000000000 +0200
  28 +++ xfce4-places-plugin-1.2.0/panel-plugin/cfg.c        2011-03-24 11:31:27.124503667 +0100
  29 @@ -28,8 +28,7 @@
  30  #include <gtk/gtk.h>
  31
  32  #include <libxfce4util/libxfce4util.h>
  33 -#include <libxfce4panel/xfce-panel-plugin.h>
  34 -#include <libxfce4panel/xfce-panel-convenience.h>
  35 +#include <libxfce4panel/libxfce4panel.h>
  36  #include <libxfcegui4/libxfcegui4.h>
  37
  38  #include "cfg.h"
  39 diff -Naur xfce4-places-plugin-1.2.0.orig/panel-plugin/cfg.h xfce4-places-plugin-1.2.0/panel-plugin/cfg.h
  40 --- xfce4-places-plugin-1.2.0.orig/panel-plugin/cfg.h   2008-01-09 02:20:42.000000000 +0100
  41 +++ xfce4-places-plugin-1.2.0/panel-plugin/cfg.h        2011-03-24 11:31:39.458333668 +0100
  42 @@ -23,7 +23,7 @@
  43  #define _XFCE_PANEL_PLACES_CFG_H
  44
  45  #include <glib.h>
  46 -#include <libxfce4panel/xfce-panel-plugin.h>
  47 +#include <libxfce4panel/libxfce4panel.h>
  48  #include "view.h"
  49
  50  typedef struct
  51 diff -Naur xfce4-places-plugin-1.2.0.orig/panel-plugin/places.c xfce4-places-plugin-1.2.0/panel-plugin/places.c
  52 --- xfce4-places-plugin-1.2.0.orig/panel-plugin/places.c        2008-01-09 02:20:42.000000000 +0100
  53 +++ xfce4-places-plugin-1.2.0/panel-plugin/places.c     2011-03-24 11:32:07.524293668 +0100
  54 @@ -26,7 +26,7 @@
  55  #include <glib.h>
  56
  57  #include <libxfce4util/libxfce4util.h>
  58 -#include <libxfce4panel/xfce-panel-plugin.h>
  59 +#include <libxfce4panel/libxfce4panel.h>
  60
  61  #include "places.h"
  62  #include "view.h"
  63 diff -Naur xfce4-places-plugin-1.2.0.orig/panel-plugin/support.c xfce4-places-plugin-1.2.0/panel-plugin/support.c
  64 --- xfce4-places-plugin-1.2.0.orig/panel-plugin/support.c       2009-05-28 04:46:14.000000000 +0200
  65 +++ xfce4-places-plugin-1.2.0/panel-plugin/support.c    2011-03-24 11:33:48.803628667 +0100
  66 @@ -52,10 +52,9 @@
  67
  68      if(path != NULL && *path != '\0'){
  69
  70 -        DBG("exo_url_show(%s)", path);
  71 -        exo_success = exo_url_show(path, NULL, NULL);
  72 +    GError         *error = NULL;
  73
  74 -        if(!exo_success){
  75 +        if ( !gtk_show_uri (NULL, path, 0, &error)){
  76              gchar *cmd = g_strconcat("thunar \"", path, "\"", NULL);
  77              DBG("exec: %s", cmd);
  78              places_gui_exec(cmd);
  79 @@ -114,8 +113,9 @@
  80  void
  81  places_load_file(const gchar *path)
  82  {
  83 +    GError         *error = NULL;
  84      if(path != NULL && *path != '\0')
  85 -        exo_url_show(path, NULL, NULL);
  86 +        gtk_show_uri (NULL , path, 0, &error);
  87  }
  88
  89  /**
  90 diff -Naur xfce4-places-plugin-1.2.0.orig/panel-plugin/view.c xfce4-places-plugin-1.2.0/panel-plugin/view.c
  91 --- xfce4-places-plugin-1.2.0.orig/panel-plugin/view.c  2009-07-31 07:10:48.000000000 +0200
  92 +++ xfce4-places-plugin-1.2.0/panel-plugin/view.c       2011-03-24 11:34:16.969538668 +0100
  93 @@ -49,9 +49,7 @@
  94  #define USE_GTK_TOOLTIP_API     GTK_CHECK_VERSION(2,12,0)
  95
  96  #include <libxfce4util/libxfce4util.h>
  97 -#include <libxfce4panel/xfce-panel-plugin.h>
  98 -#include <libxfce4panel/xfce-panel-convenience.h>
  99 -#include <libxfce4panel/xfce-hvbox.h>
 100 +#include <libxfce4panel/libxfce4panel.h>
 101  #include <libxfcegui4/libxfcegui4.h>
 102
 103  #define EXO_API_SUBJECT_TO_CHANGE
 104 diff -Naur xfce4-places-plugin-1.2.0.orig/panel-plugin/view.h xfce4-places-plugin-1.2.0/panel-plugin/view.h
 105 --- xfce4-places-plugin-1.2.0.orig/panel-plugin/view.h  2008-01-09 02:20:42.000000000 +0100
 106 +++ xfce4-places-plugin-1.2.0/panel-plugin/view.h       2011-03-24 11:34:28.090642002 +0100
 107 @@ -25,7 +25,7 @@
 108
 109  #include <glib.h>
 110  #include <gtk/gtk.h>
 111 -#include <libxfce4panel/xfce-panel-plugin.h>
 112 +#include <libxfce4panel/libxfce4panel.h>
 113
 114  #define USE_RECENT_DOCUMENTS    GTK_CHECK_VERSION(2,10,0)
 115