]>
Commit | Line | Data |
---|---|---|
69514dda MB |
1 | Description: Port to thunarx-2 |
2 | Upstream patch for commit 'b805797f9bed98229f036e56c98ec16f40b539aa' | |
3 | slightly updated to include '270924abcab81275dede68d882936c14b238b3ec' | |
4 | (more realistic thunar version, 1.0.1 instead of 0.2.3svn-r20526). | |
5 | . | |
6 | Also slightly updated to patch configure.in instead of configure.in.in | |
7 | (not available in released tarballs). | |
8 | Origin: backport, http://git.xfce.org/thunar-plugins/thunar-media-tags-plugin/commit/?h=thunarx-2&id=b805797f9bed98229f036e56c98ec16f40b539aa | |
9 | --- | |
10 | diff --git a/configure.in b/configure.in | |
11 | index 0ea7f85..8764561 100644 | |
12 | --- a/configure.in | |
13 | +++ b/configure.in | |
14 | @@ -65,8 +65,7 @@ dnl *********************************** | |
15 | dnl *** Check for required packages *** | |
16 | dnl *********************************** | |
17 | XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3]) | |
18 | -XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.2.3svn-r20526]) | |
19 | -XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.2.3svn-r20526]) | |
20 | +XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1]) | |
21 | XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4]) | |
22 | ||
23 | dnl *********************************** | |
24 | diff --git a/thunar-plugin/Makefile.am b/thunar-plugin/Makefile.am | |
25 | index a3c2c25..a7bdb58 100644 | |
26 | --- a/thunar-plugin/Makefile.am | |
27 | +++ b/thunar-plugin/Makefile.am | |
28 | @@ -8,7 +8,7 @@ | |
29 | -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ | |
30 | $(PLATFORM_CPPFLAGS) | |
31 | ||
32 | -extensionsdir = $(libdir)/thunarx-1 | |
33 | +extensionsdir = $(libdir)/thunarx-2 | |
34 | extensions_LTLIBRARIES = \ | |
35 | thunar-media-tags-plugin.la | |
36 | ||
37 | @@ -25,7 +25,6 @@ | |
38 | $(EXO_CFLAGS) \ | |
39 | $(PLATFORM_CFLAGS) \ | |
40 | $(THUNARX_CFLAGS) \ | |
41 | - $(THUNARVFS_CFLAGS) \ | |
42 | $(TAGLIB_CFLAGS) \ | |
43 | $(TAGLIBC_CFLAGS) | |
44 | ||
45 | @@ -34,7 +33,6 @@ | |
46 | -export-dynamic \ | |
47 | -module \ | |
48 | $(THUNARX_LIBS) \ | |
49 | - $(THUNARVFS_LIBS) \ | |
50 | $(TAGLIB_LIBS) \ | |
51 | $(TAGLIBC_LIBS) \ | |
52 | $(PLATFORM_LDFLAGS) | |
53 | diff --git a/thunar-plugin/audio-tags-page.c b/thunar-plugin/audio-tags-page.c | |
54 | index 099d7ad..7e5dab5 100644 | |
55 | --- a/thunar-plugin/audio-tags-page.c | |
56 | +++ b/thunar-plugin/audio-tags-page.c | |
57 | @@ -32,7 +32,6 @@ | |
58 | #include <taglib/tag_c.h> | |
59 | ||
60 | #include <exo/exo.h> | |
61 | -#include <thunar-vfs/thunar-vfs.h> | |
62 | ||
63 | #include <audio-tags-page.h> | |
64 | ||
65 | @@ -977,8 +976,8 @@ audio_tags_page_info_activate (GtkAction *action, | |
66 | ||
67 | gchar *mimetype; | |
68 | ||
69 | - ThunarVfsInfo *vfs_info; | |
70 | - gchar *filename; | |
71 | + GFileInfo *fileinfo; | |
72 | + const char *filename; | |
73 | gchar *filesize; | |
74 | ||
75 | g_return_val_if_fail (page != NULL || IS_AUDIO_TAGS_PAGE (page), FALSE); | |
76 | @@ -1007,9 +1006,9 @@ audio_tags_page_info_activate (GtkAction *action, | |
77 | ||
78 | /* Additional information */ | |
79 | mimetype = thunarx_file_info_get_mime_type (page->file); | |
80 | - vfs_info = thunarx_file_info_get_vfs_info (page->file); | |
81 | - filename = vfs_info->display_name; | |
82 | - filesize = thunar_vfs_humanize_size (vfs_info->size, NULL, 0); | |
83 | + fileinfo = thunarx_file_info_get_file_info (page->file); | |
84 | + filename = g_file_info_get_display_name (fileinfo); | |
85 | + filesize = g_format_size_for_display (g_file_info_get_size (fileinfo)); | |
86 | ||
87 | /* Create layout table */ | |
88 | table = gtk_table_new (7, 2, FALSE); | |
89 | @@ -1121,7 +1120,7 @@ audio_tags_page_info_activate (GtkAction *action, | |
90 | g_free (filesize); | |
91 | g_free (mimetype); | |
92 | ||
93 | - thunar_vfs_info_unref (vfs_info); | |
94 | + g_object_unref (fileinfo); | |
95 | ||
96 | return TRUE; | |
97 | } | |
98 |