[gnac/devel] Fixed a bug in notifications' handling

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

commit a25fab35a748a039253de115a90bc06522460e72
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date:   Sun Sep 19 22:10:44 2010 +0100

    Fixed a bug in notifications' handling

 data/ui/gnac.xml |    2 +-
 src/gnac-main.c  |    9 +++++----
 src/gnac-main.h  |    8 ++++----
 src/gnac-ui.c    |    6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/data/ui/gnac.xml b/data/ui/gnac.xml
index e5338e1..e98c4c0 100644
--- a/data/ui/gnac.xml
+++ b/data/ui/gnac.xml
@@ -191,7 +191,7 @@
     <property name="default_height">500</property>
     <property name="icon_name">gnac</property>
     <signal handler="gnac_on_ui_destroy_cb" name="delete-event"/>
-    <signal handler="gnac_on_ui_set_focus_cb" name="set-focus"/>
+    <signal handler="gnac_on_ui_focus_in_event_cb" name="focus-in-event"/>
     <child>
       <object class="GtkVBox" id="internal_vbox">
         <property name="visible">True</property>
diff --git a/src/gnac-main.c b/src/gnac-main.c
index 2c1403c..57d3e19 100644
--- a/src/gnac-main.c
+++ b/src/gnac-main.c
@@ -418,15 +418,16 @@ gnac_confirm_exit(void)
 }
 
 
-void
-gnac_on_ui_set_focus_cb(GtkWindow *window,
-                        GtkWidget *widget,
-                        gpointer   data)
+gboolean
+gnac_on_ui_focus_in_event_cb(GtkWidget     *widget,
+                             GdkEventFocus *event,
+                             gpointer       data)
 {
   /* the trayicon is only displayed during a conversion */
   if (state == GNAC_AUDIO_READY_STATE) {
     gnac_ui_hide_trayicon();
   }
+  return FALSE;
 }
 
 
diff --git a/src/gnac-main.h b/src/gnac-main.h
index 216aaa8..f4356d6 100644
--- a/src/gnac-main.h
+++ b/src/gnac-main.h
@@ -79,10 +79,10 @@ void
 gnac_on_ui_help_cb(GtkAction *action,
                    gpointer   data);
 
-void
-gnac_on_ui_set_focus_cb(GtkWindow *window,
-                        GtkWidget *widget,
-                        gpointer   data);
+gboolean
+gnac_on_ui_focus_in_event_cb(GtkWidget     *widget,
+                             GdkEventFocus *event,
+                             gpointer       data);
 
 gboolean
 gnac_on_ui_destroy_cb(GtkWidget *widget, 
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 3b0560e..b097f3c 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -1079,9 +1079,9 @@ gnac_ui_hide_trayicon(void)
   main_window = gnac_ui_get_widget("main_window");
   g_object_get(main_window, "visible", &window_displayed, NULL);
   
-  if (!window_displayed) 
-  {
-    gtk_widget_show_all(main_window);
+  gtk_widget_show_all(main_window);
+
+  if (!window_displayed) {
     gtk_window_move(GTK_WINDOW(main_window), root_x, root_y);
   }