tomboy r1925 - in trunk: . Tomboy/Addins/Bugzilla Tomboy/Addins/Evolution data data/images

[btimothy svn gnome org]

Author: btimothy
Date: Mon Mar  3 06:08:32 2008
New Revision: 1925
URL: http://svn.gnome.org/viewvc/tomboy?rev=1925&view=rev

Log:
* configure.in, data/images/Makefile.am, data/Makefile.am: Don't need
  to build data/images/Makefile anymore.
* Tomboy/Addins/Evolution/mail.png, data/images/mail.png: Moved
  data/images/mail.png -> Tomboy/Addins/Evolution/mail.png.
* Tomboy/Addins/Evolution/Makefile.am,
  Tomboy/Addins/Evolution/EvolutionNoteAddin.cs,
  Tomboy/Addins/Bugzilla/Makefile.am,
  Tomboy/Addins/Bugzilla/BugzillaLink.cs: Package the mail.png and
  bug.png with their respective addins as resources and then call
  GetIcon properly to load them at runtime.  This is an additional
  fix for #518740.
* Tomboy/Addins/Bugzilla/bug.png, data/images/bug.png: Move
  /data/images/bug.png -> Tomboy/Addins/Bugzilla/bug.png.

Added:
   trunk/Tomboy/Addins/Bugzilla/bug.png
      - copied unchanged from r1917, /trunk/data/images/bug.png
   trunk/Tomboy/Addins/Evolution/mail.png
      - copied unchanged from r1917, /trunk/data/images/mail.png
Removed:
   trunk/data/images/Makefile.am
   trunk/data/images/bug.png
   trunk/data/images/mail.png
Modified:
   trunk/ChangeLog
   trunk/Tomboy/Addins/Bugzilla/BugzillaLink.cs
   trunk/Tomboy/Addins/Bugzilla/Makefile.am
   trunk/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
   trunk/Tomboy/Addins/Evolution/Makefile.am
   trunk/configure.in
   trunk/data/Makefile.am

Modified: trunk/Tomboy/Addins/Bugzilla/BugzillaLink.cs
==============================================================================
--- trunk/Tomboy/Addins/Bugzilla/BugzillaLink.cs	(original)
+++ trunk/Tomboy/Addins/Bugzilla/BugzillaLink.cs	Mon Mar  3 06:08:32 2008
@@ -6,7 +6,16 @@
 	public class BugzillaLink : DynamicNoteTag
 	{
 		private const string UriAttributeName = "uri";
-		private const string StockIconFilename = "bug.png";
+		//private const string StockIconFilename = "bug.png";
+		private static Gdk.Pixbuf bug_icon;
+
+		static BugzillaLink ()
+		{
+			bug_icon = GuiUtils.GetIcon (
+				System.Reflection.Assembly.GetExecutingAssembly (),
+				"bug",
+				16);
+		}
 
 		public override void Initialize (string element_name)
 		{
@@ -39,9 +48,9 @@
 			} catch {}
 
 			if (uri == null) {
-					Image = new Gdk.Pixbuf(null, StockIconFilename);
-					return;
-				}
+				Image = bug_icon;
+				return;
+			}
 
 			string host = uri.Host;
 			// TODO: Get this in a safer way
@@ -51,7 +60,7 @@
 			try {
 				Image = new Gdk.Pixbuf (imagePath);
 			} catch (GLib.GException) {
-				Image = new Gdk.Pixbuf(null, StockIconFilename);
+				Image = bug_icon;
 			}
 		}
 

Modified: trunk/Tomboy/Addins/Bugzilla/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Bugzilla/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Bugzilla/Makefile.am	Mon Mar  3 06:08:32 2008
@@ -21,7 +21,7 @@
 	$(srcdir)/InsertBugAction.cs
 RESOURCES = \
 	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml \
-	-resource:$(top_srcdir)/data/images/bug.png,bug.png
+	-resource:$(srcdir)/bug.png,bug.png
 
 
 $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
@@ -32,9 +32,13 @@
 addins_DATA = 			\
 	$(TARGET)
 
+noinst_DATA = \
+	$(srcdir)/bug.png
+
 EXTRA_DIST =            	\
 	$(CSFILES) \
-	$(srcdir)/$(ADDIN_NAME).addin.xml
+	$(srcdir)/$(ADDIN_NAME).addin.xml \
+	$(noinst_DATA)
 
 CLEANFILES =				\
 	$(TARGET).mdb \

Modified: trunk/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
==============================================================================
--- trunk/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs	(original)
+++ trunk/Tomboy/Addins/Evolution/EvolutionNoteAddin.cs	Mon Mar  3 06:08:32 2008
@@ -224,6 +224,17 @@
 
 	public class EmailLink : DynamicNoteTag
 	{
+		static Gdk.Pixbuf mail_icon = null;
+		
+		static EmailLink ()
+		{
+			mail_icon =
+				GuiUtils.GetIcon (
+					System.Reflection.Assembly.GetExecutingAssembly (),
+					"mail",
+					16);
+		}
+		
 		public EmailLink ()
 : base ()
 		{
@@ -237,7 +248,7 @@
 			Foreground = "blue";
 			CanActivate = true;
 
-			Image = new Gdk.Pixbuf (null, "mail.png");
+			Image = mail_icon;
 		}
 
 		public string EmailUri

Modified: trunk/Tomboy/Addins/Evolution/Makefile.am
==============================================================================
--- trunk/Tomboy/Addins/Evolution/Makefile.am	(original)
+++ trunk/Tomboy/Addins/Evolution/Makefile.am	Mon Mar  3 06:08:32 2008
@@ -21,7 +21,7 @@
 TARGET = $(ADDIN_NAME).dll
 RESOURCES = \
 	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml \
-	-resource:$(top_srcdir)/data/images/mail.png,mail.png
+	-resource:$(srcdir)/mail.png,mail.png
 
 $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
 	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
@@ -32,9 +32,13 @@
 addins_DATA = 			\
 	$(TARGET)
 
+noinst_DATA = \
+	$(srcdir)/mail.png
+
 EXTRA_DIST =            	\
 	$(CSFILES) \
-	$(srcdir)/$(ADDIN_NAME).addin.xml
+	$(srcdir)/$(ADDIN_NAME).addin.xml \
+	$(srcdir)/mail.png
 
 CLEANFILES =				\
 	$(TARGET).mdb \

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar  3 06:08:32 2008
@@ -254,7 +254,6 @@
 tomboy.spec
 data/Makefile
 data/tomboy-addins.pc
-data/images/Makefile
 data/icons/Makefile
 help/Makefile
 libtomboy/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Mar  3 06:08:32 2008
@@ -1,5 +1,5 @@
 
-SUBDIRS = images icons
+SUBDIRS = icons
 
 @INTLTOOL_DESKTOP_RULE@