[banshee] Do not add empty strings or those starting with @



commit 4eb1663c8e6c4a29fa3a23f5e4dca1b21ea660bf
Author: Aaron Bockover <abockover novell com>
Date:   Tue Dec 15 16:32:19 2009 -0500

    Do not add empty strings or those starting with @

 build/addin-xml-string-extract |    7 ++++++-
 data/addin-xml-strings.cs      |    6 ------
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/build/addin-xml-string-extract b/build/addin-xml-string-extract
index 5713c46..d4ada71 100755
--- a/build/addin-xml-string-extract
+++ b/build/addin-xml-string-extract
@@ -23,7 +23,12 @@ foreach (@ARGV) {
 		my $nodes = $xpath->find ($query);
 		if ($nodes->size) {
 			foreach ($nodes->get_nodelist) {
-				next if ($query eq '/Addin/@category' && $_->string_value =~ /^required/);
+				my $val = $_->string_value;
+				chomp $val;
+				next if (
+					($query eq '/Addin/@category' && $val =~ /^required/) ||
+					$val eq "" ||
+					$val =~ /^@/);
 				print "        Catalog.GetString (\"" . $_->string_value . "\");\n";
 			}
 		}
diff --git a/data/addin-xml-strings.cs b/data/addin-xml-strings.cs
index 9f03d96..964f8b9 100644
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@ -42,7 +42,6 @@ internal static class AddinXmlStringCatalog
         // ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
         Catalog.GetString ("Torrent Downloader");
         Catalog.GetString ("Adds support for downloading BitTorrent files from podcasts.");
-        Catalog.GetString ("");
 
         // ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
         Catalog.GetString ("Boo Scripting");
@@ -55,9 +54,6 @@ internal static class AddinXmlStringCatalog
         Catalog.GetString ("Hardware");
 
         // ../src/Extensions/Template/Template.addin.xml
-        Catalog.GetString ("@EXTENSION_NAME@");
-        Catalog.GetString ("");
-        Catalog.GetString ("");
 
         // ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
         Catalog.GetString ("Audiobooks Library");
@@ -72,7 +68,6 @@ internal static class AddinXmlStringCatalog
         // ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml
         Catalog.GetString ("DAAP");
         Catalog.GetString ("Browse and listen to music shared over your local network.");
-        Catalog.GetString ("");
 
         // ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
         Catalog.GetString ("Now Playing");
@@ -115,7 +110,6 @@ internal static class AddinXmlStringCatalog
         // ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
         Catalog.GetString ("Remote Audio");
         Catalog.GetString ("Provides support for remote speakers like the Airport Express");
-        Catalog.GetString ("");
 
         // ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
         Catalog.GetString ("Cover Art Fetching");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]