2010-02-03 [pawel] 3.7.5cvs6

	* src/plugins/trayicon/trayicon.c
		Save and then restore focus when closing/minimizing to tray

diff --git a/ChangeLog b/ChangeLog
index 2ef5b0157958db35ff5a37be92cd9457493dfbb1..7202c02f9a8c0c74ff0eeef98f8ee226b9cb24d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-03 [pawel]     3.7.5cvs6
+
+       * src/plugins/trayicon/trayicon.c
+               Save and then restore focus when closing/minimizing to tray
+

 2010-02-03 [mir]       3.7.5cvs5
 
        * src/addrindex.c
 2010-02-03 [mir]       3.7.5cvs5
 
        * src/addrindex.c

diff --git a/PATCHSETS b/PATCHSETS
index eb5a5eded0906dce742609c37219f1b8ee5d80e8..1bea80c10bacfa7573c3f28da549a3f3957fb78d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3946,3 +3946,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/smime/smime.c;  cvs diff -u -r 1.10.2.23 -r 1.10.2.24 src/privacy.c;  ) > 3.7.5cvs3.patchset
 ( cvs diff -u -r 1.10.2.24 -r 1.10.2.25 src/privacy.c;  ) > 3.7.5cvs4.patchset
 ( cvs diff -u -r 1.28.2.42 -r 1.28.2.43 src/addrindex.c;  cvs diff -u -r 1.8.2.36 -r 1.8.2.37 src/editldap.c;  cvs diff -u -r 1.2.2.19 -r 1.2.2.20 src/ldapctrl.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/ldapctrl.h;  cvs diff -u -r 1.3.2.33 -r 1.3.2.34 src/ldapquery.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/ldapupdate.c;  ) > 3.7.5cvs5.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/smime/smime.c;  cvs diff -u -r 1.10.2.23 -r 1.10.2.24 src/privacy.c;  ) > 3.7.5cvs3.patchset
 ( cvs diff -u -r 1.10.2.24 -r 1.10.2.25 src/privacy.c;  ) > 3.7.5cvs4.patchset
 ( cvs diff -u -r 1.28.2.42 -r 1.28.2.43 src/addrindex.c;  cvs diff -u -r 1.8.2.36 -r 1.8.2.37 src/editldap.c;  cvs diff -u -r 1.2.2.19 -r 1.2.2.20 src/ldapctrl.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/ldapctrl.h;  cvs diff -u -r 1.3.2.33 -r 1.3.2.34 src/ldapquery.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/ldapupdate.c;  ) > 3.7.5cvs5.patchset

+( cvs diff -u -r 1.14.2.69 -r 1.14.2.70 src/plugins/trayicon/trayicon.c;  ) > 3.7.5cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 022d0ed7f4ba221467dd6e3a9ed11095b1084f2f..2ae3938938c1ce94e9fbad5c21e28ef6a85cb206 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=5
+EXTRA_VERSION=6

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 10e63b06173260eaf7de8242809f3d280066768c..a81f9de75037de848e187e08262d03023dd5b9a8 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -68,6 +68,7 @@ static GdkPixbuf *nomail_pixmap[2] = {NULL, NULL};
 static EggTrayIcon *trayicon;
 static GtkWidget *eventbox;
 static GtkWidget *image = NULL;
 static EggTrayIcon *trayicon;
 static GtkWidget *eventbox;
 static GtkWidget *image = NULL;

+static GtkWidget *focused_widget = NULL;

 
 #if !(GTK_CHECK_VERSION(2,12,0))
 static GtkTooltips *tooltips;
 
 #if !(GTK_CHECK_VERSION(2,12,0))
 static GtkTooltips *tooltips;


@@ -242,12 +243,14 @@ static gboolean trayicon_close_hook(gpointer source, gpointer data)
                gboolean *close_allowed = (gboolean*)source;
 
                if (trayicon_prefs.close_to_tray) {
                gboolean *close_allowed = (gboolean*)source;
 
                if (trayicon_prefs.close_to_tray) {

-               MainWindow *mainwin = mainwindow_get_mainwindow();
+                       MainWindow *mainwin = mainwindow_get_mainwindow();

 
                        *close_allowed = FALSE;
 
                        *close_allowed = FALSE;

-               if (GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window)))
-                       main_window_hide(mainwin);
-       }
+                       focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
+                       
+                       if (GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window)))
+                               main_window_hide(mainwin);
+               }

        }
        return FALSE;
 }
        }
        return FALSE;
 }


@@ -259,6 +262,7 @@ static gboolean trayicon_got_iconified_hook(gpointer source, gpointer data)
        if (trayicon_prefs.hide_when_iconified
                        && GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window))
                        && !gtk_window_get_skip_taskbar_hint(GTK_WINDOW(mainwin->window))) {
        if (trayicon_prefs.hide_when_iconified
                        && GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window))
                        && !gtk_window_get_skip_taskbar_hint(GTK_WINDOW(mainwin->window))) {

+               focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));

                gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), TRUE);
        }
        return FALSE;
                gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), TRUE);
        }
        return FALSE;


@@ -302,7 +306,9 @@ static gboolean click_cb(GtkWidget * widget,
                                gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), FALSE);
                                main_window_show(mainwin);
                                gtk_window_present(GTK_WINDOW(mainwin->window));
                                gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), FALSE);
                                main_window_show(mainwin);
                                gtk_window_present(GTK_WINDOW(mainwin->window));

+                               gtk_window_set_focus(GTK_WINDOW(mainwin->window), focused_widget);

                        } else {
                        } else {

+                               focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));

                                main_window_hide(mainwin);
                        }
                } else {
                                main_window_hide(mainwin);
                        }
                } else {


@@ -311,6 +317,7 @@ static gboolean click_cb(GtkWidget * widget,
                        main_window_show(mainwin);
                        gtk_window_present(GTK_WINDOW(mainwin->window));
                        fix_folderview_scroll(mainwin);
                        main_window_show(mainwin);
                        gtk_window_present(GTK_WINDOW(mainwin->window));
                        fix_folderview_scroll(mainwin);

+                       gtk_window_set_focus(GTK_WINDOW(mainwin->window), focused_widget);

         }
                break;
        case 3:
         }
                break;
        case 3: