[Xfce4-commits] <thunar-media-tags-plugin:master> Fix a bunch of compiler warnings.
Nick Schermer
noreply at xfce.org
Wed Nov 30 20:34:01 CET 2011
Updating branch refs/heads/master
to 655a7bee112a66acdd0d6667be4c2991024eb24b (commit)
from 1d60378b352e30688588c5eb84968cbf702f5ca6 (commit)
commit 655a7bee112a66acdd0d6667be4c2991024eb24b
Author: Nick Schermer <nick at xfce.org>
Date: Wed Nov 30 20:27:23 2011 +0100
Fix a bunch of compiler warnings.
thunar-plugin/audio-tags-page.c | 60 +++++++++++++++++------------------
thunar-plugin/media-tags-provider.c | 2 -
thunar-plugin/tag-renamer.c | 6 +--
3 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/thunar-plugin/audio-tags-page.c b/thunar-plugin/audio-tags-page.c
index fd8e015..b5862f9 100644
--- a/thunar-plugin/audio-tags-page.c
+++ b/thunar-plugin/audio-tags-page.c
@@ -55,8 +55,6 @@ enum
-static void audio_tags_page_class_init (AudioTagsPageClass *klass);
-static void audio_tags_page_init (AudioTagsPage *page);
static void audio_tags_page_finalize (GObject *object);
static void audio_tags_page_get_property (GObject *object,
guint prop_id,
@@ -279,7 +277,35 @@ audio_tags_page_init (AudioTagsPage *page)
GtkWidget *spin;
GtkWidget *toplevel;
GtkAction *action;
- int i;
+ guint i;
+
+ /* Default genre list */
+ static const gchar *genres[] = {
+ "A Cappella", "Acid", "Acid Jazz", "Acid Punk", "Acoustic", "Alt. Rock",
+ "Alternative", "Ambient", "Anime", "Avantgarde", "Ballad", "Bass",
+ "Beat", "Bebob", "Big Band", "Black Metal", "Bluegrass", "Blues",
+ "Booty Bass", "BritPop", "Cabaret", "Celtic", "Chamber music", "Chanson",
+ "Chorus", "Christian Gangsta Rap", "Christian Rap", "Christian Rock", "Classic Rock", "Classical",
+ "Club", "Club-House", "Comedy", "Contemporary Christian", "Country", "Crossover",
+ "Cult", "Dance", "Dance Hall", "Darkwave", "Death Metal", "Disco",
+ "Dream", "Drum & Bass", "Drum Solo", "Duet", "Easy Listening", "Electronic",
+ "Ethnic", "Euro-House", "Euro-Techno", "Eurodance", "Fast Fusion", "Folk",
+ "Folk-Rock", "Folklore", "Freestyle", "Funk", "Fusion", "Game",
+ "Gangsta", "Goa", "Gospel", "Gothic", "Gothic Rock", "Grunge",
+ "Hard Rock", "Hardcore", "Heavy Metal", "Hip-Hop", "House", "Humour",
+ "Indie", "Industrial", "Instrumental", "Instrumental pop", "Instrumental rock", "JPop",
+ "Jazz", "Jazz+Funk", "Jungle", "Latin", "Lo-Fi", "Meditative",
+ "Merengue", "Metal", "Musical", "National Folk", "Native American", "Negerpunk",
+ "New Age", "New Wave", "Noise", "Oldies", "Opera", "Other",
+ "Polka", "Polsk Punk", "Pop", "Pop-Folk", "Pop/Funk", "Porn Groove",
+ "Power Ballad", "Pranks", "Primus", "Progressive Rock", "Psychedelic", "Psychedelic Rock",
+ "Punk", "Punk Rock", "R&B", "Rap", "Rave", "Reggae",
+ "Retro", "Revival", "Rhythmic soul", "Rock", "Rock & Roll", "Salsa",
+ "Samba", "Satire", "Showtunes", "Ska", "Slow Jam", "Slow Rock",
+ "Sonata", "Soul", "Sound Clip", "Soundtrack", "Southern Rock", "Space",
+ "Speech", "Swing", "Symphonic Rock", "Symphony", "Synthpop", "Tango",
+ "Techno", "Techno-Industrial", "Terror", "Thrash Metal", "Top 40", "Trailer",
+ };
gtk_container_set_border_width (GTK_CONTAINER (page), 8);
@@ -413,34 +439,6 @@ audio_tags_page_init (AudioTagsPage *page)
gtk_table_attach (GTK_TABLE (page->table), combo, 1, 4, 5, 6, GTK_FILL, 0, 0, 0);
gtk_widget_show (combo);
- /* Default genre list */
- static const gchar *genres[] = {
- "A Cappella", "Acid", "Acid Jazz", "Acid Punk", "Acoustic", "Alt. Rock",
- "Alternative", "Ambient", "Anime", "Avantgarde", "Ballad", "Bass",
- "Beat", "Bebob", "Big Band", "Black Metal", "Bluegrass", "Blues",
- "Booty Bass", "BritPop", "Cabaret", "Celtic", "Chamber music", "Chanson",
- "Chorus", "Christian Gangsta Rap", "Christian Rap", "Christian Rock", "Classic Rock", "Classical",
- "Club", "Club-House", "Comedy", "Contemporary Christian", "Country", "Crossover",
- "Cult", "Dance", "Dance Hall", "Darkwave", "Death Metal", "Disco",
- "Dream", "Drum & Bass", "Drum Solo", "Duet", "Easy Listening", "Electronic",
- "Ethnic", "Euro-House", "Euro-Techno", "Eurodance", "Fast Fusion", "Folk",
- "Folk-Rock", "Folklore", "Freestyle", "Funk", "Fusion", "Game",
- "Gangsta", "Goa", "Gospel", "Gothic", "Gothic Rock", "Grunge",
- "Hard Rock", "Hardcore", "Heavy Metal", "Hip-Hop", "House", "Humour",
- "Indie", "Industrial", "Instrumental", "Instrumental pop", "Instrumental rock", "JPop",
- "Jazz", "Jazz+Funk", "Jungle", "Latin", "Lo-Fi", "Meditative",
- "Merengue", "Metal", "Musical", "National Folk", "Native American", "Negerpunk",
- "New Age", "New Wave", "Noise", "Oldies", "Opera", "Other",
- "Polka", "Polsk Punk", "Pop", "Pop-Folk", "Pop/Funk", "Porn Groove",
- "Power Ballad", "Pranks", "Primus", "Progressive Rock", "Psychedelic", "Psychedelic Rock",
- "Punk", "Punk Rock", "R&B", "Rap", "Rave", "Reggae",
- "Retro", "Revival", "Rhythmic soul", "Rock", "Rock & Roll", "Salsa",
- "Samba", "Satire", "Showtunes", "Ska", "Slow Jam", "Slow Rock",
- "Sonata", "Soul", "Sound Clip", "Soundtrack", "Southern Rock", "Space",
- "Speech", "Swing", "Symphonic Rock", "Symphony", "Synthpop", "Tango",
- "Techno", "Techno-Industrial", "Terror", "Thrash Metal", "Top 40", "Trailer",
- };
-
for (i=0; i<G_N_ELEMENTS (genres); i++)
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), genres[i]);
diff --git a/thunar-plugin/media-tags-provider.c b/thunar-plugin/media-tags-provider.c
index 2c31a98..71273c4 100644
--- a/thunar-plugin/media-tags-provider.c
+++ b/thunar-plugin/media-tags-provider.c
@@ -31,9 +31,7 @@
-static void media_tags_provider_class_init (MediaTagsProviderClass *klass);
static void media_tags_provider_tag_renamer_provider_init (ThunarxRenamerProviderIface *iface);
-static void media_tags_provider_init (MediaTagsProvider *sbr_provider);
static GList *media_tags_provider_get_renamers (ThunarxRenamerProvider *renamer_provider);
static void media_tags_provider_audio_tags_page_provider_init (ThunarxPropertyPageProviderIface *iface);
static GList *media_tags_provider_get_pages (ThunarxPropertyPageProvider *renamer_provider,
diff --git a/thunar-plugin/tag-renamer.c b/thunar-plugin/tag-renamer.c
index fb2a8f3..9429f67 100644
--- a/thunar-plugin/tag-renamer.c
+++ b/thunar-plugin/tag-renamer.c
@@ -94,8 +94,6 @@ enum
-static void tag_renamer_class_init (TagRenamerClass *klass);
-static void tag_renamer_init (TagRenamer *tag_renamer);
static void tag_renamer_finalize (GObject *object);
static void tag_renamer_get_property (GObject *object,
guint prop_id,
@@ -233,7 +231,7 @@ tag_renamer_init (TagRenamer *tag_renamer)
GtkListStore *store;
GtkCellRenderer *cell;
GtkTreeIter iter;
- gint n;
+ guint n;
table = gtk_table_new (2, 4, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
@@ -556,7 +554,7 @@ static gchar*
tag_renamer_process (ThunarxRenamer *renamer,
ThunarxFileInfo *file,
const gchar *text,
- guint index)
+ guint idx)
{
TagRenamer *tag_renamer = TAG_RENAMER (renamer);
const gchar *format;
More information about the Xfce4-commits
mailing list