+2001-05-08
+
+ * src/select-keys.c: delete_event_cb(): removed `;' from its end.
+
+2001-05-07
+
+ * src/prefs_common.c
+ src/prefs_account.c
+ src/prefs_filter.c
+ src/account.c
+ src/alertpanel.c
+ src/filesel.c
+ src/foldersel.c
+ src/export.c
+ src/import.c
+ src/inputdialog.c
+ src/passphrase.c
+ src/select-keys.c
+ src/sigstatus.c: fixed a bug that accidentally destroyed dialogs
+ when closed them with delete_event (thanks to DINH).
+ Added *_deleted() and *delete_event() which handle delete_event
+ signal correctly.
+
2001-05-06
* src/prefs_display_header.c: merged some changes from claws branch:
+2001-05-07 [alfons]
+
+ 0.4.66claws4
+
+ * sync with sylpheed 0.4.66cvs6
+
2001-05-07 [darko]
* src/prefs_common.[ch]: added option to enable/disable
+2001-05-08
+
+ * src/select-keys.c: delete_event_cb(): ½ªÃ¼¤«¤é `;' ¤ò¼è¤ê½ü¤¤¤¿¡£
+
+2001-05-07
+
+ * src/prefs_common.c
+ src/prefs_account.c
+ src/prefs_filter.c
+ src/account.c
+ src/alertpanel.c
+ src/filesel.c
+ src/foldersel.c
+ src/export.c
+ src/import.c
+ src/inputdialog.c
+ src/passphrase.c
+ src/select-keys.c
+ src/sigstatus.c: delete_event ¤Ç¥À¥¤¥¢¥í¥°¤òÊĤ¸¤¿¤È¤¤Ë¤½¤ì¤ò
+ ¸í¤Ã¤ÆÇ˲õ¤·¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ(DINH ¤µ¤ó thanks)¡£
+ delete_event ¥·¥°¥Ê¥ë¤òÀµ¤·¤¯°·¤¦ *_deleted() ¤È *delete_event()
+ ¤òÄɲá£
+
2001-05-06
* src/prefs_display_header.c: claws ¥Ö¥é¥ó¥Á¤«¤é¤¤¤¯¤Ä¤«¤ÎÊѹ¹¤ò
MICRO_VERSION=66
INTERFACE_AGE=66
BINARY_AGE=66
-EXTRA_VERSION=claws3
+EXTRA_VERSION=claws4
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl
static void account_set_default (void);
static void account_edit_close (void);
+static gint account_delete_event (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void account_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
gtk_window_set_modal (GTK_WINDOW (window), TRUE);
gtk_signal_connect (GTK_OBJECT (window), "delete_event",
- GTK_SIGNAL_FUNC (account_edit_close), NULL);
+ GTK_SIGNAL_FUNC (account_delete_event), NULL);
gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
GTK_SIGNAL_FUNC (account_key_pressed), NULL);
gtk_signal_connect (GTK_OBJECT (window), "focus_in_event",
inc_autocheck_timer_set();
}
+static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ account_edit_close();
+ return TRUE;
+}
+
static void account_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
gpointer data);
static void alertpanel_button_clicked (GtkWidget *widget,
gpointer data);
+static gint alertpanel_deleted (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void alertpanel_close (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
- GTK_SIGNAL_FUNC(alertpanel_close),
+ GTK_SIGNAL_FUNC(alertpanel_deleted),
(gpointer)G_ALERTOTHER);
gtk_signal_connect(GTK_OBJECT(dialog), "key_press_event",
GTK_SIGNAL_FUNC(alertpanel_close),
value = (value & ~G_ALERT_VALUE_MASK) | (AlertValue)data;
}
+static gint alertpanel_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ value = (value & ~G_ALERT_VALUE_MASK) | (AlertValue)data;
+ return TRUE;
+}
+
static void alertpanel_close(GtkWidget *widget, GdkEventAny *event,
gpointer data)
{
static void export_cancel_cb(GtkWidget *widget, gpointer data);
static void export_srcsel_cb(GtkWidget *widget, gpointer data);
static void export_filesel_cb(GtkWidget *widget, gpointer data);
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data);
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
gint export_mbox(FolderItem *default_src)
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(export_cancel_cb), NULL);
+ GTK_SIGNAL_FUNC(delete_event), NULL);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(key_pressed), NULL);
gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
gtk_entry_set_text(GTK_ENTRY(src_entry), src->path);
}
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ export_cancel_cb(NULL, NULL);
+ return TRUE;
+}
+
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape)
static void filesel_create(const gchar *title);
static void filesel_ok_cb(GtkWidget *widget, gpointer data);
static void filesel_cancel_cb(GtkWidget *widget, gpointer data);
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data);
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
gchar *filesel_select_file(const gchar *title, const gchar *file)
"clicked", GTK_SIGNAL_FUNC(filesel_cancel_cb),
NULL);
gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",
- GTK_SIGNAL_FUNC(filesel_cancel_cb),
+ GTK_SIGNAL_FUNC(delete_event),
NULL);
gtk_signal_connect(GTK_OBJECT(filesel), "key_press_event",
GTK_SIGNAL_FUNC(key_pressed), NULL);
gtk_main_quit();
}
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ filesel_cancel_cb(NULL, NULL);
+ return TRUE;
+}
+
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape)
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static void foldersel_ok(GtkButton *button, gpointer data);
static void foldersel_cancel(GtkButton *button, gpointer data);
static void foldersel_activated(void);
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data);
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
FolderItem *foldersel_folder_sel(const gchar *default_folder)
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(foldersel_cancel), NULL);
+ GTK_SIGNAL_FUNC(delete_event), NULL);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(key_pressed), NULL);
gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
gtk_button_clicked(GTK_BUTTON(ok_button));
}
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ foldersel_cancel(NULL, NULL);
+ return TRUE;
+}
+
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape)
static void import_cancel_cb(GtkWidget *widget, gpointer data);
static void import_filesel_cb(GtkWidget *widget, gpointer data);
static void import_destsel_cb(GtkWidget *widget, gpointer data);
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data);
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
gint import_mbox(FolderItem *default_dest)
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(import_cancel_cb), NULL);
+ GTK_SIGNAL_FUNC(delete_event), NULL);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(key_pressed), NULL);
gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
gtk_entry_set_text(GTK_ENTRY(dest_entry), dest->path);
}
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ import_cancel_cb(NULL, NULL);
+ return TRUE;
+}
+
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape)
gpointer data);
static void cancel_clicked (GtkWidget *widget,
gpointer data);
+static gint delete_event (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
- GTK_SIGNAL_FUNC(cancel_clicked), NULL);
+ GTK_SIGNAL_FUNC(delete_event), NULL);
gtk_signal_connect(GTK_OBJECT(dialog), "key_press_event",
GTK_SIGNAL_FUNC(key_pressed), NULL);
gtk_signal_connect(GTK_OBJECT(dialog), "focus_in_event",
gtk_main_quit();
}
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ ack = FALSE;
+ gtk_main_quit();
+
+ return TRUE;
+}
+
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape) {
static void passphrase_ok_cb(GtkWidget *widget, gpointer data);
static void passphrase_cancel_cb(GtkWidget *widget, gpointer data);
+static gint passphrase_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data);
static void passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data);
static GtkWidget *create_description (const gchar *desc);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(passphrase_cancel_cb), NULL);
+ GTK_SIGNAL_FUNC(passphrase_deleted), NULL);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(passphrase_key_pressed), NULL);
}
+static gint
+passphrase_deleted(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ passphrase_cancel_cb(NULL, NULL);
+ return TRUE;
+}
+
+
static void
passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
#endif /* USE_GPGME */
static void prefs_account_advanced_create (void);
+static gint prefs_account_deleted (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void prefs_account_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
/* create dialog */
prefs_dialog_create(&dialog);
gtk_signal_connect(GTK_OBJECT(dialog.window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_account_cancel), NULL);
+ GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_in_event",
advanced.domain_entry = entry_domain;
}
+static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ prefs_account_cancel();
+ return TRUE;
+}
+
static void prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
gpointer data);
static void prefs_font_selection_ok (GtkButton *button);
+static gint prefs_common_deleted (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void prefs_common_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
gtk_window_set_title (GTK_WINDOW(dialog.window),
_("Common Preferences"));
gtk_signal_connect (GTK_OBJECT(dialog.window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_common_cancel), NULL);
+ GTK_SIGNAL_FUNC(prefs_common_deleted), NULL);
gtk_signal_connect (GTK_OBJECT(dialog.window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_common_key_pressed), NULL);
gtk_signal_connect (GTK_OBJECT(dialog.window), "focus_in_event",
prefs_common_charset_set_data_from_optmenu(pparam);
}
+static gint prefs_common_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ prefs_common_cancel();
+ return TRUE;
+}
+
static void prefs_common_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
static void prefs_filter_dest_radio_button_toggled (void);
static void prefs_filter_notrecv_radio_button_toggled (void);
+static gint prefs_filter_deleted (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void prefs_filter_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static void prefs_filter_close ();
+static void prefs_filter_close (void);
void prefs_filter_open(void)
{
gtk_window_set_title (GTK_WINDOW(window),
_("Filter setting"));
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_filter_close), NULL);
+ GTK_SIGNAL_FUNC(prefs_filter_deleted), NULL);
gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_filter_key_pressed), NULL);
gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
gtk_widget_set_sensitive(filter.destsel_btn, FALSE);
}
+static gint prefs_filter_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ prefs_filter_close();
+ return TRUE;
+}
+
static void prefs_filter_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
/* if elapsed time from previous update is greater
than 300 usec, update UI */
if (tv_cur.tv_sec - tv_prev.tv_sec > 0 ||
- tv_cur.tv_usec - tv_prev.tv_usec > 300) {
+ tv_cur.tv_usec - tv_prev.tv_usec > 500) {
recv_ui_func(sock, bytes, recv_ui_func_data);
gettimeofday(&tv_prev, NULL);
}
static void create_dialog (struct select_keys_s *sk);
static void open_dialog (struct select_keys_s *sk);
static void close_dialog (struct select_keys_s *sk);
+static gint delete_event_cb (GtkWidget *widget,
+ GdkEventAny *event, gpointer data);
static void key_pressed_cb (GtkWidget *widget,
GdkEventKey *event, gpointer data);
static void select_btn_cb (GtkWidget *widget, gpointer data);
gtk_window_set_title (GTK_WINDOW (window), _("Select Keys"));
gtk_window_set_modal (GTK_WINDOW (window), TRUE);
gtk_signal_connect (GTK_OBJECT (window), "delete_event",
- GTK_SIGNAL_FUNC (close_dialog), sk);
+ GTK_SIGNAL_FUNC (delete_event_cb), sk);
gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
GTK_SIGNAL_FUNC (key_pressed_cb), sk);
}
+static gint
+delete_event_cb (GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ struct select_keys_s *sk = data;
+
+ sk->okay = 0;
+ gtk_main_quit ();
+
+ return TRUE;
+}
+
+
static void
key_pressed_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
{
}
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+ GpgmegtkSigStatus hd = data;
+
+ hd->running = 0;
+ do_destroy(hd);
+
+ return TRUE;
+}
+
+
static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
GpgmegtkSigStatus hd = data;
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(okay_cb), hd);
+ GTK_SIGNAL_FUNC(delete_event), hd);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(key_pressed), hd);