gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sync with 0.8.5cvs17

Browse source
This commit is contained in:
Paul Mangan 2002-11-05 09:24:27 +00:00
parent 772845174a
commit 3cfe5f39f8
13 changed files with 122 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ChangeLog
View file

@ -1,7 +1,36 @@
2002-11-05
* src/gtkutils.[ch]:
gtkut_font_load(): new. It automatically choose font or fontset
by current locale.
gtkut_font_load_from_fontset(): new. It tries to load single font
instead of fontset from a fontset string.
* src/alertpanel.c
src/folderview.c
src/headerview.c
src/summaryview.c: workaround for the problem that couldn't display
8-bit characters in C or POSIX locale (use font instead of fontset).
* src/compose.c
src/sourcewindow.c
src/textview.c: made code cleanup using gtkut_font_load*().
2002-10-29
* src/mh.c: mh_get_msginfo(): set correct message number.
2002-10-29
* src/folder.[ch]: added a new virtual method Folder::get_msginfo().
It returns a new MsgInfo associated to a message number.
folder_item_get_msginfo(): new.
* src/imap.[ch]: imap_get_msginfo(): new.
* src/mh.[ch]: mh_get_msginfo(): new.
* src/news.[ch]: news_get_msginfo(): new.
2002-10-28
* src/codeconv.c: conv_euctojis(): fixed a bug which will cause
infinite loop if a invalid code appeared.
infinite loop if an invalid code appeared.
2002-10-25

5
ChangeLog.claws
View file

@ -1,3 +1,8 @@
2002-11-05 [paul] 0.8.5claws71
* sync with 0.8.5cvs17
see ChangeLog 2002-11-05
2002-11-04 [paul] 0.8.5claws70
* sylpheed-128x128.png

29
ChangeLog.jp
View file

@ -1,3 +1,32 @@
2002-11-05
* src/gtkutils.[ch]:
gtkut_font_load(): 新規。現在の locale によって font または fontset
を自動的に選択する。
gtkut_font_load_from_fontset(): 新規。フォントセット文字列から
フォントセットの代わりに単一のフォントの読み込みを試みる。
* src/alertpanel.c
src/folderview.c
src/headerview.c
src/summaryview.c: C または POSIX locale で 8-bit 文字を表示
できない問題に対処(fontset の代わりに font を使用)。
* src/compose.c
src/sourcewindow.c
src/textview.c: gtkut_font_load*() を使用してコードを整理。
2002-10-29
* src/mh.c: mh_get_msginfo(): 正しいメッセージ番号をセット。
2002-10-29
* src/folder.[ch]: 新規仮想メソッド Folder::get_msginfo() を追加。
メッセージ番号に対応する新規 MsgInfo を返す。
folder_item_get_msginfo(): 新規。
* src/imap.[ch]: imap_get_msginfo(): 新規。
* src/mh.[ch]: mh_get_msginfo(): 新規。
* src/news.[ch]: news_get_msginfo(): 新規。
2002-10-28
* src/codeconv.c: conv_euctojis(): 不正なコードが出現したら無限

2
configure.in
View file

@ -11,7 +11,7 @@ MINOR_VERSION=8
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=claws70
EXTRA_VERSION=claws71
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target

2
src/alertpanel.c
View file

@ -236,7 +236,7 @@ static void alertpanel_create(const gchar *title,
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
style = gtk_style_copy(gtk_widget_get_style(label));
if (!titlefont)
titlefont = gdk_fontset_load(TITLE_FONT);
titlefont = gtkut_font_load(TITLE_FONT);
if (titlefont)
style->font = titlefont;
gtk_widget_set_style(label, style);

12
src/compose.c
View file

@ -4598,7 +4598,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
GdkColormap *cmap;
GdkColor color[1];
gboolean success[1];
GdkFont *font;
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
GtkItemFactory *ifactory;
@ -4789,16 +4788,9 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
new_style = gtk_style_copy(style);
if (prefs_common.textfont) {
if (MB_CUR_MAX == 1) {
gchar *fontstr, *p;
GdkFont *font;
Xstrdup_a(fontstr, prefs_common.textfont, );
if (fontstr && (p = strchr(fontstr, ',')) != NULL)
*p = '\0';
font = gdk_font_load(fontstr);
} else
font = gdk_fontset_load(prefs_common.textfont);
if (font) {
if ((font = gtkut_font_load(prefs_common.textfont)) != NULL) {
gdk_font_unref(new_style->font);
new_style->font = font;
}

4
src/folderview.c
View file

@ -537,9 +537,9 @@ void folderview_init(FolderView *folderview)
if (!normalfont)
normalfont = gdk_fontset_load(NORMAL_FONT);
normalfont = gtkut_font_load(NORMAL_FONT);
if (!boldfont)
boldfont = gdk_fontset_load(BOLD_FONT);
boldfont = gtkut_font_load(BOLD_FONT);
if (!bold_style) {
bold_style = gtk_style_copy(gtk_widget_get_style(ctree));

37
src/gtkutils.c
View file

@ -31,6 +31,7 @@
#include <gtk/gtkcombo.h>
#include <gtk/gtkthemes.h>
#include <gtk/gtkbindings.h>
#include <stdlib.h>
#include <stdarg.h>
#include <sys/stat.h>
@ -79,6 +80,42 @@ gint gtkut_get_font_height(GdkFont *font)
return height;
}
GdkFont *gtkut_font_load(const gchar *fontset_name)
{
GdkFont *font;
g_return_val_if_fail(fontset_name != NULL, NULL);
if (MB_CUR_MAX == 1)
font = gtkut_font_load_from_fontset(fontset_name);
else
font = gdk_fontset_load(fontset_name);
return font;
}
GdkFont *gtkut_font_load_from_fontset(const gchar *fontset_name)
{
GdkFont *font = NULL;
if (strchr(fontset_name, ',') == NULL) {
font = gdk_font_load(fontset_name);
} else {
gchar **fonts;
gint i;
fonts = g_strsplit(fontset_name, ",", -1);
for (i = 0; fonts[i] != NULL && fonts[i][0] != '\0';
i++) {
font = gdk_font_load(fonts[i]);
if (font) break;
}
g_strfreev(fonts);
}
return font;
}
void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
{
g_return_if_fail(color != NULL);

3
src/gtkutils.h
View file

@ -80,6 +80,9 @@
gint gtkut_get_font_width (GdkFont *font);
gint gtkut_get_font_height (GdkFont *font);
GdkFont *gtkut_font_load (const gchar *fontset_name);
GdkFont *gtkut_font_load_from_fontset (const gchar *fontset_name);
void gtkut_convert_int_to_gdk_color (gint rgbvalue,
GdkColor *color);

2
src/headerview.c
View file

@ -134,7 +134,7 @@ HeaderView *headerview_create(void)
void headerview_init(HeaderView *headerview)
{
if (!boldfont)
boldfont = gdk_fontset_load(BOLD_FONT);
boldfont = gtkut_font_load(BOLD_FONT);
#define SET_FONT_STYLE(wid) \
{ \

19
src/sourcewindow.c
View file

@ -45,25 +45,10 @@ static void key_pressed (GtkWidget *widget,
static GdkFont *msgfont = NULL;
#define FONT_LOAD(font, s) \
{ \
gchar *fontstr, *p; \
\
Xstrdup_a(fontstr, s, ); \
if ((p = strchr(fontstr, ',')) != NULL) *p = '\0'; \
font = gdk_font_load(fontstr); \
}
static void source_window_init()
{
if (msgfont != NULL || prefs_common.textfont == NULL)
return;
if (MB_CUR_MAX == 1) {
FONT_LOAD(msgfont, prefs_common.textfont);
} else {
msgfont = gdk_fontset_load(prefs_common.textfont);
}
if (!msgfont && prefs_common.textfont)
msgfont = gtkut_font_load(prefs_common.textfont);
}
SourceWindow *source_window_create(void)

4
src/summaryview.c
View file

@ -646,7 +646,7 @@ void summary_init(SummaryView *summaryview)
small_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
if (!smallfont)
smallfont = gdk_fontset_load(SMALL_FONT);
smallfont = gtkut_font_load(SMALL_FONT);
small_style->font = smallfont;
small_marked_style = gtk_style_copy(small_style);
small_marked_style->fg[GTK_STATE_NORMAL] =
@ -659,7 +659,7 @@ void summary_init(SummaryView *summaryview)
bold_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
if (!boldfont)
boldfont = gdk_fontset_load(BOLD_FONT);
boldfont = gtkut_font_load(BOLD_FONT);
bold_style->font = boldfont;
bold_marked_style = gtk_style_copy(bold_style);
bold_marked_style->fg[GTK_STATE_NORMAL] =

25
src/textview.c
View file

@ -52,17 +52,6 @@
#include "account.h"
#include "mimeview.h"
#define FONT_LOAD(font, s) \
{ \
gchar *fontstr, *p; \
\
Xstrdup_a(fontstr, s, ); \
if ((p = strchr(fontstr, ',')) != NULL) *p = '\0'; \
font = gdk_font_load(fontstr); \
if (!font) \
g_warning("Couldn't load the font '%s'\n", fontstr); \
}
typedef struct _RemoteURI RemoteURI;
struct _RemoteURI
@ -203,7 +192,7 @@ TextView *textview_create(void)
GtkStyle *style;
GdkFont *font;
FONT_LOAD(font, prefs_common.normalfont);
font = gtkut_font_load_from_fontset(prefs_common.normalfont);
if (font) {
style = gtk_style_copy(text_sb->style);
gdk_font_unref(style->font);
@ -1229,11 +1218,11 @@ void textview_set_font(TextView *textview, const gchar *codeset)
text_sb_font->ascent = text_sb_font_orig_ascent;
text_sb_font->descent = text_sb_font_orig_descent;
}
if (MB_CUR_MAX > 1) {
FONT_LOAD(font, "-*-courier-medium-r-normal--14-*-*-*-*-*-iso8859-1");
} else {
FONT_LOAD(font, prefs_common.textfont);
}
if (MB_CUR_MAX > 1)
font = gdk_font_load("-*-courier-medium-r-normal--14-*-*-*-*-*-iso8859-1");
else
font = gtkut_font_load_from_fontset
(prefs_common.textfont);
if (font && text_sb_font != font) {
if (text_sb_font)
gdk_font_unref(text_sb_font);
@ -1259,7 +1248,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
}
if (!textview->boldfont && prefs_common.boldfont)
FONT_LOAD(textview->boldfont, prefs_common.boldfont);
textview->boldfont = gtkut_font_load(prefs_common.boldfont);
if (!spacingfont)
spacingfont = gdk_font_load("-*-*-medium-r-normal--6-*");
}