[meld] Move icons to conform to icon spec, and use name to access our app icon

[Kai Willadsen <kaiw src gnome org>]

commit 89c4d1cff5cadddda2fd69125378fdc63794963b
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Sep 5 11:17:59 2010 +1000

    Move icons to conform to icon spec, and use name to access our app icon
    
    This commit moves all of our application icons into the correct
    icon-theme-spec directory structure, removes the superfluous copy of
    the app icon, and adapts to access our application icon through its
    name.

 Makefile                                          |   12 +++++-------
 data/icons/{16x16 => hicolor/16x16/apps}/meld.png |  Bin 799 -> 799 bytes
 data/icons/{16x16 => hicolor/16x16/apps}/meld.xcf |  Bin 3823 -> 3823 bytes
 data/icons/{22x22 => hicolor/22x22/apps}/meld.png |  Bin 1366 -> 1366 bytes
 data/icons/{22x22 => hicolor/22x22/apps}/meld.xcf |  Bin 6846 -> 6846 bytes
 data/icons/{32x32 => hicolor/32x32/apps}/meld.png |  Bin 2344 -> 2344 bytes
 data/icons/{32x32 => hicolor/32x32/apps}/meld.svg |    0
 data/icons/{48x48 => hicolor/48x48/apps}/meld.png |  Bin 3633 -> 3633 bytes
 data/icons/{48x48 => hicolor/48x48/apps}/meld.svg |    0
 data/icons/icon.png                               |  Bin 3633 -> 0 bytes
 data/ui/meldapp.ui                                |    6 ++----
 meld/meldapp.py                                   |    1 +
 12 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/Makefile b/Makefile
index 17c30ec..7785419 100644
--- a/Makefile
+++ b/Makefile
@@ -82,17 +82,15 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
 		data/icons/*.xpm \
 		data/icons/*.png \
 		$(DESTDIR)$(sharedir_)/icons
-	install -m 644 data/icons/icon.png \
-		$(DESTDIR)$(sharedir)/pixmaps/meld.png
-	install -m 644 data/icons/16x16/meld.png \
+	install -m 644 data/icons/hicolor/16x16/apps/meld.png \
 		$(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps/meld.png
-	install -m 644 data/icons/22x22/meld.png \
+	install -m 644 data/icons/hicolor/22x22/apps/meld.png \
 		$(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps/meld.png
-	install -m 644 data/icons/32x32/meld.png \
+	install -m 644 data/icons/hicolor/32x32/apps/meld.png \
 		$(DESTDIR)$(sharedir)/icons/hicolor/32x32/apps/meld.png
-	install -m 644 data/icons/48x48/meld.png \
+	install -m 644 data/icons/hicolor/48x48/apps/meld.png \
 		$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png
-	install -m 644 data/icons/48x48/meld.svg \
+	install -m 644 data/icons/hicolor/48x48/apps/meld.svg \
 		$(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg
 	$(MAKE) -C po install
 	$(MAKE) -C help install
diff --git a/data/icons/16x16/meld.png b/data/icons/hicolor/16x16/apps/meld.png
similarity index 100%
rename from data/icons/16x16/meld.png
rename to data/icons/hicolor/16x16/apps/meld.png
diff --git a/data/icons/16x16/meld.xcf b/data/icons/hicolor/16x16/apps/meld.xcf
similarity index 100%
rename from data/icons/16x16/meld.xcf
rename to data/icons/hicolor/16x16/apps/meld.xcf
diff --git a/data/icons/22x22/meld.png b/data/icons/hicolor/22x22/apps/meld.png
similarity index 100%
rename from data/icons/22x22/meld.png
rename to data/icons/hicolor/22x22/apps/meld.png
diff --git a/data/icons/22x22/meld.xcf b/data/icons/hicolor/22x22/apps/meld.xcf
similarity index 100%
rename from data/icons/22x22/meld.xcf
rename to data/icons/hicolor/22x22/apps/meld.xcf
diff --git a/data/icons/32x32/meld.png b/data/icons/hicolor/32x32/apps/meld.png
similarity index 100%
rename from data/icons/32x32/meld.png
rename to data/icons/hicolor/32x32/apps/meld.png
diff --git a/data/icons/32x32/meld.svg b/data/icons/hicolor/32x32/apps/meld.svg
similarity index 100%
rename from data/icons/32x32/meld.svg
rename to data/icons/hicolor/32x32/apps/meld.svg
diff --git a/data/icons/48x48/meld.png b/data/icons/hicolor/48x48/apps/meld.png
similarity index 100%
rename from data/icons/48x48/meld.png
rename to data/icons/hicolor/48x48/apps/meld.png
diff --git a/data/icons/48x48/meld.svg b/data/icons/hicolor/48x48/apps/meld.svg
similarity index 100%
rename from data/icons/48x48/meld.svg
rename to data/icons/hicolor/48x48/apps/meld.svg
diff --git a/data/ui/meldapp.ui b/data/ui/meldapp.ui
index 60062ae..4bce854 100644
--- a/data/ui/meldapp.ui
+++ b/data/ui/meldapp.ui
@@ -4,7 +4,7 @@
   <object class="GtkWindow" id="meldapp">
     <property name="height_request">400</property>
     <property name="title" translatable="yes">Meld</property>
-    <property name="icon">../icons/icon.png</property>
+    <property name="icon-name">meld</property>
     <signal handler="on_size_allocate" name="size_allocate"/>
     <signal handler="on_delete_event" name="delete_event"/>
     <child>
@@ -71,7 +71,7 @@
     <property name="visible">True</property>
     <property name="border_width">5</property>
     <property name="destroy_with_parent">True</property>
-    <property name="icon">../icons/icon.png</property>
+    <property name="logo-icon-name">meld</property>
     <property name="program-name">Meld</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="copyright" translatable="yes">Copyright &#xA9; 2002-2009 Stephen Kennedy</property>
@@ -92,13 +92,11 @@ Changwoo Ryu (ko)
 Beno&#xEE;t Dejean (fr)
 Gareth Owen (en_GB)
 Adam Weinberger (en_CA)</property>
-    <property name="logo">../icons/icon.png</property>
   </object>
   <object class="GtkDialog" id="newdialog">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Choose Files</property>
     <property name="default_width">600</property>
-    <property name="icon">../icons/icon.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <signal handler="on_response" name="response"/>
     <child internal-child="vbox">
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 99821cb..9b2a0cb 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -132,6 +132,7 @@ class MeldApp(gnomeglade.Component):
         if getattr(gobject, "pygobject_version", ()) >= (2, 16, 0):
             gobject.set_application_name("Meld")
         gnomeglade.Component.__init__(self, gladefile, "meldapp")
+        gtk.window_set_default_icon_name("meld")
         self.prefs = preferences.MeldPreferences()
 
         actions = (