Changeset 3477


Ignore:
Timestamp:
Oct 15, 2015, 4:27:26 PM (2 years ago)
Author:
bruno
Message:

put setup_newt_stuff back at its place (after defining g_text_mode) to avoid incorrect startup

Location:
branches/3.2/mondo/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/common/newt-specific.c

    r3413 r3477  
    12821282        b8 = newtButton(17, 13, "    Exit   ");
    12831283        myForm = newtForm(NULL, NULL, 0);
    1284         newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
    1285                               NULL);
     1284        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8, NULL);
    12861285        b_res = newtRunForm(myForm);
    12871286        newtFormDestroy(myForm);
  • branches/3.2/mondo/src/mondoarchive/mondoarchive.c

    r3468 r3477  
    223223    if (argc == 4 && !strcmp(argv[1], "getfattr")) {
    224224        g_loglevel = 10;
    225         g_text_mode = TRUE;
    226225        setup_newt_stuff();
    227226        if (!strstr(argv[2], "filelist")) {
     
    235234    if (argc == 4 && !strcmp(argv[1], "setfattr")) {
    236235        g_loglevel = 10;
    237         g_text_mode = TRUE;
    238236        setup_newt_stuff();
    239237        finish(set_fattr_list(argv[2], argv[3]));
     
    242240    if (argc == 3 && !strcmp(argv[1], "wildcards")) {
    243241        g_loglevel = 10;
    244         g_text_mode = TRUE;
    245242        setup_newt_stuff();
    246243        tmp1 = mr_stresc(argv[2], "[]*?", '\\', '\'');
     
    252249    if (argc == 4 && !strcmp(argv[1], "getfacl")) {
    253250        g_loglevel = 10;
    254         g_text_mode = TRUE;
    255251        setup_newt_stuff();
    256252        if (!strstr(argv[2], "filelist")) {
     
    264260    if (argc == 4 && !strcmp(argv[1], "setfacl")) {
    265261        g_loglevel = 10;
    266         g_text_mode = TRUE;
    267262        setup_newt_stuff();
    268263        finish(set_acl_list(argv[2], argv[3]));
     
    270265    if (argc >= 2 && !strcmp(argv[1], "mkraidtab")) {
    271266        g_loglevel = 10;
    272         g_text_mode = TRUE;
    273267        setup_newt_stuff();
    274268#undef MDSTAT_FILE
     
    285279    if (argc > 2 && !strcmp(argv[1], "find-cd")) {
    286280        g_loglevel = 10;
    287         g_text_mode = TRUE;
    288281        setup_newt_stuff();
    289282        malloc_string(tmp);
     
    305298    if (argc > 2 && !strcmp(argv[1], "find-dvd")) {
    306299        g_loglevel = 10;
    307         g_text_mode = TRUE;
    308300        setup_newt_stuff();
    309301        malloc_string(tmp);
     
    335327
    336328    /* Process command line, if there is one. If not, ask user for info. */
    337     setup_newt_stuff();
     329    g_loglevel = 99;
    338330    if (argc == 1) {
    339331        g_text_mode = FALSE;
     332        setup_newt_stuff();
    340333        res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
    341334        if (res) {
     
    350343            finish(1);
    351344        }
     345        setup_newt_stuff();
    352346    }
    353347
Note: See TracChangeset for help on using the changeset viewer.