/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2007 Colin Leroy <colin@colino.net> & The Claws Mail Team
+ * Copyright (C) 2005-2011 Colin Leroy <colin@colino.net> & The Claws Mail Team
*
* 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
GtkTreeViewColumn *column;
GtkTreeSelection *selection;
- time_format[0].txt = _("the full abbreviated weekday name");
+ time_format[0].txt = _("the abbreviated weekday name");
time_format[1].txt = _("the full weekday name");
time_format[2].txt = _("the abbreviated month name");
time_format[3].txt = _("the full month name");
GtkWidget *hbox1;
GtkWidget *label_ng_abbrev;
GtkWidget *spinbtn_ng_abbrev_len;
- GtkObject *spinbtn_ng_abbrev_len_adj;
+ GtkAdjustment *spinbtn_ng_abbrev_len_adj;
GtkWidget *vbox2;
GtkWidget *vbox3;
GtkWidget *checkbtn_useaddrbook;
GtkWidget *checkbtn_reopen_last_folder;
GtkWidget *optmenu_always_show_msg;
GtkWidget *spinbtn_mark_as_read_delay;
- GtkObject *spinbtn_mark_as_read_delay_adj;
+ GtkAdjustment *spinbtn_mark_as_read_delay_adj;
GtkWidget *checkbtn_immedexec;
GtkWidget *checkbtn_ask_mark_all_read;
GtkWidget *label, *label_fill;
PACK_CHECK_BUTTON
(vbox2, checkbtn_reopen_last_folder,
- _("Open last opened folder at startup"));
+ _("Open last opened folder at start-up"));
label_ng_abbrev = gtk_label_new
(_("Abbreviate newsgroup names longer than"));
gtk_widget_show (label_ng_abbrev);
gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
- spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 10);
+ spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 0);
spinbtn_ng_abbrev_len = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_ng_abbrev_len_adj), 1, 0);
gtk_widget_show (spinbtn_ng_abbrev_len);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (hbox1), radio_mark_as_read_on_select, FALSE, FALSE, 0);
- spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 10);
+ spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 0);
spinbtn_mark_as_read_delay = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_mark_as_read_delay_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_mark_as_read_delay,
gtk_widget_set_size_request(entry_datefmt, 200, -1);
gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(2, 8, 0)
button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO);
-#else
- button_datefmt = gtk_button_new_with_label ("Info...");
-#endif
gtk_widget_show (button_datefmt);
gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0);
PACK_CHECK_BUTTON
(vbox1, checkbtn_ask_mark_all_read,
- _("Confirm before marking all mails in a folder as read"));
+ _("Confirm before marking all messages in a folder as read"));
PACK_CHECK_BUTTON
(vbox1, checkbtn_transhdr,
_("Translate header names"));
GtkWidget *datefmt_sample = NULL;
gchar *text;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(*widget != NULL);
- g_return_if_fail(prefs_summaries->entry_datefmt != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(*widget != NULL);
+ cm_return_if_fail(prefs_summaries->entry_datefmt != NULL);
datefmt_sample = GTK_WIDGET(g_object_get_data
(G_OBJECT(*widget), "datefmt_sample"));
- g_return_if_fail(datefmt_sample != NULL);
+ cm_return_if_fail(datefmt_sample != NULL);
text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1);
g_free(prefs_common.date_format);
static void date_format_cancel_btn_clicked(GtkButton *button,
GtkWidget **widget)
{
- g_return_if_fail(widget != NULL);
- g_return_if_fail(*widget != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(*widget != NULL);
gtk_widget_destroy(*widget);
*widget = NULL;
static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
GtkWidget **widget)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
date_format_cancel_btn_clicked(NULL, widget);
return FALSE;
}
static gboolean date_format_on_delete(GtkWidget *dialogwidget,
GdkEventAny *event, GtkWidget **widget)
{
- g_return_val_if_fail(widget != NULL, FALSE);
- g_return_val_if_fail(*widget != NULL, FALSE);
+ cm_return_val_if_fail(widget != NULL, FALSE);
+ cm_return_val_if_fail(*widget != NULL, FALSE);
*widget = NULL;
return FALSE;
text = gtk_editable_get_chars(editable, 0, -1);
if (text)
fast_strftime(buffer, sizeof buffer, text, cal_time);
- g_free(text);
-
- text = conv_codeset_strdup(buffer,
- conv_get_locale_charset_str(),
- CS_UTF_8);
- if (!text)
- text = g_strdup(buffer);
- gtk_label_set_text(example, text);
+ gtk_label_set_text(example, buffer);
g_free(text);
}
GtkTreeIter iter;
GtkTreeModel *model;
- g_return_if_fail(date_format != NULL);
+ cm_return_if_fail(date_format != NULL);
/* only on double click */
datefmt_sample = GTK_WIDGET(g_object_get_data(G_OBJECT(date_format),
"datefmt_sample"));
- g_return_if_fail(datefmt_sample != NULL);
+ cm_return_if_fail(datefmt_sample != NULL);
model = gtk_tree_view_get_model(list_view);