+2007-01-21 [colin] 2.7.1cvs43
+
+ * src/addrselect.c
+ * src/addrselect.h
+ * src/codeconv.c
+ * src/codeconv.h
+ * src/compose.c
+ * src/compose.h
+ * src/etpan/Makefile.am
+ * src/gtk/colorlabel.c
+ * src/gtk/colorlabel.h
+ * src/gtk/sslcertwindow.c
+ * src/gtk/sslcertwindow.h
+ * src/etpan/etpan-log.c ** REMOVED **
+ * src/etpan/etpan-log.h ** REMOVED **
+ Same
+
2007-01-20 [colin] 2.7.1cvs42
* src/addritem.c
( cvs diff -u -r 1.61.2.56 -r 1.61.2.57 src/account.c; cvs diff -u -r 1.22.2.12 -r 1.22.2.13 src/addrbook.c; cvs diff -u -r 1.15.2.9 -r 1.15.2.10 src/addrcache.c; cvs diff -u -r 1.60.2.77 -r 1.60.2.78 src/addressbook.c; cvs diff -u -r 1.5.10.15 -r 1.5.10.16 src/addrgather.c; cvs diff -u -r 1.28.2.21 -r 1.28.2.22 src/addrindex.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/addrquery.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/addrselect.c; cvs diff -u -r 1.2.4.15 -r 1.2.4.16 src/browseldap.c; cvs diff -u -r 1.382.2.353 -r 1.382.2.354 src/compose.c; cvs diff -u -r 1.5.12.8 -r 1.5.12.9 src/editbook.c; cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/editjpilot.c; cvs diff -u -r 1.8.2.18 -r 1.8.2.19 src/editldap.c; cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/editldap_basedn.c; cvs diff -u -r 1.5.12.10 -r 1.5.12.11 src/editvcard.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/exporthtml.c; cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/exportldif.c; cvs diff -u -r 1.213.2.131 -r 1.213.2.132 src/folder.c; cvs diff -u -r 1.207.2.144 -r 1.207.2.145 src/folderview.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/image_viewer.c; cvs diff -u -r 1.179.2.154 -r 1.179.2.155 src/imap.c; cvs diff -u -r 1.4.12.14 -r 1.4.12.15 src/importmutt.c; cvs diff -u -r 1.1.14.14 -r 1.1.14.15 src/importpine.c; cvs diff -u -r 1.18.2.22 -r 1.18.2.23 src/jpilot.c; cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/ldapquery.c; cvs diff -u -r 1.115.2.128 -r 1.115.2.129 src/main.c; cvs diff -u -r 1.274.2.167 -r 1.274.2.168 src/mainwindow.c; cvs diff -u -r 1.75.2.33 -r 1.75.2.34 src/matcher.c; cvs diff -u -r 1.94.2.120 -r 1.94.2.121 src/messageview.c; cvs diff -u -r 1.79.2.51 -r 1.79.2.52 src/mh.c; cvs diff -u -r 1.83.2.99 -r 1.83.2.100 src/mimeview.c; cvs diff -u -r 1.16.2.49 -r 1.16.2.50 src/msgcache.c; cvs diff -u -r 1.6.10.10 -r 1.6.10.11 src/mutt.c; cvs diff -u -r 1.101.2.35 -r 1.101.2.36 src/news.c; cvs diff -u -r 1.6.2.9 -r 1.6.2.10 src/pine.c; cvs diff -u -r 1.105.2.83 -r 1.105.2.84 src/prefs_account.c; cvs diff -u -r 1.204.2.120 -r 1.204.2.121 src/prefs_common.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_compose_writing.c; cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/prefs_ext_prog.c; cvs diff -u -r 1.52.2.35 -r 1.52.2.36 src/prefs_folder_item.c; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/prefs_fonts.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_message.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_other.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_quote.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_receive.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_send.c; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/prefs_spelling.c; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/prefs_summaries.c; cvs diff -u -r 1.30.2.31 -r 1.30.2.32 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_wrapping.c; cvs diff -u -r 1.10.2.12 -r 1.10.2.13 src/privacy.c; cvs diff -u -r 1.49.2.88 -r 1.49.2.89 src/procmime.c; cvs diff -u -r 1.150.2.87 -r 1.150.2.88 src/procmsg.c; cvs diff -u -r 1.3.2.25 -r 1.3.2.26 src/ssl_manager.c; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/statusbar.c; cvs diff -u -r 1.395.2.280 -r 1.395.2.281 src/summaryview.c; cvs diff -u -r 1.43.2.59 -r 1.43.2.60 src/toolbar.c; cvs diff -u -r 1.14.2.8 -r 1.14.2.9 src/vcard.c; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/common/hooks.c; cvs diff -u -r 1.6.2.8 -r 1.6.2.9 src/common/log.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/common/passcrypt.c; cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/common/socket.c; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/common/ssl.c; cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/common/ssl_certificate.c; cvs diff -u -r 1.2.4.17 -r 1.2.4.18 src/common/template.c; cvs diff -u -r 1.36.2.95 -r 1.36.2.96 src/common/utils.c; cvs diff -u -r 1.1.4.72 -r 1.1.4.73 src/etpan/imap-thread.c; cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/gtk/sslcertwindow.h; ) > 2.7.1cvs40.patchset
( cvs diff -u -r 1.61.2.57 -r 1.61.2.58 src/account.c; cvs diff -u -r 1.11.2.7 -r 1.11.2.8 src/account.h; cvs diff -u -r 1.22.2.13 -r 1.22.2.14 src/addrbook.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/addrbook.h; cvs diff -u -r 1.15.2.10 -r 1.15.2.11 src/addrcache.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/addrcache.h; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/addrclip.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/addrclip.h; cvs diff -u -r 1.60.2.78 -r 1.60.2.79 src/addressbook.c; cvs diff -u -r 1.18.2.7 -r 1.18.2.8 src/addressbook.h; cvs diff -u -r 1.6.10.14 -r 1.6.10.15 src/addrharvest.c; cvs diff -u -r 1.4.12.4 -r 1.4.12.5 src/addrharvest.h; cvs diff -u -r 1.28.2.22 -r 1.28.2.23 src/addrindex.c; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/addrindex.h; cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/editaddress.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/editaddress.h; ) > 2.7.1cvs41.patchset
( cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/addritem.c; cvs diff -u -r 1.12.2.6 -r 1.12.2.7 src/addritem.h; ) > 2.7.1cvs42.patchset
+( cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/addrselect.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/addrselect.h; cvs diff -u -r 1.65.2.53 -r 1.65.2.54 src/codeconv.c; cvs diff -u -r 1.15.2.17 -r 1.15.2.18 src/codeconv.h; cvs diff -u -r 1.382.2.354 -r 1.382.2.355 src/compose.c; cvs diff -u -r 1.50.2.30 -r 1.50.2.31 src/compose.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/Makefile.am; cvs diff -u -r -1.1.4.5 -r -1.1.4.6 src/etpan/etpan-log.c; cvs diff -u -r -1.1.4.3 -r -1.1.4.4 src/etpan/etpan-log.h; cvs diff -u -r 1.2.2.15 -r 1.2.2.16 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/colorlabel.h; cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.5 -r 1.6.2.6 src/gtk/sslcertwindow.h; ) > 2.7.1cvs43.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
#include "addressitem.h"
#include "mgutils.h"
+static AddrSelectItem *addrselect_create_item ( AddrItemObject *aio );
+
/**
* Create a selection record from an address cache item.
* \param aio Item object.
* \return Address select item.
*/
-AddrSelectItem *addrselect_create_item( AddrItemObject *aio ) {
+static AddrSelectItem *addrselect_create_item( AddrItemObject *aio ) {
AddrSelectItem *item = NULL;
if( aio ) {
return buf;
}
-/**
- * Print formatted addresses list to specified stream.
- * \param asl List to process.
- * \param stream Stream.
- */
-void addrselect_list_print( AddrSelectList *asl, FILE *stream ) {
- GList *node;
-
- g_return_if_fail( asl != NULL );
- fprintf( stream, "show selection...>>>\n" );
- node = asl->listSelect;
- while( node != NULL ) {
- AddrSelectItem *item;
- AddrItemObject *aio;
- gchar *addr;
-
- item = node->data;
- aio = ( AddrItemObject * ) item->addressItem;
- if( aio ) {
- fprintf( stream, "- %d : '%s'\n", aio->type, aio->name );
- if( aio->type == ADDR_ITEM_GROUP ) {
- ItemGroup *group = ( ItemGroup * ) aio;
- GList *node = group->listEMail;
- while( node ) {
- ItemEMail *email = node->data;
- addr = addrselect_format_address(
- ( AddrItemObject * ) email );
- if( addr ) {
- fprintf( stream, "\tgrp >%s<\n", addr );
- g_free( addr );
- }
- node = g_list_next( node );
- }
- }
- else {
- addr = addrselect_format_address( aio );
- if( addr ) {
- fprintf( stream, "\t>%s<\n", addr );
- g_free( addr );
- }
- }
- }
- else {
- fprintf( stream, "- NULL" );
- }
- node = g_list_next( node );
- }
- fprintf( stream, "show selection...<<<\n" );
-}
-
-/**
- * Print address items to specified stream.
- * \param asl List to process.
- * \param stream Stream.
- */
-void addrselect_list_show( AddrSelectList *asl, FILE *stream ) {
- GList *node;
-
- g_return_if_fail( asl != NULL );
- fprintf( stream, "show selection...>>>\n" );
- node = asl->listSelect;
- while( node != NULL ) {
- AddrSelectItem *item;
-
- item = node->data;
- addrselect_item_print( item, stream );
- node = g_list_next( node );
- }
- fprintf( stream, "show selection...<<<\n" );
-}
-
/**
* Test whether specified object is in list.
* \param list List to check.
GList *listSelect;
};
-AddrSelectItem *addrselect_create_item ( AddrItemObject *aio );
AddrSelectItem *addrselect_create_node ( AddressObject *obj );
AddrSelectItem *addrselect_item_copy ( AddrSelectItem *item );
void addrselect_item_free ( AddrSelectItem *item );
gchar *cacheID );
void addrselect_list_remove ( AddrSelectList *asl,
AddrItemObject *aio );
-void addrselect_list_show ( AddrSelectList *asl,
- FILE *stream );
-void addrselect_list_print ( AddrSelectList *asl,
- FILE *stream );
GList *addrselect_build_list ( AddrSelectList *asl );
#endif /* __ADDR_SELECT_H__ */
state = JIS_AUXKANJI; \
}
+static CodeConvFunc conv_get_code_conv_func (const gchar *src_charset_str,
+ const gchar *dest_charset_str);
+
+static CharSet conv_get_locale_charset (void);
+static CharSet conv_get_outgoing_charset (void);
+static CharSet conv_guess_ja_encoding(const gchar *str);
+static gboolean conv_is_ja_locale (void);
+
static void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
static void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf);
static void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf);
}
}
-CharSet conv_guess_ja_encoding(const gchar *str)
+static CharSet conv_guess_ja_encoding(const gchar *str)
{
const guchar *p = str;
CharSet guessed = C_US_ASCII;
return conv_iconv_strdup(inbuf, src_code, dest_code);
}
-CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
+static CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
const gchar *dest_charset_str)
{
CodeConvFunc code_conv = conv_noconv;
return GPOINTER_TO_UINT(g_hash_table_lookup(table, charset));
}
-CharSet conv_get_locale_charset(void)
+static CharSet conv_get_locale_charset(void)
{
static CharSet cur_charset = -1;
const gchar *cur_locale;
return codeset ? codeset : CS_INTERNAL;
}
-CharSet conv_get_internal_charset(void)
-{
- return C_INTERNAL;
-}
-
-const gchar *conv_get_internal_charset_str(void)
-{
- return CS_INTERNAL;
-}
-
-CharSet conv_get_outgoing_charset(void)
+static CharSet conv_get_outgoing_charset(void)
{
static CharSet out_charset = -1;
const gchar *cur_locale;
return str ? str : CS_UTF_8;
}
-gboolean conv_is_multibyte_encoding(CharSet encoding)
-{
- switch (encoding) {
- case C_EUC_JP:
- case C_EUC_JP_MS:
- case C_EUC_KR:
- case C_EUC_TW:
- case C_EUC_CN:
- case C_ISO_2022_JP:
- case C_ISO_2022_JP_2:
- case C_ISO_2022_JP_3:
- case C_ISO_2022_KR:
- case C_ISO_2022_CN:
- case C_SHIFT_JIS:
- case C_GB2312:
- case C_GBK:
- case C_BIG5:
- case C_UTF_8:
- case C_UTF_7:
- return TRUE;
- default:
- return FALSE;
- }
-}
-
const gchar *conv_get_current_locale(void)
{
const gchar *cur_locale;
return cur_locale;
}
-gboolean conv_is_ja_locale(void)
+static gboolean conv_is_ja_locale(void)
{
static gint is_ja_locale = -1;
const gchar *cur_locale;
#define C_INTERNAL C_UTF_8
#define CS_INTERNAL CS_UTF_8
-CharSet conv_guess_ja_encoding(const gchar *str);
void conv_utf8todisp (gchar *outbuf, gint outlen, const gchar *inbuf);
void conv_localetodisp (gchar *outbuf, gint outlen, const gchar *inbuf);
const gchar *src_code,
const gchar *dest_code);
-CodeConvFunc conv_get_code_conv_func (const gchar *src_charset_str,
- const gchar *dest_charset_str);
-
gchar *conv_iconv_strdup (const gchar *inbuf,
const gchar *src_code,
const gchar *dest_code);
const gchar *conv_get_charset_str (CharSet charset);
CharSet conv_get_charset_from_str (const gchar *charset);
-CharSet conv_get_locale_charset (void);
const gchar *conv_get_locale_charset_str (void);
const gchar *conv_get_locale_charset_str_no_utf8(void);
-CharSet conv_get_internal_charset (void);
-const gchar *conv_get_internal_charset_str (void);
-CharSet conv_get_outgoing_charset (void);
const gchar *conv_get_outgoing_charset_str (void);
-gboolean conv_is_multibyte_encoding (CharSet encoding);
const gchar *conv_get_current_locale (void);
-gboolean conv_is_ja_locale (void);
gchar *conv_unmime_header (const gchar *str,
const gchar *default_encoding);
ComposeMode mode,
gboolean batch);
+static void compose_entry_mark_default_to (Compose *compose,
+ const gchar *address);
+static Compose *compose_followup_and_reply_to (MsgInfo *msginfo,
+ gboolean quote,
+ gboolean to_all,
+ gboolean to_sender,
+ const gchar *body);
+static Compose *compose_forward_multiple (PrefsAccount *account,
+ GSList *msginfo_list);
+static Compose *compose_reply (MsgInfo *msginfo,
+ gboolean quote,
+ gboolean to_all,
+ gboolean to_ml,
+ gboolean to_sender,
+ const gchar *body);
+static Compose *compose_reply_mode (ComposeMode mode,
+ GSList *msginfo_list,
+ gchar *body);
+static void compose_template_apply_fields(Compose *compose, Template *tmpl);
+static void compose_update_privacy_systems_menu(Compose *compose);
+
static GtkWidget *compose_account_option_menu_create
(Compose *compose);
static void compose_set_out_encoding (Compose *compose);
}
}
-Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
+static Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
{
MsgInfo *msginfo;
guint list_len;
return compose;
}
-Compose *compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
+static Compose *compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
gboolean to_ml, gboolean to_sender,
const gchar *body)
{
to_sender, FALSE, body);
}
-Compose *compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
+static Compose *compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
gboolean to_all,
gboolean to_sender,
const gchar *body)
#undef INSERT_FW_HEADER
-Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
+static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
{
Compose *compose;
GtkTextView *textview;
}
}
-void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
+static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
static GdkColor yellow;
static GdkColor black;
action_update_compose_menu(ifactory, "/Tools/Actions", compose);
}
-void compose_update_privacy_systems_menu(Compose *compose)
+static void compose_update_privacy_systems_menu(Compose *compose)
{
static gchar *branch_path = "/Options/Privacy System";
GtkItemFactory *ifactory;
compose_changed_cb(NULL, compose);
}
-void compose_template_apply_fields(Compose *compose, Template *tmpl)
+static void compose_template_apply_fields(Compose *compose, Template *tmpl)
{
MsgInfo* dummyinfo = NULL;
MsgInfo *msginfo = NULL;
Compose *compose_new_with_list (PrefsAccount *account,
GList *listAddress);
-Compose *compose_reply_mode (ComposeMode mode,
- GSList *msginfo_list,
- gchar *body);
-/* remove */
-Compose *compose_followup_and_reply_to (MsgInfo *msginfo,
- gboolean quote,
- gboolean to_all,
- gboolean to_sender,
- const gchar *body);
-Compose *compose_reply (MsgInfo *msginfo,
- gboolean quote,
- gboolean to_all,
- gboolean to_ml,
- gboolean to_sender,
- const gchar *body);
Compose *compose_forward (PrefsAccount *account,
MsgInfo *msginfo,
gboolean as_attach,
const gchar *body,
gboolean no_extedit,
gboolean batch);
-Compose *compose_forward_multiple (PrefsAccount *account,
- GSList *msginfo_list);
-/* remove end */
Compose *compose_redirect (PrefsAccount *account,
MsgInfo *msginfo,
GList *compose_get_compose_list (void);
-void compose_template_apply_fields(Compose *compose, Template *tmpl);
-
void compose_entry_append (Compose *compose,
const gchar *address,
ComposeEntryType type);
-void compose_entry_mark_default_to (Compose *compose,
- const gchar *address);
gint compose_send (Compose *compose);
void compose_update_actions_menu (Compose *compose);
-void compose_update_privacy_systems_menu(Compose *compose);
void compose_reflect_prefs_all (void);
void compose_reflect_prefs_pixmap_theme (void);
libclawsetpan_la_SOURCES = \
etpan-thread-manager.c \
- etpan-log.c \
imap-thread.c
clawsetpanincludedir = $(pkgincludedir)/etpan
etpan-thread-manager-types.h \
etpan-thread-manager.h \
etpan-errors.h \
- etpan-log.h \
imap-thread.h
AM_CPPFLAGS = \
+++ /dev/null
-/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2007 DINH Viet Hoa and 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_LIBETPAN
-
-#include "etpan-log.h"
-
-#include <pthread.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <sys/time.h>
-#include <libetpan/libetpan.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define MAX_LOG_LINE 1024
-static pthread_mutex_t log_lock = PTHREAD_MUTEX_INITIALIZER;
-static char log_line[MAX_LOG_LINE];
-static chash * log_filter = NULL;
-
-static void etpan_str_log(void)
-{
- fprintf(stderr, "%s\n", log_line);
-}
-
-void etpan_log_init(void)
-{
- pthread_mutex_lock(&log_lock);
- if (log_filter == NULL) {
- char * env_value;
-
- env_value = getenv("ETPAN_LOG");
- if (env_value != NULL) {
- strncpy(log_line, env_value, sizeof(log_line));
- log_line[sizeof(log_line) - 1] = '\0';
- }
- else {
- * log_line = '\0';
- }
- env_value = log_line;
-
- log_filter = chash_new(CHASH_DEFAULTSIZE, CHASH_COPYKEY);
- if (log_filter != NULL) {
- chashdatum key;
- chashdatum value;
-
- key.data = "LOG";
- key.len = strlen("LOG");
- value.data = NULL;
- value.len = 0;
- chash_set(log_filter, &key, &value, NULL);
-
- while (env_value != NULL) {
- char * p;
-
- p = strchr(env_value, ' ');
- if (p != NULL) {
- * p = '\0';
- key.data = env_value;
- key.len = strlen(env_value);
- value.data = NULL;
- value.len = 0;
- chash_set(log_filter, &key, &value, NULL);
-
- env_value = p + 1;
- }
- else {
- key.data = env_value;
- key.len = strlen(env_value);
- value.data = NULL;
- value.len = 0;
- chash_set(log_filter, &key, &value, NULL);
-
- env_value = p;
- }
- }
- }
- }
- pthread_mutex_unlock(&log_lock);
-}
-
-void etpan_log_done(void)
-{
- pthread_mutex_lock(&log_lock);
- if (log_filter != NULL) {
- chash_free(log_filter);
- log_filter = NULL;
- }
- pthread_mutex_unlock(&log_lock);
-}
-
-void etpan_log(char * log_id, char * format, ...)
-{
- va_list argp;
- struct timeval time_info;
- int r;
- chashdatum key;
- chashdatum value;
-
- etpan_log_init();
-
- key.data = log_id;
- key.len = strlen(log_id);
- r = chash_get(log_filter, &key, &value);
- if (r < 0)
- return;
-
- r = gettimeofday(&time_info, NULL);
- if (r == 0) {
- fprintf(stderr, "%4lu.%03u [%s] ", time_info.tv_sec % 3600,
- (unsigned int) (time_info.tv_usec / 1000), log_id);
- }
-
- va_start(argp, format);
- pthread_mutex_lock(&log_lock);
- vsnprintf(log_line, sizeof(log_line), format, argp);
- etpan_str_log();
- pthread_mutex_unlock(&log_lock);
- va_end(argp);
-}
-
-#if defined(__APPLE__) && defined(__MACH__)
-#include <mach/vm_types.h>
-
-extern void thread_stack_pcs(vm_address_t *buffer,
- unsigned max, unsigned *num);
-
-void etpan_log_stack(void)
-{
- unsigned buffer[256];
- int num_frames;
- int i;
- char output[1024];
- char * current_output;
- size_t remaining;
-
- thread_stack_pcs(buffer, sizeof(buffer) / sizeof(buffer[0]), &num_frames);
- remaining = sizeof(output);
- current_output = output;
- for(i = 0 ; i < num_frames ; i ++) {
- size_t len;
-
- snprintf(current_output, remaining, "0x%x ", buffer[i]);
- len = strlen(current_output);
- remaining -= len;
- current_output += len;
- if (remaining == 0)
- break;
- }
- ETPAN_STACK_LOG(output);
-}
-#else
-#if defined(__linux__)
-#include <execinfo.h>
-
-extern char **backtrace_symbols (void *__const *__array, int __size) __THROW;
-
-void etpan_log_stack(void)
-{
- void * buffer[256];
- int num_frames;
- int i;
- char output[1024];
- char * current_output;
- size_t remaining;
-
- num_frames = backtrace(buffer, sizeof(buffer) / sizeof(buffer[0]));
- remaining = sizeof(output);
- current_output = output;
- for(i = 0 ; i < num_frames ; i ++) {
- size_t len;
-
- snprintf(current_output, remaining, "%p ", buffer[i]);
- len = strlen(current_output);
- remaining -= len;
- current_output += len;
- if (remaining == 0)
- break;
- }
- ETPAN_STACK_LOG(output);
-}
-
-#else
-
-void etpan_log_stack(void)
-{
- ETPAN_STACK_LOG("this feature not available");
-}
-
-#endif
-#endif
-#endif
+++ /dev/null
-/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2007 DINH Viet Hoa and 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef ETPAN_LOG_H
-
-#define ETPAN_LOG_H
-
-#define ENABLE_LOG
-
-#ifdef ENABLE_LOG
-
-/*
- an environment variable ETPAN_LOG must be set
- and will contains the log identifier separated with spaces.
-*/
-
-#define ETPAN_GTK_TREE_MODEL_LOG(...) ETPAN_LOG_ID("GTKTREEMODEL", __VA_ARGS__)
-#define ETPAN_TABBED_LOG(...) ETPAN_LOG_ID("TABBED", __VA_ARGS__)
-#define ETPAN_MSGVIEW_LOG(...) ETPAN_LOG_ID("MSGVIEW", __VA_ARGS__)
-#define ETPAN_MSGLIST_LOG(...) ETPAN_LOG_ID("MSGLIST", __VA_ARGS__)
-#define ETPAN_FOLDERLIST_LOG(...) ETPAN_LOG_ID("FOLDERLIST", __VA_ARGS__)
-#define ETPAN_MAINWINDOW_LOG(...) ETPAN_LOG_ID("MAINWINDOW", __VA_ARGS__)
-#define ETPAN_SIGNAL_LOG(...) ETPAN_LOG_ID("SIGNAL", __VA_ARGS__)
-#define ETPAN_MEM_LOG(...) ETPAN_LOG_ID("MEM", __VA_ARGS__)
-#define ETPAN_UI_LOG(...) ETPAN_LOG_ID("UI", __VA_ARGS__)
-#define ETPAN_PROGRESS_LOG(...) ETPAN_LOG_ID("PROGRESS", __VA_ARGS__)
-#define ETPAN_DEBUG_LOG(...) ETPAN_LOG_ID("DEBUG", __VA_ARGS__)
-#define ETPAN_STACK_LOG(...) ETPAN_LOG_ID("STACK", __VA_ARGS__)
-#define ETPAN_LOG(...) ETPAN_LOG_ID("LOG", __VA_ARGS__)
-
-#else
-
-#define ETPAN_GTK_TREE_MODEL_LOG(...)
-#define ETPAN_TABBED_LOG(...)
-#define ETPAN_MSGVIEW_LOG(...)
-#define ETPAN_MSGLIST_LOG(...)
-#define ETPAN_FOLDERLIST_LOG(...)
-#define ETPAN_MAINWINDOW_LOG(...)
-#define ETPAN_SIGNAL_LOG(...)
-#define ETPAN_MEM_LOG(...)
-#define ETPAN_UI_LOG(...)
-#define ETPAN_PROGRESS_LOG(...)
-#define ETPAN_DEBUG_LOG(...)
-#define ETPAN_STACK_LOG(...)
-#define ETPAN_LOG(...) ETPAN_LOG_ID("LOG", __VA_ARGS__)
-
-#endif
-
-#define ETPAN_LOG_ID(...) etpan_log(__VA_ARGS__)
-
-void etpan_log_init(void);
-void etpan_log_done(void);
-void etpan_log(char * log_id, char * format, ...);
-
-void etpan_log_stack(void);
-
-#endif
return default_colors[color_index];
}
-gchar *colorlabel_get_color_text(gint color_index)
-{
- G_RETURN_VAL_IF_INVALID_COLOR(color_index, NULL);
-
- colorlabel_recreate_label(color_index);
- return label_colors[0][color_index].label;
-}
-
gchar *colorlabel_get_color_default_text(gint color_index)
{
G_RETURN_VAL_IF_INVALID_COLOR(color_index, NULL);
return widget;
}
-/* XXX: this function to check if menus with colors and labels should
- * be recreated */
-gboolean colorlabel_changed(void)
-{
- gint n;
-
- for (n = 0; n < LABEL_COLORS_ELEMS; n++) {
- if (label_colors[0][n].changed)
- return TRUE;
- }
-
- return FALSE;
-}
-
/* XXX: colorlabel_recreate_XXX are there to make sure everything
* is initialized ok, without having to call a global _xxx_init_
* function */
gint colorlabel_get_color_count (void);
GdkColor colorlabel_get_color (gint color_index);
GdkColor colorlabel_get_default_color (gint color_index);
-gchar *colorlabel_get_color_text (gint color_index);
gchar *colorlabel_get_color_default_text (gint color_index);
GtkImage *colorlabel_create_color_pixmap (GdkColor color);
-gboolean colorlabel_changed (void);
GtkWidget *colorlabel_create_check_color_menu_item
(gint color_index,
gboolean force,
static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert);
static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCertificate *new_cert);
-GtkWidget *cert_presenter(SSLCertificate *cert)
+static GtkWidget *cert_presenter(SSLCertificate *cert)
{
GtkWidget *vbox = NULL;
GtkWidget *hbox = NULL;
#include <gtk/gtk.h>
#include "ssl_certificate.h"
-GtkWidget *cert_presenter(SSLCertificate *cert);
void sslcertwindow_show_cert(SSLCertificate *cert);
void sslcertwindow_register_hook(void);