[meld] Lookup icons by name in NotebookLabel

[Kai Willadsen <kaiw src gnome org>]

commit adf0a5e3bc01728ee6861499b0694f0566a766f2
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 5 11:26:45 2009 +1000

    Lookup icons by name in NotebookLabel
    
    Rather than expecting a filename and relying on the path module, we lookup
    icons for NotebookLabel solely by name. This change removes the dependency
    on the paths module.

 meldapp.py       |    6 +++---
 notebooklabel.py |    6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/meldapp.py b/meldapp.py
index e09c1e2..4f5652d 100644
--- a/meldapp.py
+++ b/meldapp.py
@@ -770,7 +770,7 @@ class MeldApp(gnomeglade.Component):
     def append_dirdiff(self, dirs, auto_compare=False):
         assert len(dirs) in (1,2,3)
         doc = dirdiff.DirDiff(self.prefs, len(dirs))
-        self._append_page(doc, "tree-folder-normal.png")
+        self._append_page(doc, "tree-folder-normal")
         doc.set_locations(dirs)
         # FIXME: This doesn't work, as dirdiff behaves differently to vcview
         if auto_compare:
@@ -784,7 +784,7 @@ class MeldApp(gnomeglade.Component):
         seq.clear()
         seq.connect("can-undo", self.on_can_undo)
         seq.connect("can-redo", self.on_can_redo)
-        self._append_page(doc, "tree-file-normal.png")
+        self._append_page(doc, "tree-file-normal")
         doc.set_files(files)
         return doc
 
@@ -804,7 +804,7 @@ class MeldApp(gnomeglade.Component):
         assert len(locations) in (1,)
         location = locations[0]
         doc = vcview.VcView(self.prefs)
-        self._append_page(doc, "vc-icon.png")
+        self._append_page(doc, "vc-icon")
         doc.set_location(location)
         if auto_compare:
             doc.on_button_diff_clicked(None)
diff --git a/notebooklabel.py b/notebooklabel.py
index bc37474..4b6c0a9 100644
--- a/notebooklabel.py
+++ b/notebooklabel.py
@@ -21,8 +21,6 @@ from gettext import gettext as _
 import gtk
 import pango
 
-import paths
-
 gtk.rc_parse_string(
     """
     style "meld-tab-close-button-style" {
@@ -66,9 +64,7 @@ class NotebookLabel(gtk.HBox):
         button.set_size_request(w + 2, h + 2)
         button.connect("clicked", onclose)
 
-        icon = gtk.Image()
-        icon.set_from_file(paths.icon_dir(iconname))
-        icon.set_from_pixbuf(icon.get_pixbuf().scale_simple(16, 16, 2)) #TODO stock image
+        icon = gtk.image_new_from_icon_name(iconname, gtk.ICON_SIZE_MENU)
 
         label_box = gtk.EventBox()
         label_box.add_events(gtk.gdk.BUTTON_PRESS_MASK)