aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja5
-rw-r--r--src/importcsv.c4
-rw-r--r--src/importldif.c5
4 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bac3630c..c1ff6571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-04-11
+ * src/importldif.c
+ src/importcsv.c: fixed the position of transient window.
+
+2007-04-11
+
* src/importcsv.c: scroll CList when reordering.
2007-04-11
diff --git a/ChangeLog.ja b/ChangeLog.ja
index e083fdd3..46ae731d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
2007-04-11
+ * src/importldif.c
+ src/importcsv.c: 一時ウィンドウの位置を修正。
+
+2007-04-11
+
* src/importcsv.c: 並べ替え時に CList をスクロールするようにした。
2007-04-11
diff --git a/src/importcsv.c b/src/importcsv.c
index 5271bf00..924563bd 100644
--- a/src/importcsv.c
+++ b/src/importcsv.c
@@ -892,6 +892,7 @@ static void imp_csv_dialog_create() {
G_CALLBACK(imp_csv_delete_event), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(imp_csv_key_pressed), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_vbox_new(FALSE, 4);
gtk_widget_show(vbox);
@@ -962,7 +963,6 @@ AddressBookFile *addressbook_imp_csv( AddressIndex *addrIndex ) {
if( ! impcsv_dlg.window )
imp_csv_create();
impcsv_dlg.cancelled = FALSE;
- gtk_widget_show(impcsv_dlg.window);
manage_window_set_transient(GTK_WINDOW(impcsv_dlg.window));
gtk_widget_grab_default(impcsv_dlg.btnNext);
@@ -988,6 +988,8 @@ AddressBookFile *addressbook_imp_csv( AddressIndex *addrIndex ) {
impcsv_dlg.delimiter = ',';
importCount = 0;
+ gtk_widget_show(impcsv_dlg.window);
+
gtk_main();
gtk_widget_hide(impcsv_dlg.window);
_imp_addressIndex_ = NULL;
diff --git a/src/importldif.c b/src/importldif.c
index 59be79ed..2b37ee9e 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -709,6 +709,7 @@ static void imp_ldif_dialog_create() {
G_CALLBACK(imp_ldif_delete_event), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(imp_ldif_key_pressed), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_vbox_new(FALSE, 4);
gtk_widget_show(vbox);
@@ -779,7 +780,6 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
if( ! impldif_dlg.window )
imp_ldif_create();
impldif_dlg.cancelled = FALSE;
- gtk_widget_show(impldif_dlg.window);
manage_window_set_transient(GTK_WINDOW(impldif_dlg.window));
gtk_widget_grab_default(impldif_dlg.btnNext);
@@ -805,6 +805,9 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
impldif_dlg.fileName = NULL;
_ldifFile_ = ldif_create();
+
+ gtk_widget_show(impldif_dlg.window);
+
gtk_main();
gtk_widget_hide(impldif_dlg.window);
ldif_free( _ldifFile_ );