2012-07-28 [ticho] 3.8.1cvs24
authorAndrej Kacian <ticho@claws-mail.org>
Sat, 28 Jul 2012 18:13:48 +0000 (18:13 +0000)
committerAndrej Kacian <ticho@claws-mail.org>
Sat, 28 Jul 2012 18:13:48 +0000 (18:13 +0000)
* src/compose.c
Properly fix setting "transient for" for attachment properties
dialog when called via popup menu (since we're stealing focus
few lines before, we need to do it directly, not via
manage_window_*).

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 9808617..6d947f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-28 [ticho]     3.8.1cvs24
+
+       * src/compose.c
+               Properly fix setting "transient for" for attachment properties
+               dialog when called via popup menu (since we're stealing focus
+               few lines before, we need to do it directly, not via
+               manage_window_*).
+
 2012-07-28 [ticho]     3.8.1cvs23
 
        * src/gtk/pluginwindow.c
index 0a30340..0f29ebe 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.23.2.38 -r 1.23.2.39 src/crash.c;  cvs diff -u -r 1.83.2.191 -r 1.83.2.192 src/mimeview.c;  ) > 3.8.1cvs21.patchset
 ( cvs diff -u -r 1.395.2.447 -r 1.395.2.448 src/summaryview.c;  cvs diff -u -r 1.96.2.243 -r 1.96.2.244 src/textview.c;  ) > 3.8.1cvs22.patchset
 ( cvs diff -u -r 1.5.2.63 -r 1.5.2.64 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.61 -r 1.12.2.62 src/gtk/prefswindow.c;  ) > 3.8.1cvs23.patchset
+( cvs diff -u -r 1.382.2.605 -r 1.382.2.606 src/compose.c;  ) > 3.8.1cvs24.patchset
index 6a1ea19..54d22a8 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 7a23338..6918012 100644 (file)
@@ -6656,9 +6656,10 @@ static void compose_create_header_entry(Compose *compose)
                        COMPOSE_FOLLOWUPTO);
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-       g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((combo)))), "grab_focus",
+       g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(combo))), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
        gtk_widget_show(combo);
+
        gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1,
                        compose->header_nextrow, compose->header_nextrow+1,
                        GTK_SHRINK, GTK_FILL, 0, 0);
@@ -8706,7 +8707,8 @@ static void compose_attach_property(GtkAction *action, gpointer data)
        gtk_window_set_modal(GTK_WINDOW(attach_prop.window), TRUE);
        gtk_widget_grab_focus(attach_prop.ok_btn);
        gtk_widget_show(attach_prop.window);
-       manage_window_set_transient(GTK_WINDOW(attach_prop.window));
+       gtk_window_set_transient_for(GTK_WINDOW(attach_prop.window),
+                       GTK_WINDOW(compose->window));
 
        optmenu = GTK_COMBO_BOX(attach_prop.encoding_optmenu);
        if (ainfo->encoding == ENC_UNKNOWN)