commit 6fb5f07633f32c90fbae6cd293b11a13575c116a
parent ed5c77c3e4374c820e3574b30d0fa6d948cabe5a
Author: Colin Leroy <colin@colino.net>
Date: Sat, 20 Sep 2008 08:19:51 +0000
2008-09-20 [colin] 3.5.0cvs118
* src/autofaces.c
* src/compose.c
* src/ldapquery.c
* src/main.c
* src/news.c
* src/common/socket.c
* src/gtk/gtkutils.c
* src/plugins/pgpcore/claws.def
Windows: more fixes, thanks to wwp and
Marcus Brinkmann
Diffstat:
11 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-20 [colin] 3.5.0cvs118
+
+ * src/autofaces.c
+ * src/compose.c
+ * src/ldapquery.c
+ * src/main.c
+ * src/news.c
+ * src/common/socket.c
+ * src/gtk/gtkutils.c
+ * src/plugins/pgpcore/claws.def
+ Windows: more fixes, thanks to wwp and
+ Marcus Brinkmann
+
2008-09-20 [colin] 3.5.0cvs117
* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3529,3 +3529,4 @@
( cvs diff -u -r 1.36.2.146 -r 1.36.2.147 src/common/utils.c; ) > 3.5.0cvs115.patchset
( cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.104 -r 1.1.4.105 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/etpan/nntp-thread.c; ) > 3.5.0cvs116.patchset
( cvs diff -u -r 1.179.2.228 -r 1.179.2.229 src/imap.c; ) > 3.5.0cvs117.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/autofaces.c; cvs diff -u -r 1.382.2.477 -r 1.382.2.478 src/compose.c; cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/ldapquery.c; cvs diff -u -r 1.115.2.205 -r 1.115.2.206 src/main.c; cvs diff -u -r 1.101.2.54 -r 1.101.2.55 src/news.c; cvs diff -u -r 1.13.2.38 -r 1.13.2.39 src/common/socket.c; cvs diff -u -r 1.5.2.83 -r 1.5.2.84 src/gtk/gtkutils.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/claws.def; ) > 3.5.0cvs118.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=117
+EXTRA_VERSION=118
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/autofaces.c b/src/autofaces.c
@@ -36,7 +36,7 @@ gint get_content_for_any_face(gchar *buf, gint len, gchar *anyname, gint maxlen)
xfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, AUTOFACES_DIR,
G_DIR_SEPARATOR_S, anyname, NULL);
buf[0] = '\0';
- if ((xfp = fopen(xfile, "rb")) == NULL) {
+ if ((xfp = g_fopen(xfile, "rb")) == NULL) {
g_free(xfile);
debug_print("header content file '%s' not found\n", anyname);
return -1;
diff --git a/src/common/socket.c b/src/common/socket.c
@@ -759,7 +759,11 @@ static gboolean sock_connect_async_cb(GIOChannel *source,
sockinfo = g_new0(SockInfo, 1);
sockinfo->sock = fd;
+#ifndef G_OS_WIN32
sockinfo->sock_ch = g_io_channel_unix_new(fd);
+#else
+ sockinfo->sock_ch = g_io_channel_win32_new_socket(fd);
+#endif
sockinfo->hostname = g_strdup(conn_data->hostname);
sockinfo->port = conn_data->port;
sockinfo->state = CONN_ESTABLISHED;
@@ -900,7 +904,11 @@ static gint sock_connect_address_list_async(SockConnectData *conn_data)
conn_data->cur_addr = conn_data->cur_addr->next;
+#ifndef G_OS_WIN32
conn_data->channel = g_io_channel_unix_new(sock);
+#else
+ conn_data->channel = g_io_channel_win32_new_socket(sock);
+#endif
conn_data->io_tag = g_io_add_watch(conn_data->channel, G_IO_IN|G_IO_OUT,
sock_connect_async_cb, conn_data);
@@ -1222,7 +1230,11 @@ static SockLookupData *sock_get_address_info_async(const gchar *hostname,
lookup_data->pipe_fds[1] = -1;
#endif /*!G_OS_WIN32 */
+#ifndef G_OS_WIN32
lookup_data->channel = g_io_channel_unix_new(lookup_data->pipe_fds[0]);
+#else
+ lookup_data->channel = g_io_channel_win32_new_fd(lookup_data->pipe_fds[0]);
+#endif
lookup_data->io_tag = g_io_add_watch(lookup_data->channel, G_IO_IN,
sock_get_address_info_async_cb,
lookup_data);
@@ -1272,7 +1284,11 @@ static SockInfo *sockinfo_from_fd(const gchar *hostname,
sockinfo = g_new0(SockInfo, 1);
sockinfo->sock = sock;
+#ifndef G_OS_WIN32
sockinfo->sock_ch = g_io_channel_unix_new(sock);
+#else
+ sockinfo->sock_ch = g_io_channel_win32_new_socket(sock);
+#endif
sockinfo->hostname = g_strdup(hostname);
sockinfo->port = port;
sockinfo->state = CONN_ESTABLISHED;
diff --git a/src/compose.c b/src/compose.c
@@ -8402,7 +8402,11 @@ static void compose_exec_ext_editor(Compose *compose)
compose_set_ext_editor_sensitive(compose, FALSE);
+#ifndef G_OS_WIN32
compose->exteditor_ch = g_io_channel_unix_new(pipe_fds[0]);
+#else
+ compose->exteditor_ch = g_io_channel_win32_new_fd(pipe_fds[0]);
+#endif
compose->exteditor_tag = g_io_add_watch(compose->exteditor_ch,
G_IO_IN,
compose_input_cb,
@@ -8850,7 +8854,7 @@ static void compose_register_draft(MsgInfo *info)
{
gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
DRAFTED_AT_EXIT, NULL);
- FILE *fp = fopen(filepath, "ab");
+ FILE *fp = g_fopen(filepath, "ab");
if (fp) {
fprintf(fp, "%s\t%d\n", folder_item_get_identifier(info->folder),
@@ -9097,7 +9101,7 @@ void compose_reopen_exit_drafts(void)
{
gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
DRAFTED_AT_EXIT, NULL);
- FILE *fp = fopen(filepath, "rb");
+ FILE *fp = g_fopen(filepath, "rb");
gchar buf[1024];
if (fp) {
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -1613,7 +1613,6 @@ GtkUIManager *gtkut_ui_manager(void)
return gui_manager;
}
-#ifdef G_OS_UNIX
#define READ_CONDITION (G_IO_IN | G_IO_HUP | G_IO_ERR)
#define WRITE_CONDITION (G_IO_OUT | G_IO_ERR)
#define EXCEPTION_CONDITION (G_IO_PRI)
@@ -1682,7 +1681,11 @@ claws_input_add (gint source,
if (condition & GDK_INPUT_EXCEPTION)
cond |= EXCEPTION_CONDITION;
+#ifndef G_OS_WIN32
channel = g_io_channel_unix_new (source);
+#else
+ channel = g_io_channel_win32_new_fd(source);
+#endif
result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond,
claws_io_invoke,
closure, claws_io_destroy);
@@ -1690,5 +1693,3 @@ claws_input_add (gint source,
return result;
}
-
-#endif
diff --git a/src/ldapquery.c b/src/ldapquery.c
@@ -421,7 +421,7 @@ static GSList *ldapqry_add_single_value( LDAP *ld, LDAPMessage *entry, char *att
list = g_slist_append( list, g_strndup( vals[0]->bv_val, vals[0]->bv_len ));
} else {
char *file = get_tmp_file();
- FILE *fp = fopen(file, "wb");
+ FILE *fp = g_fopen(file, "wb");
if (fp) {
fwrite(vals[0]->bv_val, 1, vals[0]->bv_len, fp);
fclose(fp);
diff --git a/src/main.c b/src/main.c
@@ -802,7 +802,7 @@ static void win32_open_log(void)
if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
FILE_OP_ERROR("claws-win32.log", "rename");
}
- win32_debug_fp = fopen("claws-win32.log", "w");
+ win32_debug_fp = g_fopen("claws-win32.log", "w");
if (win32_debug_fp)
{
g_set_print_handler(win32_print_stdout);
diff --git a/src/news.c b/src/news.c
@@ -550,7 +550,7 @@ GSList *news_get_group_list(Folder *folder)
gint ok;
clist *grouplist = NULL;
clistiter *cur;
- fp = fopen(filename, "wb");
+ fp = g_fopen(filename, "wb");
if (!fp) {
g_free(filename);
diff --git a/src/plugins/pgpcore/claws.def b/src/plugins/pgpcore/claws.def
@@ -12,6 +12,30 @@ debug_srcname
extract_address
get_rc_dir
get_tmp_file
+gtk_cmclist_append
+gtk_cmclist_clear
+gtk_cmclist_get_row_data
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_get_type
+gtk_cmclist_new_with_titles
+gtk_cmclist_set_column_width
+gtk_cmclist_set_column_width
+gtk_cmclist_set_column_width
+gtk_cmclist_set_column_width
+gtk_cmclist_set_column_width
+gtk_cmclist_set_compare_func
+gtk_cmclist_set_compare_func
+gtk_cmclist_set_row_data_full
+gtk_cmclist_set_selection_mode
+gtk_cmclist_set_sort_type
+gtk_cmclist_sort
gtkut_get_options_frame
gtkut_stock_button_set_create
gtkut_window_new
