Merge lp:~canonical-dx-team/unity/unity.fix-691651 into lp:unity

[Mirco Müller]

Hooked up the "name-changed" signal so window-titles of maximized windows get correctly updated, when a tab-focus occurs. This also correctly disconnects a registered callback from the old-view before connecting it to the new-view.

NOTE: This branch needs libbamf (rev 377) to work.

=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-01-25 15:35:00 +0000
+++ src/PanelMenuView.cpp	2011-01-26 17:51:31 +0000
@@ -43,6 +43,10 @@
                                       BamfView      *new_view,
                                       PanelMenuView *self);
 
+static void on_name_changed (BamfView*      bamf_view,
+                             gchar*         old_name,
+                             gchar*         new_name,
+                             PanelMenuView* self);
 
 PanelMenuView::PanelMenuView (int padding)
 : _matcher (NULL),
@@ -68,6 +72,8 @@
   _layout = _menu_layout;
 
   _padding = padding;
+  _name_changed_callback_instance = NULL;
+  _name_changed_callback_id = 0;
 
   _window_buttons = new WindowButtons ();
   _window_buttons->NeedRedraw ();
@@ -574,11 +580,19 @@
 }
 
 void
+PanelMenuView::OnNameChanged (gchar* new_name, gchar* old_name)
+{
+  Refresh ();
+  FullRedraw ();
+}
+
+void
 PanelMenuView::OnActiveWindowChanged (BamfView *old_view,
                                       BamfView *new_view)
 {
   _is_maximized = false;
 
+
   if (BAMF_IS_WINDOW (new_view))
   {
     BamfWindow *window = BAMF_WINDOW (new_view);
@@ -587,6 +601,18 @@
 
     if (_decor_map.find (xid) == _decor_map.end ())
       _decor_map[xid] = true;
+
+    // first see if we need to remove and old callback
+    if (_name_changed_callback_id != 0)
+      g_signal_handler_disconnect (_name_changed_callback_instance,
+                                   _name_changed_callback_id);
+
+    // register callback for new view and store handler-id
+    _name_changed_callback_instance = G_OBJECT (new_view);
+    _name_changed_callback_id = g_signal_connect (_name_changed_callback_instance,
+                                                  "name-changed",
+                                                  (GCallback) on_name_changed,
+                                                  this);
   }
 
   Refresh ();
@@ -771,3 +797,12 @@
 {
   self->OnActiveWindowChanged (old_view, new_view);
 }
+
+static void
+on_name_changed (BamfView*      bamf_view,
+                 gchar*         old_name,
+                 gchar*         new_name,
+                 PanelMenuView* self)
+{
+  self->OnNameChanged (new_name, old_name);
+}

=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2011-01-20 12:48:09 +0000
+++ src/PanelMenuView.h	2011-01-26 17:51:31 +0000
@@ -65,6 +65,7 @@
   void OnEntryRefreshed (PanelIndicatorObjectEntryView *view);
   void OnActiveChanged (PanelIndicatorObjectEntryView *view, bool is_active);
   void OnActiveWindowChanged (BamfView *old_view, BamfView *new_view);
+  void OnNameChanged (gchar* new_name, gchar* old_name);
 
   void OnSpreadInitiate (std::list <guint32> &);
   void OnSpreadTerminate (std::list <guint32> &);
@@ -111,5 +112,7 @@
 
   std::map<guint32, bool> _decor_map;
   int _padding;
+  gpointer _name_changed_callback_instance;
+  gulong _name_changed_callback_id;
 };
 #endif