]>
Commit | Line | Data |
---|---|---|
f61af1a1 MB |
1 | Description: Port to exo-1 |
2 | Origin: backport, http://bugzilla.xfce.org/show_bug.cgi?id=5754 | |
3 | Bug: http://bugzilla.xfce.org/show_bug.cgi?id=5754 | |
4 | --- xfce4-places-plugin-1.2.0.orig/panel-plugin/support.c | |
5 | +++ xfce4-places-plugin-1.2.0/panel-plugin/support.c | |
6 | @@ -48,14 +48,11 @@ | |
7 | void | |
8 | places_load_file_browser(const gchar *path) | |
9 | { | |
10 | - gboolean exo_success; | |
11 | + GError *error = NULL; | |
12 | ||
13 | if(path != NULL && *path != '\0'){ | |
14 | ||
15 | - DBG("exo_url_show(%s)", path); | |
16 | - exo_success = exo_url_show(path, NULL, NULL); | |
17 | - | |
18 | - if(!exo_success){ | |
19 | + if(!gtk_show_uri(NULL, path, 0, &error)){ | |
20 | gchar *cmd = g_strconcat("thunar \"", path, "\"", NULL); | |
21 | DBG("exec: %s", cmd); | |
22 | places_gui_exec(cmd); | |
23 | @@ -114,8 +111,9 @@ places_load_terminal(const gchar *const_ | |
24 | void | |
25 | places_load_file(const gchar *path) | |
26 | { | |
27 | + GError *error = NULL; | |
28 | if(path != NULL && *path != '\0') | |
29 | - exo_url_show(path, NULL, NULL); | |
30 | + gtk_show_uri(NULL , path, 0, &error); | |
31 | } | |
32 | ||
33 | /** | |
34 | --- xfce4-places-plugin-1.2.0.orig/configure.in | |
35 | +++ xfce4-places-plugin-1.2.0/configure.in | |
36 | @@ -25,7 +25,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxf | |
37 | XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) | |
38 | XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2]) | |
39 | XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2]) | |
40 | -XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1]) | |
41 | +XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0]) | |
42 | ||
43 | dnl check for optional packages/versions | |
44 | XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes]) |