commit 783f8abb6b0469816c7616007e5befa87ca103f0
parent 52a925dba92be9164399e9c50bdd989af776f344
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Sat, 28 Jul 2012 01:07:50 +0000
2012-07-28 [ticho] 3.8.1cvs23
* src/gtk/pluginwindow.c
* src/gtk/prefswindow.c
Fixed setting "transient for" property for plugin load/unload
file dialog. Connected manage_window signals to prefswindow events.
Diffstat:
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-28 [ticho] 3.8.1cvs23
+
+ * src/gtk/pluginwindow.c
+ * src/gtk/prefswindow.c
+ Fixed setting "transient for" property for plugin load/unload
+ file dialog. Connected manage_window signals to prefswindow events.
+
2012-07-27 [ticho] 3.8.1cvs22
* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4397,3 +4397,4 @@
( cvs diff -u -r 1.382.2.604 -r 1.382.2.605 src/compose.c; ) > 3.8.1cvs20.patchset
( 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
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
@@ -409,6 +409,7 @@ void pluginwindow_create()
G_CALLBACK(pluginwindow_key_pressed), pluginwindow);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(pluginwindow_delete_cb), pluginwindow);
+ MANAGE_WINDOW_SIGNALS_CONNECT(window);
CLAWS_SET_TIP(load_btn,
_("Click here to load one or more plugins"));
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -572,12 +572,14 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
#endif
- /* connect to callback only if we hhave non-NULL pointers to store size to */
+ /* connect to callback only if we have non-NULL pointers to store size to */
if (prefswindow->save_width && prefswindow->save_height) {
g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate",
G_CALLBACK(prefs_size_allocate_cb), prefswindow);
}
+ MANAGE_WINDOW_SIGNALS_CONNECT(prefswindow->window);
+
if (!geometry.min_height) {
if (x < 800 && y < 600) {
@@ -606,8 +608,6 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj));
gtk_adjustment_changed(adj);
-
- manage_window_focus_in(prefswindow->window, NULL, NULL);
}
void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
