diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.ja | 6 | ||||
| -rw-r--r-- | src/addr_compl.c | 20 | ||||
| -rw-r--r-- | src/addressbook.c | 2 |
4 files changed, 25 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2007-03-02 + + * src/addr_compl.c: completion_window_key_press(): prevent warnings + when ESC, BS etc. is pressed. + * src/addressbook.c: removed Name: label. + 2007-03-01 * src/rfc2015.c diff --git a/ChangeLog.ja b/ChangeLog.ja index ae73cc3f..64b8430c 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,9 @@ +2007-03-02 + + * src/addr_compl.c: completion_window_key_press(): ESC, BS などが + 押された場合に警告を防ぐようにした。 + * src/addressbook.c: 名前: ラベルを削除。 + 2007-03-01 * src/rfc2015.c diff --git a/src/addr_compl.c b/src/addr_compl.c index f1f82b84..b52a5ae2 100644 --- a/src/addr_compl.c +++ b/src/addr_compl.c @@ -932,15 +932,17 @@ static gboolean completion_window_key_press(GtkWidget *widget, clear_completion_cache(); /* make sure anything we typed comes in the edit box */ - tmp_event.type = event->type; - tmp_event.window = entry->window; - tmp_event.send_event = TRUE; - tmp_event.time = event->time; - tmp_event.state = event->state; - tmp_event.keyval = event->keyval; - tmp_event.length = event->length; - tmp_event.string = event->string; - gtk_widget_event(entry, (GdkEvent *)&tmp_event); + if (event->length > 0 && event->keyval != GDK_Escape) { + tmp_event.type = event->type; + tmp_event.window = entry->window; + tmp_event.send_event = TRUE; + tmp_event.time = event->time; + tmp_event.state = event->state; + tmp_event.keyval = event->keyval; + tmp_event.length = event->length; + tmp_event.string = event->string; + gtk_widget_event(entry, (GdkEvent *)&tmp_event); + } /* and close the completion window */ gtk_widget_destroy(*completion_window); diff --git a/src/addressbook.c b/src/addressbook.c index f482d589..f10411d2 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -628,8 +628,10 @@ static void addressbook_create(void) hbox = gtk_hbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(clist_vbox), hbox, FALSE, FALSE, 0); +#if 0 label = gtk_label_new(_("Name:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); +#endif entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0); |