Merge lp:~raof/do-plugins/fix-firefox-icon into lp:do-plugins

[Chris Halse Rogers]

[Chris Halse Rogers (raof)]

Wander through a list of possible firefox icons to try and grab one that actually exists.

=== modified file 'Firefox/Firefox.mdp'
--- Firefox/Firefox.mdp	2009-06-29 08:47:41 +0000
+++ Firefox/Firefox.mdp	2010-02-07 22:08:13 +0000
@@ -1,27 +1,28 @@
-<Project name="Firefox" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
+<Project name="Firefox" fileversion="2.0" DefaultNamespace="Firefox" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="Firefox" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="Firefox" />
       <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
-    <File name="." subtype="Directory" buildaction="Compile" />
-    <File name="src" subtype="Directory" buildaction="Compile" />
-    <File name="Resources/Firefox.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="src/PlacesItemSource.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/BrowseBookmarkItem.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/BrowseHistoryItem.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/FolderItem.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/PlaceItem.cs" subtype="Code" buildaction="Compile" />
+    <File subtype="Directory" buildaction="Compile" name="." />
+    <File subtype="Directory" buildaction="Compile" name="src" />
+    <File subtype="Code" buildaction="EmbedAsResource" name="Resources/Firefox.addin.xml" />
+    <File subtype="Code" buildaction="Compile" name="src/PlacesItemSource.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/BrowseBookmarkItem.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/BrowseHistoryItem.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/FolderItem.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/PlaceItem.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/FirefoxHelpers.cs" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -34,5 +35,6 @@
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
 </Project>
\ No newline at end of file

=== modified file 'Firefox/Makefile.am'
--- Firefox/Makefile.am	2009-06-22 04:05:16 +0000
+++ Firefox/Makefile.am	2010-02-07 22:08:14 +0000
@@ -5,6 +5,7 @@
 FILES = \
 	src/BrowseBookmarkItem.cs \
 	src/BrowseHistoryItem.cs \
+	src/FirefoxHelpers.cs \
 	src/FolderItem.cs \
 	src/PlaceItem.cs \
 	src/PlacesItemSource.cs
@@ -17,5 +18,6 @@
 	System.Core \
 	System.Data \
 	Mono.Data.SqliteClient \
+	$(GTK_SHARP_20_LIBS) \
 	$(DO_PLATFORM_LIBS) \
 	$(DO_UNIVERSE_LIBS)

=== modified file 'Firefox/src/BrowseBookmarkItem.cs'
--- Firefox/src/BrowseBookmarkItem.cs	2009-06-22 04:05:16 +0000
+++ Firefox/src/BrowseBookmarkItem.cs	2010-02-07 22:08:13 +0000
@@ -35,7 +35,7 @@
 		}
 		
 		public override string Icon {
-			get { return "firefox-3.0"; } 
+			get { return FirefoxHelpers.IconName; }
 		}
 	}
 }

=== modified file 'Firefox/src/BrowseHistoryItem.cs'
--- Firefox/src/BrowseHistoryItem.cs	2009-06-22 04:05:16 +0000
+++ Firefox/src/BrowseHistoryItem.cs	2010-02-07 22:08:13 +0000
@@ -37,7 +37,7 @@
 		}
 		
 		public override string Icon {
-			get { return "firefox-3.0"; }
+			get { return FirefoxHelpers.IconName; }
 		}
 	}
 }

=== added file 'Firefox/src/FirefoxHelpers.cs'
--- Firefox/src/FirefoxHelpers.cs	1970-01-01 00:00:00 +0000
+++ Firefox/src/FirefoxHelpers.cs	2010-02-07 22:08:13 +0000
@@ -0,0 +1,54 @@
+//  FirefoxHelpers.cs
+//  GNOME Do is the legal property of its developers, whose names are too
+//  numerous to list here.  Please refer to the COPYRIGHT file distributed with
+//  this source distribution.
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using Gtk;
+
+namespace Firefox
+{
+	public static class FirefoxHelpers
+	{
+		public static string IconName {get; private set;}
+		
+		static FirefoxHelpers ()
+		{
+			// List a whole bunch of possible names for the firefox icon.
+			string[] iconNames = new string [] {
+				"firefox",
+				"iceweasel",
+				"firefox-4.0",
+				"firefox-3.9",
+				"firefox-3.8",
+				"firefox-3.7",
+				"firefox-3.6",
+				"firefox-3.5",
+				"firefox-3.0",
+			};
+			
+			// Start with "firefox".  If we can't find an icon in the theme,
+			// at least "firefox" makes our intent clear.
+			IconName = "firefox";
+			foreach (string iconName in iconNames) {
+				if (IconTheme.Default.HasIcon (iconName)) {
+					IconName = iconName;
+					break;
+				}
+			}
+		}
+	}
+}

=== modified file 'Firefox/src/PlacesItemSource.cs'
--- Firefox/src/PlacesItemSource.cs	2009-09-05 02:06:59 +0000
+++ Firefox/src/PlacesItemSource.cs	2010-02-07 22:08:13 +0000
@@ -74,7 +74,7 @@
 		}
 
 		public override string Icon {
-			get { return "firefox-3.0"; }
+			get { return FirefoxHelpers.IconName; }
 		}
 
 		public override IEnumerable<Item> Items {