#if USE_GPGME
static struct Privacy {
GtkWidget *checkbtn_auto_check_signatures;
- GtkWidget *checkbtn_gpg_signature_popup;
GtkWidget *checkbtn_store_passphrase;
GtkWidget *spinbtn_store_passphrase;
GtkObject *spinbtn_store_passphrase_adj;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
GtkWidget *optmenu_nextunreadmsgdialog;
- GtkWidget *entry_pixmap_theme;
- GtkWidget *combo_pixmap_theme;
} interface;
static struct Other {
&prefs_common.auto_check_signatures, P_BOOL,
&privacy.checkbtn_auto_check_signatures,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"gpg_signature_popup", "FALSE",
- &prefs_common.gpg_signature_popup, P_BOOL,
- &privacy.checkbtn_gpg_signature_popup,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"store_passphrase", "FALSE", &prefs_common.store_passphrase, P_BOOL,
&privacy.checkbtn_store_passphrase,
prefs_set_data_from_toggle, prefs_set_toggle},
{"pixmap_theme_path", DEFAULT_PIXMAP_THEME,
&prefs_common.pixmap_theme_path, P_STRING,
- &interface.entry_pixmap_theme, prefs_set_data_from_entry, prefs_set_entry},
+ NULL, NULL, NULL},
{"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
NULL, NULL, NULL},
GtkWidget *hbox_spc;
GtkWidget *label;
GtkWidget *checkbtn_auto_check_signatures;
- GtkWidget *checkbtn_gpg_signature_popup;
GtkWidget *checkbtn_store_passphrase;
GtkObject *spinbtn_store_passphrase_adj;
GtkWidget *spinbtn_store_passphrase;
PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
_("Automatically check signatures"));
- PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_signature_popup,
- _("Show signature check result in a popup window"));
-
PACK_CHECK_BUTTON (vbox2, checkbtn_store_passphrase,
_("Store passphrase in memory temporarily"));
privacy.checkbtn_auto_check_signatures
= checkbtn_auto_check_signatures;
- privacy.checkbtn_gpg_signature_popup
- = checkbtn_gpg_signature_popup;
privacy.checkbtn_store_passphrase = checkbtn_store_passphrase;
privacy.spinbtn_store_passphrase = spinbtn_store_passphrase;
privacy.spinbtn_store_passphrase_adj = spinbtn_store_passphrase_adj;
GtkWidget *hbox_nextunreadmsgdialog;
GtkWidget *optmenu_nextunreadmsgdialog;
- GtkWidget *frame_pixmap_theme;
- GtkWidget *vbox_pixmap_theme;
- GtkWidget *entry_pixmap_theme;
- GtkWidget *combo_pixmap_theme;
- GList *avail_pixmap_themes = NULL;
-
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked",
GTK_SIGNAL_FUNC (prefs_keybind_select), NULL);
- PACK_FRAME(vbox1, frame_pixmap_theme, _("Icon theme"));
-
- vbox_pixmap_theme = gtk_vbox_new(FALSE, 0);
- gtk_widget_show(vbox_pixmap_theme);
- gtk_container_add(GTK_CONTAINER(frame_pixmap_theme), vbox_pixmap_theme);
- gtk_container_set_border_width(GTK_CONTAINER(vbox_pixmap_theme), 8);
-
- avail_pixmap_themes = stock_pixmap_themes_list_new();
-
- combo_pixmap_theme = gtk_combo_new ();
- gtk_widget_show (combo_pixmap_theme);
- gtk_box_pack_start (GTK_BOX (vbox_pixmap_theme), combo_pixmap_theme, TRUE, TRUE, 0);
- gtk_combo_set_popdown_strings(GTK_COMBO(combo_pixmap_theme), avail_pixmap_themes);
- entry_pixmap_theme = GTK_COMBO (combo_pixmap_theme)->entry;
-
- stock_pixmap_themes_list_free(avail_pixmap_themes);
-
/* interface.checkbtn_emacs = checkbtn_emacs; */
interface.checkbtn_always_show_msg = checkbtn_always_show_msg;
interface.checkbtn_openunread = checkbtn_openunread;
interface.checkbtn_openinbox = checkbtn_openinbox;
interface.checkbtn_immedexec = checkbtn_immedexec;
interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
- interface.combo_pixmap_theme = combo_pixmap_theme;
- interface.entry_pixmap_theme = entry_pixmap_theme;
}
static void prefs_other_create(void)
"(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
"(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
- "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
"(menu-path \"<Main>/Message/Compose an email message\" \"<control>M\")\n"
"(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
"(menu-path \"<Main>/Message/Reply to/all\" \"<shift><control>R\")\n"
"(menu-path \"<Main>/View/Show all headers\" \"<shift>H\")\n"
"(menu-path \"<Main>/View/Update\" \"<shift>S\")\n"
- "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
"(menu-path \"<Main>/Message/Compose an email message\" \"W\")\n"
"(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
"(menu-path \"<Main>/Message/Reply to/all\" \"<shift>A\")\n"
"(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
"(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
- "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
- "(menu-path \"<Main>/Message/Compose new message\" \"M\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
+ "(menu-path \"<Main>/Message/Compose an email message\" \"M\")\n"
"(menu-path \"<Main>/Message/Reply\" \"R\")\n"
"(menu-path \"<Main>/Message/Reply to/all\" \"G\")\n"
"(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
"(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
"(menu-path \"<Main>/View/Update\" \"<alt>U\")\n"
- "(menu-path \"<Main>/Message/Get new mail\" \"<alt>I\")\n"
- "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><alt>I\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<alt>I\")\n"
+ "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><alt>I\")\n"
"(menu-path \"<Main>/Message/Compose an email message\" \"<alt>N\")\n"
"(menu-path \"<Main>/Message/Reply\" \"<alt>R\")\n"
"(menu-path \"<Main>/Message/Reply to/all\" \"<shift><alt>R\")\n"
static void prefs_common_apply(void)
{
- gchar *entry_pixmap_theme_str;
- gboolean update_pixmap_theme;
- gchar *backup_theme_path;
MainWindow *mainwindow;
-
- entry_pixmap_theme_str = gtk_entry_get_text(GTK_ENTRY(interface.entry_pixmap_theme));
- if (entry_pixmap_theme_str &&
- (strcmp(prefs_common.pixmap_theme_path, entry_pixmap_theme_str) != 0) )
- update_pixmap_theme = TRUE;
- else
- update_pixmap_theme = FALSE;
-
- /*!< FIXME: prefs_set_data_from_dialog() clears and frees all strings,
- * but prefs_common.pixmap_theme_path is stored in the StockPixmapData
- * in stock_pixmap.c::pixmaps[].icon_path, and used when reflecting
- * the pixmap changes. Work around by saving the old one and freeing
- * it later. */
- backup_theme_path = prefs_common.pixmap_theme_path;
- prefs_common.pixmap_theme_path = g_strdup(backup_theme_path);
+
prefs_set_data_from_dialog(param);
sock_set_io_timeout(prefs_common.io_timeout_secs);
-
- if (update_pixmap_theme) {
- main_window_reflect_prefs_all_real(TRUE);
- compose_reflect_prefs_pixmap_theme();
- } else
- main_window_reflect_prefs_all_real(FALSE);
-
- /*!< FIXME: Now it's safe to delete the backup path */
- g_free(backup_theme_path);
-
prefs_common_save_config();
mainwindow = mainwindow_get_mainwindow();