/[winpt]/trunk/Src/wptFileManager.cpp
ViewVC logotype

Diff of /trunk/Src/wptFileManager.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 172 by twoaday, Mon Jan 30 13:47:35 2006 UTC revision 177 by twoaday, Tue Feb 14 15:46:29 2006 UTC
# Line 921  fm_parse_files (listview_ctrl_t lv, HWND Line 921  fm_parse_files (listview_ctrl_t lv, HWND
921          fm_encrypt_into_zip (ctx, lv);          fm_encrypt_into_zip (ctx, lv);
922    
923      for (i = 0; i < listview_count_items (lv, 0); i++) {      for (i = 0; i < listview_count_items (lv, 0); i++) {
924          if( !listview_get_item_state( lv, i ) )          if (!listview_get_item_state (lv, i))
925              continue;              continue;
926          listview_get_item_text(lv, i, 1, fname, sizeof (fname) - 1);          listview_get_item_text (lv, i, 1, fname, sizeof (fname) - 1);
927          if( file_exist_check (fname) && !is_directory (fname)) {          if( file_exist_check (fname) && !is_directory (fname)) {
928              log_box (_("File Manager"), MB_ERR,              log_box (_("File Manager"), MB_ERR,
929                       _("\"%s\" does not exist"), fname);                       _("\"%s\" does not exist"), fname);
# Line 942  fm_parse_files (listview_ctrl_t lv, HWND Line 942  fm_parse_files (listview_ctrl_t lv, HWND
942          case FM_SIGNENCRYPT: rc = fm_encrypt( ctx, fname, 1 ); break;          case FM_SIGNENCRYPT: rc = fm_encrypt( ctx, fname, 1 ); break;
943          case FM_DECRYPT:     rc = fm_decrypt( ctx, fname );    break;          case FM_DECRYPT:     rc = fm_decrypt( ctx, fname );    break;
944          case FM_SIGN:        rc = fm_sign( ctx, fname );       break;          case FM_SIGN:        rc = fm_sign( ctx, fname );       break;
945          case FM_SYMENC:      rc = fm_sym_encrypt( ctx, fname );break;          case FM_SYMENC:      rc = fm_sym_encrypt (ctx, fname); break;
946          case FM_VERIFY:      rc = fm_verify (ctx, sig_detached, fname);break;          case FM_VERIFY:      rc = fm_verify (ctx, sig_detached, fname);break;
947          case FM_IMPORT:          case FM_IMPORT:
948              free_if_alloc (ctx->opaque);              free_if_alloc (ctx->opaque);
949              ctx->opaque = m_strdup (fname);              ctx->opaque = m_strdup (fname);
950              if (!ctx->opaque)              if (!ctx->opaque)
951                  BUG (0);                  BUG (0);
952              DialogBoxParam( glob_hinst, (LPCSTR)IDD_WINPT_IMPORT, dlg,              DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_IMPORT, dlg,
953                             file_import_dlg_proc, (LPARAM)ctx );                              file_import_dlg_proc, (LPARAM)ctx);
954              if (ctx->cancel == 1)              if (ctx->cancel == 1)
955                  continue;                  continue;
956              rc = fm_import (ctx, fname);              rc = fm_import (ctx, fname);
957              break;              break;
958          }          }
959            if (ctx->cancel == 1) {
960                ctx->cancel = 0;
961                continue;
962            }
963          fm_set_status (lv, i, fm_cmd, ctx->sigmode, !rc, ctx->output);          fm_set_status (lv, i, fm_cmd, ctx->sigmode, !rc, ctx->output);
964          free_if_alloc (ctx->output);          free_if_alloc (ctx->output);
965          progress_cleanup (&pfx);          progress_cleanup (&pfx);
# Line 1156  fm_sym_encrypt (fm_state_t c, const char Line 1160  fm_sym_encrypt (fm_state_t c, const char
1160      char ext[5], * pass;          char ext[5], * pass;    
1161            
1162      pass = request_passphrase2 (_("Symmetric"), 0, &cancel);      pass = request_passphrase2 (_("Symmetric"), 0, &cancel);
1163      if (cancel)      if (cancel) {
1164            c->cancel = 1;
1165          return 0;          return 0;
1166        }
1167            
1168      /* XXX gpgme_control (ctx, GPGME_CTRL_CIPHER, -1);*/      /* XXX gpgme_control (ctx, GPGME_CTRL_CIPHER, -1);*/
1169      c->output = new char[strlen (name) + 5 + 1];      c->output = new char[strlen (name) + 5 + 1];
Legend:
Removed from v.172  
changed lines
  Added in v.177
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26