Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=9e7e8a2fb194797f9b99f7da9fff6788109c8857

commit 9e7e8a2fb194797f9b99f7da9fff6788109c8857
Author: James Buren <[email protected]>
Date:   Sun Feb 17 01:19:24 2013 -0600

move deletion UI update text to
front, since it must be done in
reverse order because of how newt works

diff --git a/src/ui_newt.c b/src/ui_newt.c
index 7ad64a7..b68deac 100644
--- a/src/ui_newt.c
+++ b/src/ui_newt.c
@@ -1081,6 +1081,23 @@ extern bool ui_window_partition(struct device 
**devices,struct disk **disks)

if(ui_dialog_partition_new_partition(disk))
{
+          key.space = false;
+
+          key.delete = true;
+
+          if(strcmp(disk_partition_get_purpose(disk,partition),"extended") != 
0)
+            snprintf(text,NEWT_WIDTH+1,"delete last partition");
+          else
+            snprintf(text,NEWT_WIDTH+1,"delete extended partition");
+
+          newtListboxDeleteEntry(listbox,(void *) key.data);
+
+          newtListboxInsertEntry(listbox,text,(void *) key.data,(void *) 
action.data);
+
+          key.delete = false;
+
+          key.space = true;
+#if 0
if(strcmp(disk_partition_get_purpose(disk,partition),"extended") != 0)
{
key.space = false;
@@ -1110,25 +1127,9 @@ extern bool ui_window_partition(struct device 
**devices,struct disk **disks)

newtListboxInsertEntry(listbox,text,(void *) key.data,(void *) key.data);
}
-
-          key.space = false;
-
-          key.delete = true;
-
-          if(strcmp(disk_partition_get_purpose(disk,partition),"extended") != 
0)
-            snprintf(text,NEWT_WIDTH+1,"delete last partition");
-          else
-            snprintf(text,NEWT_WIDTH+1,"delete extended partition");
-
-          newtListboxInsertEntry(listbox,text,(void *) key.data,(void *) 
key.data);
-
-          newtListboxDeleteEntry(listbox,(void *) key.data);
-
-          key.delete = false;
-
-          key.space = true;
-
+
newtListboxDeleteEntry(listbox,(void *) action.data);
+#endif
}
}
else if(action.delete)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to