From 40a8e9c1a6922e15093d789646fc337325b023b2 Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sun, 28 Feb 2010 21:51:34 +0100
Subject: [PATCH] Fix tracking of single-process multi app cases

When starting oocalc or ooimpress from oowriter's menu get_app_for_window,
fails to recognize the newly started up as such, which result into the appMenu
still showing "Openoffice.org Writer" as app name.

Fix this by trying to window itself first before using the group for finding the app.

https://bugzilla.gnome.org/show_bug.cgi?id=611288
---
 src/shell-window-tracker.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index bf7648881..547c34147 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -345,6 +345,19 @@ get_app_for_window (ShellWindowTracker    *monitor,
   MetaGroup *group;
   GSList *iter;
 
+  result = NULL;
+  if (meta_window_get_window_type (window) == META_WINDOW_NORMAL)
+    {
+      result = g_hash_table_lookup (monitor->window_to_app, window);
+      if (result != NULL)
+        {
+          g_object_ref (result);
+          return result;
+        }
+      else
+        return get_app_for_window_direct (window);
+    }
+
   group = meta_window_get_group (window);
   if (group == NULL)
     group_windows = g_slist_prepend (NULL, window);