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

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 4b9b7f4a08a2577aa1cef17d39f89cfdb06a64b6..4c7929c5699150671ca0b40d756974201fd5ebf0 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,27 @@
+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

diff --git a/PATCHSETS b/PATCHSETS
index a3d02cc09b235f5f6ac8da1810e68f51c4940ca8..0ce36f9ddefd18ed3dbd745df07f6cabfac7b1e4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -721,3 +721,4 @@
 ( 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

diff --git a/commitHelper b/commitHelper
index 04ed44d8e21a9772f5dfa8618b1ada889959a6f0..667bc60f619463f6ae6beb1d19852f6a06dc14ce 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -54,6 +54,9 @@ fi;
 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

diff --git a/configure.ac b/configure.ac
index 0ac11cbf8f18c2f3243b5f372e819eef2012d6b8..93c1a283ae0b9cd91940e7793a455e3d74f4fac1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrcache.c b/src/addrcache.c
index 9efede68168503b3812f0470d2ffcb19ae318280..8807839defb8a9a55a5de1456c2cff47bf97540a 100644 (file)
--- a/src/addrcache.c
+++ b/src/addrcache.c
@@ -183,9 +183,7 @@ static gint addrcache_free_item_vis( gpointer key, gpointer value, gpointer data
 */
 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 );
 }
 
 /*

diff --git a/src/addrharvest.c b/src/addrharvest.c
index b8cd636ecae11f4fe49043e794e9ebd4bd50d255..f99a14718eaa9e11aa6051929d0556887a1ce602 100644 (file)
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -113,9 +113,7 @@ static void addrharvest_free_table( AddressHarvester* harvester ) {
        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;
 }

diff --git a/src/addrindex.c b/src/addrindex.c
index cc83719ab5ddeeb24dab5c0a833eb9d79b9677b1..d20d584d967eb6516a4dfe6e8ec1f574ae858266 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -579,9 +579,7 @@ static gboolean addrindex_free_cache_cb( gpointer key, gpointer value, gpointer
  * 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 );
 }
 

diff --git a/src/compose.c b/src/compose.c
index 7cfcddac29ca34ab72cd7ed5797fd6721eb0ce25..be05d87f9493ca3d00c37ef4201ae6a5d05642a5 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4992,7 +4992,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        }
 
        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;

diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index 3b4930bdd918e6933281bc2abcc134f471788646..d31637a27b94ccff7625ce6467e076ba12c411be 100644 (file)
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -429,7 +429,7 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
                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);
                }

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 7861ae16b3009717f3b7c27da4f929b6f2eaf38b..9c34a3945be3ff30df4818347ef3c2c537c37a8d 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -132,7 +132,7 @@ static void about_create(void)
        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);

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index d20f08192d11d3daa05ea611bede6187e31c27d9..45f62817ee3930c2792b04d9488af7994882cca8 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -109,7 +109,7 @@ void log_window_init(LogWindow *logwin)
        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++) {

diff --git a/src/main.c b/src/main.c
index 68aaceef850ff56dc394e343e73849dd5c971e65..904de9e44cb12a7cb76de433c776c290cde880da 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
        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())

diff --git a/src/mainwindow.c b/src/mainwindow.c
index bdad4c82382e54a650123ee4fbc2f5b02f89b909..a4e263498f9a93bd68ceba9cf9724d8eedd1d0b3 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1038,7 +1038,7 @@ MainWindow *main_window_create(SeparateType type)
        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)

diff --git a/src/msgcache.c b/src/msgcache.c
index 2bb0a8793286e1b5ad2f799c30397da4e31578a2..f0d8a79b99046d938e7151f23808083e58db6773 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -486,8 +486,6 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
        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)
@@ -539,8 +537,6 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
                        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)

diff --git a/src/mutt.c b/src/mutt.c
index 0c8f19230698703dfba30198723c5cb61ca5f619..cac872d02d1983f8be4f0881e95272107e798451 100644 (file)
--- a/src/mutt.c
+++ b/src/mutt.c
@@ -93,9 +93,7 @@ void mutt_free( MuttFile *muttFile ) {
        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 */

diff --git a/src/pine.c b/src/pine.c
index bfb83976948841ef9eb87c8f74e51aeb157ac0bc..67003b8661bf499491c3ec0bbfbc581572e4dc10 100644 (file)
--- a/src/pine.c
+++ b/src/pine.c
@@ -96,9 +96,7 @@ void pine_free( PineFile *pineFile ) {
        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 */

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 2ef3ede788852123ad6995c9c181ab1c443beb55..d1d46153df1edfb220ae90a99b712b9fd0363927 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -168,6 +168,8 @@ set_row (GtkCList *clist, gpgme_key_t key)
     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 */
@@ -184,9 +186,17 @@ set_row (GtkCList *clist, gpgme_key_t key)
     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)

diff --git a/src/prefs_account.c b/src/prefs_account.c
index b9cc961e16a7fdbeac204f646048647f75d1e398..139a8d766977a1bd2f71c51f7134c9bc884e0f45 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -795,7 +795,7 @@ static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_da
 
        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);
 }
 

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index dc7fc965c569849f13d4c2e2b3ad5dcf3932f2b4..cd25bd5b3a724ba5341340443cf1536220a51a1f 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -856,7 +856,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        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);

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 95d187ebf2049bf1d760db0f1fe03cead7d69436..4524d10caf74aa8e006422e0bbeab6f4d6b43d6d 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -604,7 +604,7 @@ static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventE
                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;
 }

diff --git a/src/summaryview.c b/src/summaryview.c
index 40b8854e8e1b9afb564a02e067296423b3efc8af..26aa817ebd925c760992be83e7bee9f954a9d399 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5091,7 +5091,7 @@ static void news_flag_crosspost(MsgInfo *msginfo)
 
        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)) {