2011-10-28 [colin] 3.7.10cvs55
authorColin Leroy <colin@colino.net>
Fri, 28 Oct 2011 23:46:49 +0000 (23:46 +0000)
committerColin Leroy <colin@colino.net>
Fri, 28 Oct 2011 23:46:49 +0000 (23:46 +0000)
* src/alertpanel.c
* src/mainwindow.c
Fix a bit the focus problem on Gnome shell

ChangeLog
PATCHSETS
configure.ac
src/alertpanel.c
src/mainwindow.c

index 6ac4715..f916c51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-28 [colin]     3.7.10cvs55
+
+       * src/alertpanel.c
+       * src/mainwindow.c
+               Fix a bit the focus problem on Gnome shell
+
 2011-10-26 [mones]     3.7.10cvs54
 
        * src/compose.c
index 92e4d90..330de51 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/gtkcmctree.c;  ) > 3.7.10cvs52.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/gtkcmctree.c;  ) > 3.7.10cvs53.patchset
 ( cvs diff -u -r 1.382.2.588 -r 1.382.2.589 src/compose.c;  ) > 3.7.10cvs54.patchset
+( cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/alertpanel.c;  cvs diff -u -r 1.274.2.332 -r 1.274.2.333 src/mainwindow.c;  ) > 3.7.10cvs55.patchset
index d5eeda5..e1fbb0f 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=54
+EXTRA_VERSION=55
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 34cbd2d..32020ce 100644 (file)
@@ -204,6 +204,7 @@ static void alertpanel_show(void)
 {
        gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
        manage_window_set_transient(GTK_WINDOW(dialog));
+       gtk_widget_show_all(dialog);
        value = G_ALERTWAIT;
 
        if (gdk_pointer_is_grabbed())
index d22f434..c05f070 100644 (file)
@@ -2949,7 +2949,7 @@ void main_window_get_size(MainWindow *mainwin)
                prefs_common.folderview_width  = allocation.width;
                prefs_common.folderview_height = allocation.height;
        }
-
+       
        gtk_widget_get_allocation(GTK_WIDGET_PTR(mainwin->messageview), &allocation);
        if (allocation.width > 1 && allocation.height > 1 &&
            !prefs_common.mainwin_fullscreen) {
@@ -3614,6 +3614,7 @@ void main_window_popup(MainWindow *mainwin)
        if (first_start) {
 #ifdef G_OS_UNIX
                gtk_window_deiconify(GTK_WINDOW(mainwin->window));
+               gtk_window_present(GTK_WINDOW(mainwin->window));
 #endif
                first_start = FALSE;
        } else {
@@ -3637,7 +3638,7 @@ void main_window_show(MainWindow *mainwin)
         gtk_window_move(GTK_WINDOW(mainwin->window),
                                  prefs_common.mainwin_x,
                                  prefs_common.mainwin_y);
-
+       
        gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
                             prefs_common.folderview_width,
                             prefs_common.folderview_height);