--- ./KeyRing/keyring.c	2005-12-30 22:01:08 +0300

+++ ./KeyRing/keyring.c	2006-03-12 11:17:14 +0300

@@ -1344,7 +1344,9 @@

    int i, count;

    char all[]=N_("All");

    char *categories[18];

-     

+   int  len;

+   char *temp_str;

+

    jp_logf(JP_LOG_DEBUG, "KeyRing: make_menus\n");

    /* This gets the application specific data out of the database for us.

@@ -1369,8 +1371,11 @@

       if (ai.name[i][0]=='\0') {

 	 continue;

       }

-      jp_charset_p2j(ai.name[i], 16);

       categories[count+1]=ai.name[i];

+      temp_str = malloc((len = strlen(categories[count+1])*2+1));

+      multibyte_safe_strncpy(temp_str, categories[count+1], len);

+      jp_charset_p2j(temp_str, len);

+      categories[count+1]=temp_str;

       glob_category_number_from_menu_item[count++]=i;

    }

    categories[count+1]=NULL;