2012-11-18 [colin] 3.9.0cvs6-stable

[claws.git] / src / gtk / manage_window.c

diff --git a/src/gtk/manage_window.c b/src/gtk/manage_window.c
index 1782a936425074d36b0fea9275dbb7c152650208..7a53f087244a9ebf46ebd0fbc9060a429de18de4 100644 (file)
--- a/src/gtk/manage_window.c
+++ b/src/gtk/manage_window.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,23 +13,29 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "manage_window.h"
-/* #include "utils.h" */
+#include "utils.h"
 
 GtkWidget *focus_window;
 
 gint manage_window_focus_in(GtkWidget *widget, GdkEventFocus *event,
                            gpointer data)
 {
-       /* debug_print("Focus in event: window: %p\n", widget); */
+       const gchar *title = NULL;
+
+       if (!GTK_IS_WINDOW(widget))
+               return FALSE;
+       
+       title = gtk_window_get_title(GTK_WINDOW(widget));
+       debug_print("Focus in event: window: %p - %s\n", widget,
+                   title ? title : "no title");
 
        focus_window = widget;
 
@@ -39,18 +45,14 @@ gint manage_window_focus_in(GtkWidget *widget, GdkEventFocus *event,
 gint manage_window_focus_out(GtkWidget *widget, GdkEventFocus *event,
                             gpointer data)
 {
-       /* debug_print("Focused window: %p\n", focus_window); */
-       /* debug_print("Focus out event: window: %p\n", widget); */
+       const gchar *title = NULL;
 
-       if (focus_window == widget)
-               focus_window = NULL;
+       if (!GTK_IS_WINDOW(widget))
+               return FALSE;
 
-       return FALSE;
-}
-
-gint manage_window_unmap(GtkWidget *widget, GdkEventAny *event, gpointer data)
-{
-       /* debug_print("unmap event: %p\n", widget); */
+       title = gtk_window_get_title(GTK_WINDOW(widget));
+       debug_print("Focus out event: window: %p - %s\n", widget,
+                   title ? title : "no title");
 
        if (focus_window == widget)
                focus_window = NULL;
@@ -58,10 +60,11 @@ gint manage_window_unmap(GtkWidget *widget, GdkEventAny *event, gpointer data)
        return FALSE;
 }
 
-gint manage_window_delete(GtkWidget *widget, GdkEventAny *event,
-                         gpointer data)
+gint manage_window_unmap(GtkWidget *widget, GdkEventAny *event, gpointer data)
 {
-       /* debug_print("delete event: %p\n", widget); */
+       const gchar *title = gtk_window_get_title(GTK_WINDOW(widget));
+       debug_print("Unmap event: window: %p - %s\n", widget,
+                   title ? title : "no title");
 
        if (focus_window == widget)
                focus_window = NULL;
@@ -71,7 +74,10 @@ gint manage_window_delete(GtkWidget *widget, GdkEventAny *event,
 
 void manage_window_destroy(GtkWidget *widget, gpointer data)
 {
-       /* debug_print("destroy event: %p\n", widget); */
+       const gchar *title = gtk_window_get_title(GTK_WINDOW(widget));
+       debug_print("Destroy event: window: %p - %s\n", widget,
+                   title ? title : "no title");
+
 
        if (focus_window == widget)
                focus_window = NULL;
@@ -79,14 +85,8 @@ void manage_window_destroy(GtkWidget *widget, gpointer data)
 
 void manage_window_set_transient(GtkWindow *window)
 {
-       /* debug_print("manage_window_set_transient(): window = %p, focus_window = %p\n",
-                   window, focus_window); */
-
+#ifndef G_OS_WIN32
        if (window && focus_window)
                gtk_window_set_transient_for(window, GTK_WINDOW(focus_window));
-}
-
-GtkWidget *manage_window_get_focus_window(void)
-{
-       return focus_window;
+#endif
 }