Changeset 3477 in MondoRescue for branches/3.2/mondo

Timestamp:

Oct 15, 2015, 4:27:26 PM (9 years ago)

Author:

Bruno Cornec

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:

• common/newt-specific.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (10 diffs)

branches/3.2/mondo/src/common/newt-specific.c

@@ -1282 +1282 @@
         b8 = newtButton(17, 13, "    Exit   ");
         myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
-                              NULL);
+        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8, NULL);
         b_res = newtRunForm(myForm);
         newtFormDestroy(myForm);

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -223 +223 @@
     if (argc == 4 && !strcmp(argv[1], "getfattr")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
@@ -235 +234 @@
     if (argc == 4 && !strcmp(argv[1], "setfattr")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
         finish(set_fattr_list(argv[2], argv[3]));
@@ -242 +240 @@
     if (argc == 3 && !strcmp(argv[1], "wildcards")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
         tmp1 = mr_stresc(argv[2], "[]*?", '\\', '\'');
@@ -252 +249 @@
     if (argc == 4 && !strcmp(argv[1], "getfacl")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
@@ -264 +260 @@
     if (argc == 4 && !strcmp(argv[1], "setfacl")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
         finish(set_acl_list(argv[2], argv[3]));
@@ -270 +265 @@
     if (argc >= 2 && !strcmp(argv[1], "mkraidtab")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
 #undef MDSTAT_FILE
@@ -285 +279 @@
     if (argc > 2 && !strcmp(argv[1], "find-cd")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
         malloc_string(tmp);
@@ -305 +298 @@
     if (argc > 2 && !strcmp(argv[1], "find-dvd")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         setup_newt_stuff();
         malloc_string(tmp);
@@ -335 +327 @@
 
     /* Process command line, if there is one. If not, ask user for info. */
-    setup_newt_stuff();
+    g_loglevel = 99;
     if (argc == 1) {
         g_text_mode = FALSE;
+        setup_newt_stuff();
         res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
@@ -350 +343 @@
             finish(1);
         }
+        setup_newt_stuff();
     }