[Xfce4-commits] <thunar-media-tags-plugin:master> Fix compilation issues.

[Nick Schermer]

Updating branch refs/heads/master
         to b9a7d39a8342d32cee1506fa2bad7a317a5bcdfd (commit)
       from 7c910afc25976ed220da9a8cceacf9c72ea78cec (commit)

commit b9a7d39a8342d32cee1506fa2bad7a317a5bcdfd
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Nov 30 18:25:54 2011 +0100

    Fix compilation issues.

 thunar-plugin/audio-tags-page.c   |    4 ++++
 thunar-plugin/media-tags-plugin.c |    7 +++++++
 thunar-plugin/tag-renamer.c       |   20 ++++++++------------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/thunar-plugin/audio-tags-page.c b/thunar-plugin/audio-tags-page.c
index 40b226f..5b2c1f5 100644
--- a/thunar-plugin/audio-tags-page.c
+++ b/thunar-plugin/audio-tags-page.c
@@ -1000,7 +1000,11 @@ audio_tags_page_info_activate (GtkAction *action,
   mimetype = thunarx_file_info_get_mime_type (page->file);
   fileinfo = thunarx_file_info_get_file_info (page->file);
   filename = g_file_info_get_display_name (fileinfo);
+#if GLIB_CHECK_VERSION (2, 30, 0)
+  filesize = g_format_size (g_file_info_get_size (fileinfo));
+#else
   filesize = g_format_size_for_display (g_file_info_get_size (fileinfo));
+#endif
 
   /* Create layout table */
   table = gtk_table_new (7, 2, FALSE);
diff --git a/thunar-plugin/media-tags-plugin.c b/thunar-plugin/media-tags-plugin.c
index 892968b..1b3b64f 100644
--- a/thunar-plugin/media-tags-plugin.c
+++ b/thunar-plugin/media-tags-plugin.c
@@ -30,6 +30,13 @@
 
 
 
+G_MODULE_EXPORT void thunar_extension_initialize (ThunarxProviderPlugin *plugin);
+G_MODULE_EXPORT void thunar_extension_shutdown   (void);
+G_MODULE_EXPORT void thunar_extension_list_types (const GType **types,
+                                                  gint         *n_types);
+
+
+
 static GType type_list[1];
 
 
diff --git a/thunar-plugin/tag-renamer.c b/thunar-plugin/tag-renamer.c
index bdbb17c..fb2a8f3 100644
--- a/thunar-plugin/tag-renamer.c
+++ b/thunar-plugin/tag-renamer.c
@@ -415,15 +415,14 @@ tag_renamer_process_format (TagRenamer      *tag_renamer,
                             ThunarxFileInfo *file,
                             const gchar     *format)
 {
-  TagLib_File                  *taglib_file;
-  TagLib_Tag                   *taglib_tag;
-  const TagLib_AudioProperties *taglib_properties;
-  const gchar                  *value;
-  guint                         integer;
-  gchar                        *uri, *filename;
-  gchar                        *string, *tmp;
-  GString                      *result;
-  const gchar                  *p;
+  TagLib_File *taglib_file;
+  TagLib_Tag  *taglib_tag;
+  const gchar *value;
+  guint        integer;
+  gchar       *uri, *filename;
+  gchar       *string, *tmp;
+  GString     *result;
+  const gchar *p;
 
   /* Get the file uri, return on fail */
   uri = thunarx_file_info_get_uri (file);
@@ -450,9 +449,6 @@ tag_renamer_process_format (TagRenamer      *tag_renamer,
       return NULL;
     }
 
-  /* Load tag properties */
-  taglib_properties = taglib_file_audioproperties (taglib_file);
-
   /* Create string with some size */
   result = g_string_sized_new (512);