1 files changed, 48 insertions, 36 deletions

diff --git a/lib/tray/trayItem.vala b/lib/tray/trayItem.vala
index db0e6d4..57f7a23 100644
--- a/lib/tray/trayItem.vala
+++ b/lib/tray/trayItem.vala
@@ -1,4 +1,3 @@
-using DbusmenuGtk;
 
 namespace AstalTray {
 public struct Pixmap {
@@ -169,6 +168,22 @@ public class TrayItem : Object {
     /** the id of the item used to uniquely identify the TrayItems by this lib.*/
     public string item_id { get; private set; }
 
+    private DBusMenu.Importer menu_importer;
+     
+    public MenuModel menu_model {
+      owned get {
+        if (menu_importer == null) return null;
+        return menu_importer.model;
+      }
+    }
+
+    public ActionGroup action_group {
+      owned get {
+        if (menu_importer == null) return null;
+        return menu_importer.action_group;
+      }
+    }
+
     public signal void changed();
     public signal void ready();
 
@@ -197,6 +212,14 @@ public class TrayItem : Object {
                 }
             });
            
+            if(proxy.Menu != null) {
+              this.menu_importer = new DBusMenu.Importer(proxy.get_name_owner(), proxy.Menu);
+              this.menu_importer.notify["model"].connect(() => {
+                notify_property("menu-model");
+                notify_property("action-group");
+              });
+            }
+
             update_gicon();
 
             ready();
@@ -217,17 +240,18 @@ public class TrayItem : Object {
     private void update_gicon() {
         if(icon_name != null && icon_name != "") {
             if(icon_theme_path != null && icon_theme_path != "") {
-
-                Gtk.IconTheme icon_theme = new Gtk.IconTheme();
-                string[] paths = {icon_theme_path};
-                icon_theme.set_search_path(paths);
-
-                int size = icon_theme.get_icon_sizes(icon_name)[0];
-                Gtk.IconInfo icon_info = icon_theme.lookup_icon(
-                    icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE);
-
-                if (icon_info != null)
-                    gicon = new GLib.FileIcon(GLib.File.new_for_path(icon_info.get_filename()));
+                //TODO: icon loopkup
+
+                // Gtk.IconTheme icon_theme = new Gtk.IconTheme();
+                // string[] paths = {icon_theme_path};
+                // icon_theme.set_search_path(paths);
+                //
+                // int size = icon_theme.get_icon_sizes(icon_name)[0];
+                // Gtk.IconInfo icon_info = icon_theme.lookup_icon(
+                //     icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE);
+                //
+                // if (icon_info != null)
+                    // gicon = new GLib.FileIcon(GLib.File.new_for_path(icon_info.get_filename()));
             } else {
                 gicon = new GLib.ThemedIcon(icon_name);
             }
@@ -312,18 +336,6 @@ public class TrayItem : Object {
         }
     }
 
-    /**
-    * creates a new Gtk Menu for this item.
-    */
-    public Gtk.Menu? create_menu() {
-        if (proxy.Menu == null)
-            return null;
-
-        return new DbusmenuGtk.Menu(
-            proxy.get_name_owner(),
-            proxy.Menu);
-    }
-
     private Gdk.Pixbuf? _get_icon_pixbuf() {
         Pixmap[] pixmaps = proxy.Status == Status.NEEDS_ATTENTION
             ? proxy.AttentionIconPixmap
@@ -351,18 +363,18 @@ public class TrayItem : Object {
 
         if (icon_name == "" || icon_name == null)
             return null;
-
-        Gtk.IconTheme icon_theme = new Gtk.IconTheme();
-        string[] paths = {theme_path};
-        icon_theme.set_search_path(paths);
-
-        int size = icon_theme.get_icon_sizes(icon_name)[0];
-        Gtk.IconInfo icon_info = icon_theme.lookup_icon(
-            icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE);
-
-        if (icon_info != null)
-            return icon_info.load_icon();
-
+        //
+        // Gtk.IconTheme icon_theme = new Gtk.IconTheme();
+        // string[] paths = {theme_path};
+        // icon_theme.set_search_path(paths);
+        //
+        // int size = icon_theme.get_icon_sizes(icon_name)[0];
+        // Gtk.IconInfo icon_info = icon_theme.lookup_icon(
+        //     icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE);
+        //
+        // if (icon_info != null)
+        //     return icon_info.load_icon();
+        //
         return null;
     }