+2005-08-18 [martin] 1.9.13cvs36
+
+ * commitHelper
+ added my login
+ * src/addrcache.c
+ * src/addrharvest.c
+ * src/addrindex.c
+ * src/compose.c
+ * src/grouplistdialog.c
+ * src/main.c
+ * src/mainwindow.c
+ * src/msgcache.c
+ * src/mutt.c
+ * src/pine.c
+ * src/prefs_account.c
+ * src/prefs_themes.c
+ * src/stock_pixmap.c
+ * src/summaryview.c
+ * src/gtk/about.c
+ * src/gtk/logwindow.c
+ removed deprecated glib and gdk stuff
+ * src/plugins/pgpcore/select-keys.c
+ convert attributes from locale to utf8
+
2005-08-17 [paul] 1.9.13cvs35
* src/account.c
( cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/etpan/imap-thread.c; ) > 1.9.13cvs33.patchset
( cvs diff -u -r 1.60.2.24 -r 1.60.2.25 src/addressbook.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/addressitem.h; cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/editaddress.c; cvs diff -u -r 1.207.2.56 -r 1.207.2.57 src/folderview.c; cvs diff -u -r 1.395.2.110 -r 1.395.2.111 src/summaryview.c; cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/progressdialog.c; ) > 1.9.13cvs34.patchset
( cvs diff -u -r 1.61.2.35 -r 1.61.2.36 src/account.c; cvs diff -u -r 1.60.2.25 -r 1.60.2.26 src/addressbook.c; cvs diff -u -r 1.395.2.111 -r 1.395.2.112 src/summaryview.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/gtk/gtksctree.h; ) > 1.9.13cvs35.patchset
+( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 commitHelper; cvs diff -u -r 1.15.2.2 -r 1.15.2.3 src/addrcache.c; cvs diff -u -r 1.6.10.6 -r 1.6.10.7 src/addrharvest.c; cvs diff -u -r 1.28.2.6 -r 1.28.2.7 src/addrindex.c; cvs diff -u -r 1.382.2.149 -r 1.382.2.150 src/compose.c; cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/grouplistdialog.c; cvs diff -u -r 1.115.2.48 -r 1.115.2.49 src/main.c; cvs diff -u -r 1.274.2.55 -r 1.274.2.56 src/mainwindow.c; cvs diff -u -r 1.16.2.24 -r 1.16.2.25 src/msgcache.c; cvs diff -u -r 1.6.10.1 -r 1.6.10.2 src/mutt.c; cvs diff -u -r 1.6.2.1 -r 1.6.2.2 src/pine.c; cvs diff -u -r 1.105.2.30 -r 1.105.2.31 src/prefs_account.c; cvs diff -u -r 1.3.2.22 -r 1.3.2.23 src/prefs_themes.c; cvs diff -u -r 1.25.2.15 -r 1.25.2.16 src/stock_pixmap.c; cvs diff -u -r 1.395.2.112 -r 1.395.2.113 src/summaryview.c; cvs diff -u -r 1.4.2.15 -r 1.4.2.16 src/gtk/about.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/logwindow.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/select-keys.c; ) > 1.9.13cvs36.patchset
if [ "$name" == "f" -o "$name" == "darkok" ]; then
name="darko";
fi;
+if [ "$name" == "msp" ]; then
+ name="martin";
+fi;
log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
for line in $files; do
MICRO_VERSION=13
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
*/
static void addrcache_free_item_hash( GHashTable *table ) {
g_return_if_fail( table != NULL );
- g_hash_table_freeze( table );
g_hash_table_foreach_remove( table, addrcache_free_item_vis, NULL );
- g_hash_table_thaw( table );
}
/*
harvester->headerTable = NULL;
/* Free duplicate table */
- g_hash_table_freeze( harvester->dupTable );
g_hash_table_foreach_remove( harvester->dupTable, addrharvest_free_table_vis, NULL );
- g_hash_table_thaw( harvester->dupTable );
g_hash_table_destroy( harvester->dupTable );
harvester->dupTable = NULL;
}
* Free hash table of address cache items.
*/
static void addrindex_free_cache_hash( GHashTable *table ) {
- g_hash_table_freeze( table );
g_hash_table_foreach_remove( table, addrindex_free_cache_cb, NULL );
- g_hash_table_thaw( table );
g_hash_table_destroy( table );
}
}
color[0] = quote_color;
- cmap = gdk_window_get_colormap(window->window);
+ cmap = gdk_drawable_get_colormap(window->window);
gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success);
if (success[0] == FALSE) {
GtkStyle *style;
if (g_pattern_match_string(pspec, ginfo->name)) {
node = grouplist_create_branch(ginfo, pattern);
if (g_slist_find_custom(subscribed, ginfo->name,
- (GCompareFunc)g_strcasecmp)
+ (GCompareFunc)g_ascii_strcasecmp)
!= NULL)
gtk_ctree_select(GTK_CTREE(ctree), node);
}
for (i = 1; i <= strlen(HOMEPAGE_URI); i++) buf[i] = '_';
strcpy(buf + i, " ");
gtk_label_set_pattern(GTK_LABEL(GTK_BIN(button)->child), buf);
- cmap = gdk_window_get_colormap(window->window);
+ cmap = gdk_drawable_get_colormap(window->window);
gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
if (success[0] == TRUE && success[1] == TRUE) {
gtk_widget_ensure_style(GTK_BIN(button)->child);
logwin->warn_color = color[1];
logwin->error_color = color[2];
- colormap = gdk_window_get_colormap(logwin->window->window);
+ colormap = gdk_drawable_get_colormap(logwin->window->window);
gdk_colormap_alloc_colors(colormap, color, 3, FALSE, TRUE, success);
for (i = 0; i < 3; i++) {
gtk_init(&argc, &argv);
gdk_rgb_init();
- gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+ gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
gtk_widget_set_default_visual(gdk_rgb_get_visual());
if (!g_thread_supported())
color[2] = folderview->color_new;
color[3] = folderview->color_op;
- colormap = gdk_window_get_colormap(window->window);
+ colormap = gdk_drawable_get_colormap(window->window);
gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
for (i = 0; i < 4; i++) {
if (success[i] == FALSE)
g_free(srccharset);
cache = msgcache_new();
- g_hash_table_freeze(cache->msgnum_table);
- g_hash_table_freeze(cache->msgid_table);
while (fread(&num, sizeof(num), 1, fp) == 1) {
if (swapping)
g_hash_table_insert(cache->msgid_table, msginfo->msgid, msginfo);
}
fclose(fp);
- g_hash_table_thaw(cache->msgnum_table);
- g_hash_table_thaw(cache->msgid_table);
if (conv != NULL) {
if (conv->free != NULL)
g_free( muttFile->path );
/* Free unique address table */
- g_hash_table_freeze( muttFile->uniqTable );
g_hash_table_foreach_remove( muttFile->uniqTable, mutt_free_table_vis, NULL );
- g_hash_table_thaw( muttFile->uniqTable );
g_hash_table_destroy( muttFile->uniqTable );
/* Clear pointers */
g_free( pineFile->path );
/* Free unique address table */
- g_hash_table_freeze( pineFile->uniqTable );
g_hash_table_foreach_remove( pineFile->uniqTable, pine_free_table_vis, NULL );
- g_hash_table_thaw( pineFile->uniqTable );
g_hash_table_destroy( pineFile->uniqTable );
/* Clear pointers */
const char *text[N_COL_TITLES];
char *algo_buf;
int row;
+ gssize by_read = 0, by_written = 0;
+ gchar *ret_str;
/* first check whether the key is capable of encryption which is not
* the case for revoked, expired or sign-only keys */
text[COL_KEYID] = s;
s = key->uids->name;
+ ret_str = g_locale_to_utf8 (s, strlen(s), &by_read, &by_written, NULL);
+ if (ret_str && by_written) {
+ s = ret_str;
+ }
text[COL_NAME] = s;
s = key->uids->email;
+ ret_str = g_locale_to_utf8 (s, strlen(s), &by_read, &by_written, NULL);
+ if (ret_str && by_written) {
+ s = ret_str;
+ }
text[COL_EMAIL] = s;
switch (key->uids->validity)
encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
base64_encode(encvalue, (gchar *) value, strlen(value));
- g_string_sprintfa(str, "%s=%s", (gchar *) key, encvalue);
+ g_string_append_printf(str, "%s=%s", (gchar *) key, encvalue);
g_free(encvalue);
}
for (i = 0; buf[i] != '\0'; buf[i++] = '_');
gtk_label_set_pattern(GTK_LABEL(GTK_BIN(btn_more)->child), buf);
g_free(buf);
- cmap = gdk_window_get_colormap((mainwindow_get_mainwindow())->window->window);
+ cmap = gdk_drawable_get_colormap((mainwindow_get_mainwindow())->window->window);
gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
if (success[0] == TRUE && success[1] == TRUE) {
gtk_widget_ensure_style(GTK_BIN(btn_more)->child);
gdk_draw_rectangle(drawable, gc_pix, TRUE, left, top,
data->overlay_width, data->overlay_height);
}
- gdk_gc_destroy(gc_pix);
+ g_object_unref(gc_pix);
return TRUE;
}
if (mff->account->mark_crosspost_read) {
line = g_string_sized_new(128);
- g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
+ g_string_printf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
debug_print("nfcp: checking <%s>", line->str);
if (mff->newsart &&
g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {