From: Paul Mangan Date: Thu, 17 Feb 2005 08:09:56 +0000 (+0000) Subject: 2005-02-17 [paul] 1.0.1cvs11.4 X-Git-Tag: rel_1_9_6~34 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=cd7e5c7c81bdd9ef279a2c305d2beef2fa72297e 2005-02-17 [paul] 1.0.1cvs11.4 * src/compose.c * src/exportldif.c * src/matcher_parser_parse.y * src/procmime.c * src/sourcewindow.c * src/common/Makefile.am * src/common/intl.h ** REMOVED ** * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c sync with main (revision 109) and clean up --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index f4c084a32..49ead6e25 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,16 @@ +2005-02-17 [paul] 1.0.1cvs11.4 + + * src/compose.c + * src/exportldif.c + * src/matcher_parser_parse.y + * src/procmime.c + * src/sourcewindow.c + * src/common/Makefile.am + * src/common/intl.h ** REMOVED ** + * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c + sync with main (revision 109) + and clean up + 2005-02-16 [colin] 1.0.1cvs11.3 * src/summaryview.c diff --git a/PATCHSETS b/PATCHSETS index 7c105ba41..aa1557977 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -385,3 +385,4 @@ ( cvs diff -u -r 1.79.2.8 -r 1.79.2.9 src/mh.c; ) > 1.0.1cvs11.1.patchset ( cvs diff -u -r 1.94.2.45 -r 1.94.2.46 src/messageview.c; ) > 1.0.1cvs11.2.patchset ( cvs diff -u -r 1.395.2.52 -r 1.395.2.53 src/summaryview.c; cvs diff -u -r 1.3.2.17 -r 1.3.2.18 src/prefs_themes.c; ) > 1.0.1cvs11.3.patchset +( cvs diff -u -r 1.382.2.102 -r 1.382.2.103 src/compose.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/exportldif.c; cvs diff -u -r 1.25.2.7 -r 1.25.2.8 src/matcher_parser_parse.y; cvs diff -u -r 1.49.2.34 -r 1.49.2.35 src/procmime.c; cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/sourcewindow.c; cvs diff -u -r 1.24.2.5 -r 1.24.2.6 src/common/Makefile.am; cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/common/intl.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; ) > 1.0.1cvs11.4.patchset diff --git a/configure.ac b/configure.ac index d8d57538b..912373696 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=11 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.3 +EXTRA_GTK2_VERSION=.4 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/common/Makefile.am b/src/common/Makefile.am index b8c93f475..8c36e6e4c 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -31,7 +31,6 @@ sylpheedcommoninclude_HEADERS = \ base64.h \ defs.h \ hooks.h \ - intl.h \ log.h \ md5.h \ mgutils.h \ diff --git a/src/common/intl.h b/src/common/intl.h deleted file mode 100644 index 7faa1d8c4..000000000 --- a/src/common/intl.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef __INTL_H__ -#define __INTL_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef ENABLE_NLS -# include -# ifndef TEXTDOMAIN -# define _(String) gettext(String) -# else -# define _(String) dgettext(TEXTDOMAIN, String) -# endif /* TEXTDOMAIN */ -# ifdef gettext_noop -# define N_(String) gettext_noop(String) -# else -# define N_(String) (String) -# endif /* gettext_noop */ -# ifndef HAVE_BIND_TEXTDOMAIN_CODESET -# define bind_textdomain_codeset(Domain, Codeset) (Codeset) -# endif /* HAVE_BIND_TEXTDOMAIN_CODESET */ -#else -# define _(String) (String) -# define N_(String) (String) -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,String) (String) -# define dcgettext(Domain,String,Type) (String) -# define bindtextdomain(Domain,Directory) (Domain) -# define bind_textdomain_codeset(Domain, Codeset) (Codeset) -#endif /* ENABLE_NLS */ - -#endif /* __INTL_H__ */ diff --git a/src/compose.c b/src/compose.c index 07a9a15a8..fde2a2bf7 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4928,7 +4928,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) /* text widget */ scrolledwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), GTK_SHADOW_IN); gtk_box_pack_start(GTK_BOX(edit_vbox), scrolledwin, TRUE, TRUE, 0); diff --git a/src/exportldif.c b/src/exportldif.c index c2c1e4df8..805be08fb 100644 --- a/src/exportldif.c +++ b/src/exportldif.c @@ -27,8 +27,8 @@ #include #include #include +#include -#include "intl.h" #include "mgutils.h" #include "utils.h" #include "exportldif.h" diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y index 7fc74f6d4..abe5b2ab1 100644 --- a/src/matcher_parser_parse.y +++ b/src/matcher_parser_parse.y @@ -23,8 +23,8 @@ #include "defs.h" #include +#include -#include "intl.h" #include "utils.h" #include "filtering.h" #include "matcher.h" diff --git a/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c b/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c index 94cf90f8a..cacbfe155 100644 --- a/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c +++ b/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c @@ -21,7 +21,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "intl.h" + +#include +#include #include #include "eggtrayicon.h" diff --git a/src/procmime.c b/src/procmime.c index 306789329..6add501f8 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -890,8 +890,9 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo) basetmp = procmime_mimeinfo_get_parameter(mimeinfo, "name"); if (basetmp == NULL) basetmp = "mimetmp"; - base = g_path_get_basename(basetmp); - if (*base == '\0') base = g_strdup("mimetmp"); + basetmp = g_path_get_basename(basetmp); + if (*basetmp == '\0') basetmp = g_strdup("mimetmp"); + base = conv_filename_from_utf8(basetmp); subst_for_shellsafe_filename(base); } @@ -899,6 +900,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo) f_prefix, base, NULL); g_free(base); + return filename; } diff --git a/src/sourcewindow.c b/src/sourcewindow.c index 53730bada..d1328c883 100644 --- a/src/sourcewindow.c +++ b/src/sourcewindow.c @@ -86,7 +86,8 @@ SourceWindow *source_window_create(void) scrolledwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(window), scrolledwin);