[gnac/devel] Fixed trayicon's behaviour

[BenoÃt Dupasquier <bdupasqu src gnome org>]

commit 3a3b442fb481d80b03b608744f9e836415d06be3
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Wed Jan 11 17:48:42 2012 +0000

    Fixed trayicon's behaviour

 src/gnac-main.c |    5 ++---
 src/gnac-ui.c   |   16 ++++++++++++++--
 src/gnac-ui.h   |    3 +++
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/src/gnac-main.c b/src/gnac-main.c
index 92b548d..cdb62c1 100644
--- a/src/gnac-main.c
+++ b/src/gnac-main.c
@@ -532,9 +532,8 @@ gnac_on_converter_completion_cb(LibgnacConverter *converter)
     msg = _("Conversion completed");
   }
 
-  gnac_ui_notify(msg);
-  gnac_ui_push_status(msg);
-  gnac_ui_trayicon_tooltip_update(msg);
+  gnac_ui_on_conversion_completed(msg);
+  libgnac_debug(msg);
 }
 
 
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 5aecf3b..0958ea8 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -1142,6 +1142,18 @@ gnac_ui_confirm_exit(void)
 }
 
 
+void
+gnac_ui_on_conversion_completed(const gchar *msg)
+{
+  gnac_ui_notify(msg);
+  gnac_ui_push_status(msg);
+  gnac_ui_trayicon_tooltip_update(msg);
+  gnac_ui_set_action_visible("tray_stop_item", FALSE);
+  gnac_ui_set_action_visible("tray_pause_item", FALSE);
+  gnac_ui_on_trayicon_popup(trayicon, 0, gtk_get_current_event_time(), NULL);
+}
+
+
 /* Tray icon */
 
 gboolean
@@ -1279,8 +1291,8 @@ gnac_ui_on_trayicon_popup(GtkStatusIcon *trayicon,
                           gpointer       data)
 {
   /* Translators: Show/Hide main window */
-  gchar *label_text = g_strdup(gnac_ui_main_window_is_visible() ?
-      _("Hide") : _("Show"));
+  gchar *label_text = g_strdup((gnac_ui_main_window_is_visible() &&
+      state != GNAC_AUDIO_READY_STATE) ? _("Hide") : _("Show"));
 
   GtkAction *show_action = gnac_ui_get_action("tray_show_hide_item");
   GtkMenu *trayicon_menu = GTK_MENU(gnac_ui_get_widget("tray_popup"));
diff --git a/src/gnac-ui.h b/src/gnac-ui.h
index a662ced..ddda877 100644
--- a/src/gnac-ui.h
+++ b/src/gnac-ui.h
@@ -189,6 +189,9 @@ gboolean
 gnac_ui_confirm_exit(void);
 
 void
+gnac_ui_on_conversion_completed(const gchar *msg);
+
+void
 gnac_ui_show(void);
 
 void