[longomatch] Images for LongoMatch must be stored in share/images/longomatch

[Andoni Morales Alastruey <amorales src gnome org>]

commit 403538d6a343542b494820453c97fd88cfef7b8a
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sun Aug 16 17:10:33 2009 +0200

    Images for LongoMatch must be stored in share/images/longomatch

 LongoMatch/Main.cs                                 |    8 ++++++--
 .../gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs   |    3 +++
 LongoMatch/gtk-gui/generated.cs                    |    2 +-
 LongoMatch/gtk-gui/gui.stetic                      |    4 ++--
 Makefile.include                                   |    4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/LongoMatch/Main.cs b/LongoMatch/Main.cs
index 80c2d53..3a61837 100644
--- a/LongoMatch/Main.cs
+++ b/LongoMatch/Main.cs
@@ -120,7 +120,7 @@ namespace LongoMatch
 		}
 		
 		public static string ImagesDir(){			
-			return RelativeToPrefix("share/longomatch/images");		
+			return RelativeToPrefix("share/images/longomatch");		
 		}
 		
 		public static string DBDir(){
@@ -240,7 +240,11 @@ namespace LongoMatch
 			logFile = logFile.Replace(":","-");
 			logFile = System.IO.Path.Combine(HomeDir(),logFile); 
 			
-			message = String.Format("{0}\n{1}\n{2}\n{3}",ex.Message,ex.Source,ex.StackTrace,ex.InnerException.StackTrace);
+			if (ex.InnerException != null)
+				message = String.Format("{0}\n{1}\n{2}\n{3}",ex.Message,ex.Source,ex.StackTrace,ex.InnerException.StackTrace);
+			else
+				message = String.Format("{0}\n{1}\n{2}",ex.Message,ex.Source,ex.StackTrace);
+
 			using (StreamWriter s = new StreamWriter(logFile)){
 				s.WriteLine(message);
 			}	 
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs
index 1f17679..b26dd9a 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs
@@ -36,7 +36,10 @@ namespace LongoMatch.Gui.Dialog {
             this.Title = Mono.Unix.Catalog.GetString("Select template name");
             this.Icon = Stetic.IconLoader.LoadIcon(this, "longomatch", Gtk.IconSize.Dialog, 48);
             this.WindowPosition = ((Gtk.WindowPosition)(4));
+            this.Modal = true;
             this.Gravity = ((Gdk.Gravity)(5));
+            this.SkipPagerHint = true;
+            this.SkipTaskbarHint = true;
             this.HasSeparator = false;
             // Internal child LongoMatch.Gui.Dialog.EntryDialog.VBox
             Gtk.VBox w1 = this.VBox;
diff --git a/LongoMatch/gtk-gui/generated.cs b/LongoMatch/gtk-gui/generated.cs
index 9bad47d..592fcb0 100644
--- a/LongoMatch/gtk-gui/generated.cs
+++ b/LongoMatch/gtk-gui/generated.cs
@@ -19,7 +19,7 @@ namespace Stetic {
             if ((Stetic.Gui.initialized == false)) {
                 Stetic.Gui.initialized = true;
                 Gtk.IconFactory w1 = new Gtk.IconFactory();
-                Gtk.IconSet w2 = new Gtk.IconSet(new Gdk.Pixbuf(System.IO.Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "../../share/longomatch/images/longomatch.png")));
+                Gtk.IconSet w2 = new Gtk.IconSet(new Gdk.Pixbuf(System.IO.Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "../../share/images/longomatch/longomatch.png")));
                 w1.Add("longomatch", w2);
                 w1.AddDefault();
             }
diff --git a/LongoMatch/gtk-gui/gui.stetic b/LongoMatch/gtk-gui/gui.stetic
index a121f15..3b290d2 100755
--- a/LongoMatch/gtk-gui/gui.stetic
+++ b/LongoMatch/gtk-gui/gui.stetic
@@ -11,7 +11,7 @@
   <icon-factory>
     <icon-set id="longomatch">
       <source>
-        <property name="Image">file:../../share/longomatch/images/longomatch.png</property>
+        <property name="Image">file:../../share/images/longomatch/longomatch.png</property>
       </source>
     </icon-set>
   </icon-factory>
@@ -4178,4 +4178,4 @@ Please select the workspace folder.</property>
       </widget>
     </child>
   </widget>
-</stetic-interface>
\ No newline at end of file
+</stetic-interface>
diff --git a/Makefile.include b/Makefile.include
index 59f7060..7c1c101 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -69,9 +69,9 @@ linuxdesktopapplicationsdir = @datadir@/applications
 linuxdesktopapplications_DATA = $(LINUX_DESKTOPAPPLICATIONS)
 programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
-commonapplicationdatarootimagesdir = @datadir@/@PACKAGE@/images
+commonapplicationdatarootimagesdir = @datadir@/images/@PACKAGE@
 commonapplicationdatarootimages_DATA = $(COMMONAPPLICATIONDATAROOT_IMAGES)
-commonapplicationdatarootlogodir = @datadir@/@PACKAGE@/icons/hicolor/48x48/apps
+commonapplicationdatarootlogodir = @datadir@/icons/hicolor/48x48/apps
 commonapplicationdatarootlogo_DATA = $(COMMONAPPLICATIONDATAROOT_LOGO)