Changeset 2400


Ignore:
Timestamp:
Sep 15, 2009, 7:33:17 PM (9 years ago)
Author:
bruno
Message:
  • Use protocol name when displaying restore progress instead of netfs
  • Ask for network protocol name at restore time

(Backport from 2.2.9)

Location:
branches/2.2.10/mondo/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mondo/src/common/libmondo-devices.c

    r2383 r2400  
    17191719            mr_free(command);
    17201720
     1721            p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
     1722            if (p == NULL) {
     1723                log_to_screen("User has chosen not to backup the PC");
     1724                finish(1);
     1725            }
     1726            mr_free(bkpinfo->netfs_proto);
     1727            bkpinfo->netfs_proto = p;
     1728
    17211729            p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount);
    17221730            if (p == NULL) {
  • branches/2.2.10/mondo/src/common/libmondo-string.c

    r2382 r2400  
    10751075 * @note The returned string points to static storage that will be overwritten with each call.
    10761076 */
    1077 /* BCO/BERLIOS change that function to allocate memory, return a pointer and modify caller to free the mem */
    10781077char *media_descriptor_string(t_bkptype type_of_bkp) {
    10791078
     
    11031102        break;
    11041103    case netfs:
    1105         mr_asprintf(type_of_backup, "netfs");
     1104        mr_asprintf(type_of_backup, "%s", bkpinfo->netfs_proto);
    11061105        break;
    11071106    case usb:
  • branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

    r2395 r2400  
    19651965    while (!finished) {
    19661966        flaws_str = evaluate_mountlist(mountlist);
    1967         if (strlen(flaws_str) > 0) {
     1967        /* flaws_str can be NULL */
     1968        if ((flaws_str == NULL) || (strlen(flaws_str) == 0)) {
     1969            mr_asprintf(flaws_str_A, "");
     1970        } else {
    19681971            mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
    1969         } else {
    1970             mr_asprintf(flaws_str_A, "");
    19711972        }
    19721973        if (strlen(flaws_str_A) >= 74) {
     
    19841985            mr_asprintf(flaws_str_C, "");
    19851986        }
    1986         mr_free(flaws_str);
    19871987
    19881988        newtLabelSetText(flawsLabelA, flaws_str_A);
     
    19951995
    19961996        if (b_res == bOK) {
    1997             flaws_str = evaluate_mountlist(mountlist);
    19981997            if (flaws_str != NULL) {
    1999                 mr_free(flaws_str);
    20001998                finished =
    20011999                    ask_me_yes_or_no
     
    20422040            }
    20432041        }
     2042        mr_free(flaws_str);
    20442043    }
    20452044    newtFormDestroy(myForm);
Note: See TracChangeset for help on using the changeset viewer.