Merge lp://qastaging/~docky-core/docky/dbus-menus into lp://qastaging/docky

All lines numbers refer to the diff.

-----------------------------------------------------------

153 + static DBusManager manager;
154 + public static DBusManager Default {
155 + get {
156 + if (manager == null)
157 + manager = new DBusManager ();
158 + return manager;
159 + }
160 + }

The proper way to do this would be:

public static DBusManager Default { get; protected set; }

static DBusManager ()
{
 Default = new DBusManager ();
}

-----------------------------------------------------------

163 + Dictionary<AbstractDockItem, DockyDBusItem> items;
165 + internal IEnumerable<AbstractDockItem> Items {

I think one needs renamed. This is confusing, because lowercase items is a dictionary while uppercase Icons is an enum. Perhaps use items_dict or item_buses or something for the first?

-----------------------------------------------------------

387 + public struct Tuple

Rename. What is this? ItemTuple?

-----------------------------------------------------------

429 + uint GetRandomID ()
430 + {
431 + Random rand = new Random ();
432 +
433 + uint number;
434 +
435 + do {
436 + // should we ever get 100,000 items in here, I hope we crash, though we will likely get an infinite loop
437 + number = (uint) rand.Next (0, 100000);
438 + } while (known_ids.BinarySearch (number) >= 0);
439 +
440 + known_ids.Add (number);
441 + known_ids.Sort ();
442 +
443 + return number;
444 + }

Correct me if I am wrong, but the purpose of this is to get a unique id that isnt currently in use (aka, not in known_ids)? If that is the case, using rand is not needed. Do a sort on known_ids, grab the last one, add one. This is as good as random and doesnt require such a hack.

-----------------------------------------------------------

886 - icon_buffers = new DockySurface [2];
887 - badgeColors = new Cairo.Color [2];
888 - redraw = new bool [2];
889 + icon_buffers = new DockySurface[2];
890 + badgeColors = new Cairo.Color[2];
891 + redraw = new bool[2];

Undo that. Mono coding guidelines say space before the '['.

-----------------------------------------------------------

929 +// var remote = DBusManager.Default.RemoteEntries
930 +// .Where (e => e.Target == OwnedItem.DesktopID)
931 +// .GroupBy (e => e.Title);
932 +//
933 +// MenuListContainer container = MenuListContainer.Footer + 1;
934 +// foreach (var entries in remote) {
935 +// list.SetContainerTitle (container, entries.Key);
936 +// foreach (RemoteMenuEntry entry in entries) {
937 +// list[container].Add (new MenuItem (entry.Name, entry.Icon, (o, a) => entry.OnActivated ()));
938 +// }
939 +// container++;
940 +// }
941 +

Just remove this. No need to comment out. :-)

-----------------------------------------------------------

1004 + MenuListContainer container = kvp.Key;
1005 + result[container].AddRange (kvp.Value);

Simplify:

result[kvp.Key].AddRange (kvp.Value);

Same thing here too:

1010 + MenuListContainer container = kvp.Key;
1011 + result[container].AddRange (kvp.Value);

-----------------------------------------------------------

1243 +
1244 + public static void Quit ()
1245 + {
1246 + DBusManager.Default.Shutdown ();
1247 + Gtk.Application.Quit ();
1248 + }

Cant this just be g...