aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/alertpanel.c4
-rw-r--r--src/inputdialog.c6
4 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4414a73f..5b09bd0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-24
+ * src/alertpanel.c
+ src/inputdialog.c: set transient window before gtk_widget_show()
+ (fixed wrong window position).
+
+2006-01-24
+
* libsylph/account.c
libsylph/prefs_account.c
src/prefs_account_dialog.c: fixed memory leaks.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 61551e3a..4a6007f8 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2006-01-24
+ * src/alertpanel.c
+ src/inputdialog.c: gtk_widget_show() の前に transient window を
+ セット(誤ったウィンドウ位置を修正)。
+
+2006-01-24
+
* libsylph/account.c
libsylph/prefs_account.c
src/prefs_account_dialog.c: メモリリークを修正。
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 946a87ec..91e1559d 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -169,8 +169,6 @@ void alertpanel_error(const gchar *format, ...)
static void alertpanel_show(void)
{
- gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
- manage_window_set_transient(GTK_WINDOW(dialog));
value = G_ALERTWAIT;
inc_lock();
@@ -213,6 +211,8 @@ static void alertpanel_create(const gchar *title,
gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, FALSE);
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
+ gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+ manage_window_set_transient(GTK_WINDOW(dialog));
gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
g_signal_connect(G_OBJECT(dialog), "delete_event",
G_CALLBACK(alertpanel_deleted),
diff --git a/src/inputdialog.c b/src/inputdialog.c
index 9710999f..d5dfc3f4 100644
--- a/src/inputdialog.c
+++ b/src/inputdialog.c
@@ -163,6 +163,8 @@ static void input_dialog_create(InputDialogType dialog_type)
(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
+ gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+ manage_window_set_transient(GTK_WINDOW(dialog));
g_signal_connect(G_OBJECT(dialog), "delete_event",
G_CALLBACK(delete_event), NULL);
g_signal_connect(G_OBJECT(dialog), "key_press_event",
@@ -171,8 +173,6 @@ static void input_dialog_create(InputDialogType dialog_type)
G_CALLBACK(focus_out), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
- gtk_widget_realize(dialog);
-
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
@@ -226,8 +226,6 @@ static gchar *input_dialog_open(const gchar *title, const gchar *message,
gtkut_box_set_reverse_order(GTK_BOX(confirm_area),
!prefs_common.comply_gnome_hig);
input_dialog_set(title, message, default_string);
- gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
- manage_window_set_transient(GTK_WINDOW(dialog));
gtk_widget_show(dialog);
ack = fin = FALSE;