[gnome-settings-daemon/randr-hotplug: 6/13] Refresh the tray icon menu if it is active during RANDR events

[Federico Mena Quintero <federico src gnome org>]

commit d402cd25d0d1a2b545cd3933f4aa559b9d616a2e
Author: Federico Mena Quintero <federico novell com>
Date:   Sat May 30 22:41:39 2009 -0500

    Refresh the tray icon menu if it is active during RANDR events
    
    This way the menu will automagically refresh itself even it the monitors are frobbed
    while the menu is active.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>
---
 plugins/xrandr/gsd-xrandr-manager.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 44126e0..373bdf5 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -110,6 +110,8 @@ static void     gsd_xrandr_manager_finalize    (GObject             *object);
 
 static void error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to_display, const char *secondary_text);
 
+static void status_icon_popup_menu (GsdXrandrManager *manager, guint button, guint32 timestamp);
+
 G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
@@ -883,6 +885,17 @@ event_filter (GdkXEvent           *xevent,
 }
 
 static void
+refresh_tray_icon_menu_if_active (GsdXrandrManager *manager, guint32 timestamp)
+{
+        GsdXrandrManagerPrivate *priv = manager->priv;
+
+        if (priv->popup_menu) {
+                gtk_menu_shell_cancel (GTK_MENU_SHELL (priv->popup_menu)); /* status_icon_popup_menu_selection_done_cb() will free everything */
+                status_icon_popup_menu (manager, 0, timestamp);
+        }
+}
+
+static void
 on_randr_event (GnomeRRScreen *screen, gpointer data)
 {
         GsdXrandrManager *manager = GSD_XRANDR_MANAGER (data);
@@ -911,6 +924,8 @@ on_randr_event (GnomeRRScreen *screen, gpointer data)
                  */
                 show_timestamps_dialog (manager, "need to deal with reconfiguration, as config >= change");
         }
+
+        refresh_tray_icon_menu_if_active (manager, MAX (change_timestamp, config_timestamp));
 }
 
 static void